Merge branch 'ChrisTitusTech:main' into Disable-Defender

Author: GabiNun

.github/workflows/pre-release.yaml

@@ -16,6 +16,25 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
 
+      - name: Generate Dev Docs and Update JSON Links
+        shell: pwsh
+        run: |
+          Set-Location tools
+          ./devdocs-generator.ps1
+
+      - name: Commit Updated JSON Links
+        shell: pwsh
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add config/tweaks.json config/feature.json
+          $changes = git diff --cached --quiet; if ($LASTEXITCODE -ne 0) {
+            git commit -m "Update documentation links in JSON configs"
+            git push
+          } else {
+            Write-Host "No JSON link changes to commit"
+          }
+
       - name: Compile project
         shell: pwsh
         run: |

config/applications.json

@@ -72,5 +72,13 @@
         "Type": "Button",
         "Order": "5",
         "Description": "Show the selected applications"
+    },
+    "WPFToggleFOSSHighlight": {
+        "Content": "Highlight FOSS",
+        "Category": "__Selection",
+        "Type": "Toggle",
+        "Checked": true,
+        "Order": "6",
+        "Description": "Toggle the green highlight for FOSS applications"
     }
-}
+}

config/appnavigation.json

@@ -181,15 +181,6 @@
     "ButtonWidth": "300",
     "link": "https://winutil.christitus.com/dev/features/fixes/winget"
   },
-  "WPFRunAdobeCCCleanerTool": {
-    "Content": "Remove Adobe Creative Cloud",
-    "category": "Fixes",
-    "panel": "1",
-    "Order": "a045_",
-    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/fixes/runadobecccleanertool"
-  },
   "WPFPanelControl": {
     "Content": "Control Panel",
     "category": "Legacy Windows Panels",

config/feature.json

@@ -65,9 +65,11 @@
     "panel": "1",
     "InvokeScript": [
       "
-      # Sometimes if you dont stop Widgets Process for removal to work
+      # Sometimes if you dont stop the Widgets process the removal may fail
+      
       Stop-Process -Name Widgets
       Get-AppxPackage Microsoft.WidgetsPlatformRuntime -AllUsers | Remove-AppxPackage -AllUsers
+      Get-AppxPackage MicrosoftWindows.Client.WebExperience -AllUsers | Remove-AppxPackage -AllUsers
 
       Invoke-WinUtilExplorerUpdate -action \"restart\"
       Write-Host \"Removed widgets\"
@@ -76,7 +78,10 @@
     "UndoScript": [
       "
       Write-Host \"Restoring widgets AppxPackages\"
-      Add-AppxPackage -DisableDevelopmentMode -Register \"C:\\Program Files\\WindowsApps\\Microsoft.WidgetsPlatformRuntime*\\AppxManifest.xml\"
+      
+      Add-AppxPackage -Register \"C:\\Program Files\\WindowsApps\\Microsoft.WidgetsPlatformRuntime*\\AppxManifest.xml\" -DisableDevelopmentMode
+      Add-AppxPackage -Register \"C:\\Program Files\\WindowsApps\\MicrosoftWindows.Client.WebExperience*\\AppxManifest.xml\" -DisableDevelopmentMode
+      
       Invoke-WinUtilExplorerUpdate -action \"restart\"
       "
     ],
@@ -1196,10 +1201,10 @@
         "OriginalValue": "<RemoveEntry>"
       },
       {
-        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge",
-        "Name": "ofefcgjbeghpigppfmkologfjadafddi",
+        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge\\ExtensionInstallBlocklist",
+        "Name": "1",
         "Type": "String",
-        "Value": "1",
+        "Value": "ofefcgjbeghpigppfmkologfjadafddi",
         "OriginalValue": "<RemoveEntry>"
       },
       {
@@ -2017,9 +2022,9 @@
     "InvokeScript": [
       "
       $hostsUrl = \"https://github.com/Ruddernation-Designs/Adobe-URL-Block-List/raw/refs/heads/master/hosts\"
-      $hosts = \"$env:SystemRoot\\System32\\drivers\\etc\\hosts\"
+      $hosts = \"$Env:SystemRoot\\System32\\drivers\\etc\\hosts\"
 
-      Copy-Item $hosts \"$env:SystemRoot\\System32\\drivers\\etc\\hosts\\$hosts.bak\"
+      Move-Item $hosts \"$hosts.bak\"
       Invoke-WebRequest $hostsUrl -OutFile $hosts
       ipconfig /flushdns
 
@@ -2028,10 +2033,10 @@
     ],
     "UndoScript": [
       "
-      $hosts = \"$env:SystemRoot\\System32\\drivers\\etc\\hosts\"
-      $backup = \"$env:SystemRoot\\System32\\drivers\\etc\\hosts\\$hosts.bak\"
+      $hosts = \"$Env:SystemRoot\\System32\\drivers\\etc\\hosts\"
 
       Remove-Item $hosts
+      Move-Item \"$hosts.bak\" $hosts
       ipconfig /flushdns
 
       Write-Host \"Removed Adobe url block list from host file\"

config/tweaks.json

@@ -1,4 +1,4 @@
-copyright: "&copy; <script>document.write(new Date().getFullYear())</script> <a href='https://christitus.com'> Chris Titus Tech</a>. All rights reserved."
+copyright: "&copy; <script>document.write(new Date().getFullYear())</script>&nbsp; <a href='https://christitus.com'>Chris Titus Tech</a>. All rights reserved."
 
 backToTop: "Scroll to top"
 changeLanguage: "Change language"

docs/i18n/en.yaml

@@ -41,16 +41,19 @@ function Initialize-InstallAppEntry {
         })
 
         $checkBox = New-Object Windows.Controls.CheckBox
-        $checkBox.Name = $appKey
+        # Sanitize the name for WPF
+        $checkBox.Name = $appKey -replace '-', '_'
+        # Store the original appKey in Tag
+        $checkBox.Tag = $appKey
         $checkbox.Style = $sync.Form.Resources.AppEntryCheckboxStyle
         $checkbox.Add_Checked({
-            Invoke-WPFSelectedAppsUpdate -type "Add" -checkbox $this
+            Invoke-WPFSelectedCheckboxesUpdate -type "Add" -checkboxName $this.Parent.Tag
             $borderElement = $this.Parent
             $borderElement.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallSelectedColor")
         })
 
         $checkbox.Add_Unchecked({
-            Invoke-WPFSelectedAppsUpdate -type "Remove" -checkbox $this
+            Invoke-WPFSelectedCheckboxesUpdate -type "Remove" -checkboxName $this.Parent.Tag
             $borderElement = $this.Parent
             $borderElement.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallUnselectedColor")
         })
@@ -60,6 +63,12 @@ function Initialize-InstallAppEntry {
         $appName.Style = $sync.Form.Resources.AppEntryNameStyle
         $appName.Text = $Apps.$appKey.content
 
+        # Change color to Green if FOSS
+        if ($Apps.$appKey.foss -eq $true) {
+            $appName.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "FOSSColor")
+            $appName.FontWeight = "Bold"
+        }
+
         # Add the name to the Checkbox
         $checkBox.Content = $appName
 

functions/private/Get-WinUtilCheckBoxes.ps1

@@ -6,7 +6,7 @@ Function Invoke-WinUtilCurrentSystem {
         Checks to see what tweaks have already been applied and what programs are installed, and checks the according boxes
 
     .EXAMPLE
-        Get-WinUtilCheckBoxes "WPFInstall"
+        InvokeWinUtilCurrentSystem -Checkbox "winget"
 
     #>
 

functions/private/Initialize-InstallAppEntry.ps1

@@ -174,6 +174,18 @@ function Invoke-WinutilThemeChange {
         }
     }
 
+    # Set FOSS Highlight Color
+    $fossEnabled = $true
+    if ($sync.WPFToggleFOSSHighlight) {
+        $fossEnabled = $sync.WPFToggleFOSSHighlight.IsChecked
+    }
+
+    if ($fossEnabled) {
+         $sync.Form.Resources["FOSSColor"] = [Windows.Media.SolidColorBrush]::new([Windows.Media.Color]::FromRgb(76, 175, 80)) # #4CAF50
+    } else {
+         $sync.Form.Resources["FOSSColor"] = $sync.Form.Resources["MainForegroundColor"]
+    }
+
     # Update the theme selector button with the appropriate icon
     $ThemeButton = $sync.Form.FindName("ThemeButton")
     $ThemeButton.Content = [string]$themeButtonIcon