Deploying to main from @ ChrisTitusTech/winutil@0bce9e2647 🚀

* Update 'github-pages.yaml' Workflow - Fix several warnings & enable Caching pip packages

* Fix 'github-pages.yaml' Syntax Error

* Make Install Dependencies step actually use the 'requirements.txt' File in 'github-pages.yaml' Workflow

* Update 'actions/setup-python' from v4 to v5 - Remove the Ignore Rule for Dependabot in '.github/dependabot.yml' File

.github/dependabot.yml

@@ -7,5 +7,3 @@ updates:
     ignore:
       - dependency-name: "actions/stale"
         versions: '>= 9'
-      - dependency-name: "actions/setup-python"
-        versions: '> 4'

.github/workflows/close-discussion-on-pr.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Check if PR was merged
         if: github.event.pull_request.merged == true
@@ -30,14 +30,19 @@ jobs:
           fi
 
           for discussion_id in $discussion_ids; do
-            echo "Closing discussion #$discussion_id"
-            response=$(curl -s -o /dev/null -w "%{http_code}" -X PATCH -H "Authorization: token $GITHUB_TOKEN" \
+            echo "Attempting to close discussion #$discussion_id"
+            response=$(curl -s -X PATCH -H "Authorization: token $GITHUB_TOKEN" \
+                 -H "Accept: application/vnd.github.v3+json" \
                  -d '{"state": "closed"}' \
                  "https://api.github.com/repos/${{ github.repository }}/discussions/$discussion_id")
 
-            if [ "$response" -ne 200 ]; then
-              echo "Failed to close discussion #$discussion_id. HTTP status code: $response"
-              exit 1
+            if echo "$response" | jq -e '.id' > /dev/null; then
+              echo "Successfully closed discussion #$discussion_id"
+            else
+              error_message=$(echo "$response" | jq -r '.message // "Unknown error"')
+              echo "Warning: Failed to close discussion #$discussion_id. Error: $error_message"
+              echo "Full response: $response"
             fi
           done
         shell: bash
+        continue-on-error: true

.github/workflows/github-pages.yaml

@@ -1,25 +1,31 @@
 name: GitHub Pages Deploy
+
 on:
   release:
     types: [published, prereleased]
   workflow_dispatch:
+
 permissions:
   contents: write
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - name: Checkout Repository
+        uses: actions/checkout@v4
         with:
-          python-version: 3.x
-      - uses: actions/cache@v4
+          fetch-depth: '0'  # Fetch all commit history for all branches as well as tags.
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
         with:
-          key: ${{ github.ref }}
-          path: .cache
-      - run: pip install mkdocs-material
-      - run: pip install pillow cairosvg
-      - run: pip install mkdocs-awesome-pages-plugin
-      - run: pip install mkdocs-git-revision-date-localized-plugin
-      - run: pip install mkdocs-minify-plugin
-      - run: mkdocs gh-deploy --force
+          python-version: 3.x  # Install latest Stable release of Python 3
+          cache: 'pip'  # caching pip dependencies
+
+      - name: Install Necessary Dependencies using 'pip install -r requirements.txt'
+        run: pip install -r requirements.txt
+
+      - name: Build & Deploy using 'mkdocs'
+        run: mkdocs gh-deploy --force

.github/workflows/pre-release.yaml

@@ -69,7 +69,7 @@ jobs:
           if ($signature.Status -ne 'Valid') { throw "Code signing failed" }
 
       - name: Upload winutil.ps1 as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: winutil
           path: ./winutil.ps1

CONTRIBUTING.md

@@ -46,18 +46,20 @@
 ### Overview
 
 ``` mermaid
-graph LR
+%%{init: {"flowchart": {"curve": "cardinal"}} }%%
+graph TD
   A[Fork Project] --> B[Clone Repository];
   B --> C[Create New Branch];
   C --> D[Make Changes];
   D --> G[Test Changes];
   G --> H{Tests Passed?};
   H -->|Yes| E[Commit Changes];
-  E --> F[Push Branch];
   H -->|No| J[Fix Issues];
+  J --> G;
+  E --> F[Push Branch];
   F --> K[Create Pull Request];
   K --> L[Fill out PR template];
-  J --> G;
+  classDef default stroke:#333,stroke-width:4px,font-size:12pt;
 ```
 !!! info
 
@@ -65,8 +67,10 @@ graph LR
 
 ### Fork the Repo
 * Fork the WinUtil Repository [here](https://github.com/ChrisTitusTech/winutil) to create a copy that will be available in your repository list.
+
 ![Fork Image](assets/Fork-Button-Dark.png#only-dark)
-![FOrk Image](assets/Fork-Button-Light.png#only-light)
+
+![Fork Image](assets/Fork-Button-Light.png#only-light)
 
 ### Clone the Fork
 !!! tip
@@ -89,15 +93,22 @@ graph LR
 * `cd {path to the folder with the compile.ps1}`
 * Run the following command to compile and run WinUtil:
 * `.\Compile.ps1 -run`
-* ![Compile](assets/Compile.png)
+
+![Compile](assets/Compile.png)
+
 * After seeing that your changes work properly, feel free to commit the changes to the repository and make a PR. For help on that, follow the documentation below.
 
 ### Committing the changes
 * Before committing your changes, please discard changes made to the `winutil.ps1` file, like the following:
-- ![Push Commit Image](assets/Discard-GHD.png)
+
+![Push Commit Image](assets/Discard-GHD.png)
+
 * Now, commit your changes once you are happy with the result.
+
 ![Commit Image](assets/Commit-GHD.png)
+
 * Push the changes to upload them to your fork on github.com.
+
 ![Push Commit Image](assets/Push-Commit.png)
 
 ### Making a PR

IntegratedServicesRegionPolicySet.json

@@ -1 +0,0 @@
-          "enabled": ["AT", "BE", "BG", "CH", "CY", "CZ", "DE", "DK", "EE", "ES", "FI", "FR", "GF", "GP", "GR", "HR", "HU", "IE", "IS", "IT", "LI", "LT", "LU", "LV", "MT", "MQ", "NL", "NO", "PL", "PT", "RE", "RO", "SE", "SI", "SK", "YT"]

README.md

@@ -52,7 +52,7 @@ If you have Issues, refer to [Known Issues](https://christitustech.github.io/win
 
 These are the sponsors that help keep this project alive with monthly contributions.
 
-<!-- sponsors --><a href="https://github.com/GregoryNavasarkian"><img src="https://github.com/GregoryNavasarkian.png" width="60px" alt="Gregory Navasarkian" /></a><a href="https://github.com/ysaito8015"><img src="https://github.com/ysaito8015.png" width="60px" alt="Yusuke Saito" /></a><a href="https://github.com/TriHydera"><img src="https://github.com/TriHydera.png" width="60px" alt="TriHydera" /></a><a href="https://github.com/jozozovko"><img src="https://github.com/jozozovko.png" width="60px" alt="" /></a><a href="https://github.com/DelDongo"><img src="https://github.com/DelDongo.png" width="60px" alt="" /></a><a href="https://github.com/markamos"><img src="https://github.com/markamos.png" width="60px" alt="Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https://github.com/dwelfusius.png" width="60px" alt="" /></a><a href="https://github.com/mews-se"><img src="https://github.com/mews-se.png" width="60px" alt="" /></a><a href="https://github.com/jdiegmueller"><img src="https://github.com/jdiegmueller.png" width="60px" alt="Jason A. Diegmueller" /></a><a href="https://github.com/AlanTristar"><img src="https://github.com/AlanTristar.png" width="60px" alt="" /></a><a href="https://github.com/JennJones89"><img src="https://github.com/JennJones89.png" width="60px" alt="" /></a><a href="https://github.com/zepled112"><img src="https://github.com/zepled112.png" width="60px" alt="wyatt" /></a><a href="https://github.com/Owen-3456"><img src="https://github.com/Owen-3456.png" width="60px" alt="Owen" /></a><a href="https://github.com/altugtekiner"><img src="https://github.com/altugtekiner.png" width="60px" alt="" /></a><a href="https://github.com/getsmor"><img src="https://github.com/getsmor.png" width="60px" alt="" /></a><a href="https://github.com/robertsandrock"><img src="https://github.com/robertsandrock.png" width="60px" alt="" /></a><a href="https://github.com/jeffnesbit"><img src="https://github.com/jeffnesbit.png" width="60px" alt="" /></a><a href="https://github.com/mmomega"><img src="https://github.com/mmomega.png" width="60px" alt="" /></a><a href="https://github.com/KenichiQaz"><img src="https://github.com/KenichiQaz.png" width="60px" alt="Stefan" /></a><a href="https://github.com/thaddl"><img src="https://github.com/thaddl.png" width="60px" alt="thaddl" /></a><a href="https://github.com/paulsheets"><img src="https://github.com/paulsheets.png" width="60px" alt="Paul" /></a><a href="https://github.com/djones369"><img src="https://github.com/djones369.png" width="60px" alt="Dave Jones" /></a><a href="https://github.com/anthonymendez"><img src="https://github.com/anthonymendez.png" width="60px" alt="Anthony Mendez" /></a><a href="https://github.com/woobe-studio"><img src="https://github.com/woobe-studio.png" width="60px" alt="Michael Wozniak" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/GregoryNavasarkian"><img src="https://github.com/GregoryNavasarkian.png" width="60px" alt="Gregory Navasarkian" /></a><a href="https://github.com/ysaito8015"><img src="https://github.com/ysaito8015.png" width="60px" alt="Yusuke Saito" /></a><a href="https://github.com/TriHydera"><img src="https://github.com/TriHydera.png" width="60px" alt="TriHydera" /></a><a href="https://github.com/jozozovko"><img src="https://github.com/jozozovko.png" width="60px" alt="" /></a><a href="https://github.com/DelDongo"><img src="https://github.com/DelDongo.png" width="60px" alt="" /></a><a href="https://github.com/markamos"><img src="https://github.com/markamos.png" width="60px" alt="Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https://github.com/dwelfusius.png" width="60px" alt="" /></a><a href="https://github.com/mews-se"><img src="https://github.com/mews-se.png" width="60px" alt="" /></a><a href="https://github.com/jdiegmueller"><img src="https://github.com/jdiegmueller.png" width="60px" alt="Jason A. Diegmueller" /></a><a href="https://github.com/AlanTristar"><img src="https://github.com/AlanTristar.png" width="60px" alt="" /></a><a href="https://github.com/JennJones89"><img src="https://github.com/JennJones89.png" width="60px" alt="" /></a><a href="https://github.com/zepled112"><img src="https://github.com/zepled112.png" width="60px" alt="wyatt" /></a><a href="https://github.com/altugtekiner"><img src="https://github.com/altugtekiner.png" width="60px" alt="" /></a><a href="https://github.com/getsmor"><img src="https://github.com/getsmor.png" width="60px" alt="" /></a><a href="https://github.com/robertsandrock"><img src="https://github.com/robertsandrock.png" width="60px" alt="" /></a><a href="https://github.com/jeffnesbit"><img src="https://github.com/jeffnesbit.png" width="60px" alt="" /></a><a href="https://github.com/mmomega"><img src="https://github.com/mmomega.png" width="60px" alt="" /></a><a href="https://github.com/KenichiQaz"><img src="https://github.com/KenichiQaz.png" width="60px" alt="Stefan" /></a><a href="https://github.com/thaddl"><img src="https://github.com/thaddl.png" width="60px" alt="thaddl" /></a><a href="https://github.com/paulsheets"><img src="https://github.com/paulsheets.png" width="60px" alt="Paul" /></a><a href="https://github.com/djones369"><img src="https://github.com/djones369.png" width="60px" alt="Dave Jones" /></a><a href="https://github.com/anthonymendez"><img src="https://github.com/anthonymendez.png" width="60px" alt="Anthony Mendez" /></a><a href="https://github.com/woobe-studio"><img src="https://github.com/woobe-studio.png" width="60px" alt="Michael Wozniak" /></a><a href="https://github.com/xBandaku"><img src="https://github.com/xBandaku.png" width="60px" alt="xPandaku" /></a><!-- sponsors -->
 
 ## 🏅 Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.

config/tweaks.json

@@ -2556,14 +2556,14 @@
   },
   "WPFTweaksRemoveEdge": {
     "Content": "Remove Microsoft Edge",
-    "Description": "Removes MS Edge when it gets reinstalled by updates. Credit: Techie Jack",
+    "Description": "Removes MS Edge when it gets reinstalled by updates. Credit: Psyirius",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "Order": "a029_",
     "InvokeScript": [
       "
-         Uninstall-WinUtilEdgeBrowser
-        "
+      Uninstall-WinUtilEdgeBrowser
+      "
     ],
     "UndoScript": [
       "

edgeremoval.ps1

@@ -1,138 +0,0 @@
-$msedgeProcess = Get-Process -Name "msedge" -ErrorAction SilentlyContinue
-$widgetsProcess = Get-Process -Name "widgets" -ErrorAction SilentlyContinue
-# Checking if Microsoft Edge is running
-if ($msedgeProcess) {
-    Stop-Process -Name "msedge" -Force
-} else {
-    Write-Output "msedge process is not running."
-}
-# Checking if Widgets is running
-if ($widgetsProcess) {
-    Stop-Process -Name "widgets" -Force
-} else {
-    Write-Output "widgets process is not running."
-}
-
-function Uninstall-Process {
-    param (
-        [Parameter(Mandatory = $true)]
-        [string]$Key
-    )
-
-    $originalNation = [microsoft.win32.registry]::GetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', [Microsoft.Win32.RegistryValueKind]::String)
-
-    # Set Nation to 84 (France) temporarily
-    [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', 68, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
-
-    # credits to he3als for the Acl commands
-    $fileName = "IntegratedServicesRegionPolicySet.json"
-    $pathISRPS = [Environment]::SystemDirectory + "\" + $fileName
-    $aclISRPS = Get-Acl -Path $pathISRPS
-    $aclISRPSBackup = [System.Security.AccessControl.FileSecurity]::new()
-    $aclISRPSBackup.SetSecurityDescriptorSddlForm($acl.Sddl)
-    if (Test-Path -Path $pathISRPS) {
-        try {
-            $admin = [System.Security.Principal.NTAccount]$(New-Object System.Security.Principal.SecurityIdentifier('S-1-5-32-544')).Translate([System.Security.Principal.NTAccount]).Value
-
-            $aclISRPS.SetOwner($admin)
-            $rule = New-Object System.Security.AccessControl.FileSystemAccessRule($admin, 'FullControl', 'Allow')
-            $aclISRPS.AddAccessRule($rule)
-            Set-Acl -Path $pathISRPS -AclObject $aclISRPS
-
-            Rename-Item -Path $pathISRPS -NewName ($fileName + '.bak') -Force
-        }
-        catch {
-            Write-Error "[$Mode] Failed to set owner for $pathISRPS"
-        }
-    }
-
-    $baseKey = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
-    $registryPath = $baseKey + '\ClientState\' + $Key
-
-    if (!(Test-Path -Path $registryPath)) {
-        Write-Host "[$Mode] Registry key not found: $registryPath"
-        return
-    }
-
-    Remove-ItemProperty -Path $registryPath -Name "experiment_control_labels" -ErrorAction SilentlyContinue | Out-Null
-
-    $uninstallString = (Get-ItemProperty -Path $registryPath).UninstallString
-    $uninstallArguments = (Get-ItemProperty -Path $registryPath).UninstallArguments
-
-    if ([string]::IsNullOrEmpty($uninstallString) -or [string]::IsNullOrEmpty($uninstallArguments)) {
-        Write-Host "[$Mode] Cannot find uninstall methods for $Mode"
-        return
-    }
-
-    $uninstallArguments += " --force-uninstall --delete-profile"
-
-    # $uninstallCommand = "`"$uninstallString`"" + $uninstallArguments
-    if (!(Test-Path -Path $uninstallString)) {
-        Write-Host "[$Mode] setup.exe not found at: $uninstallString"
-        return
-    }
-    Start-Process -FilePath $uninstallString -ArgumentList $uninstallArguments -Wait -NoNewWindow -Verbose
-
-    # Restore Acl
-    if (Test-Path -Path ($pathISRPS + '.bak')) {
-        Rename-Item -Path ($pathISRPS + '.bak') -NewName $fileName -Force
-        Set-Acl -Path $pathISRPS -AclObject $aclISRPSBackup
-    }
-
-    # Restore Nation
-    [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', $originalNation, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
-
-    if ((Get-ItemProperty -Path $baseKey).IsEdgeStableUninstalled -eq 1) {
-        Write-Host "[$Mode] Edge Stable has been successfully uninstalled"
-    }
-}
-
-function Uninstall-Edge {
-    Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-    [microsoft.win32.registry]::SetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdateDev", "AllowUninstall", 1, [Microsoft.Win32.RegistryValueKind]::DWord) | Out-Null
-
-    Uninstall-Process -Key '{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}'
-
-    @( "$env:ProgramData\Microsoft\Windows\Start Menu\Programs",
-       "$env:PUBLIC\Desktop",
-       "$env:USERPROFILE\Desktop" ) | ForEach-Object {
-        $shortcutPath = Join-Path -Path $_ -ChildPath "Microsoft Edge.lnk"
-        if (Test-Path -Path $shortcutPath) {
-            Remove-Item -Path $shortcutPath -Force
-        }
-    }
-
-}
-
-function Uninstall-WebView {
-    Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-    # Force to use system-wide WebView2
-    # [microsoft.win32.registry]::SetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge\WebView2\BrowserExecutableFolder", "*", "%%SystemRoot%%\System32\Microsoft-Edge-WebView")
-
-    Uninstall-Process -Key '{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
-}
-
-function Uninstall-EdgeUpdate {
-    Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-    $registryPath = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
-    if (!(Test-Path -Path $registryPath)) {
-        Write-Host "Registry key not found: $registryPath"
-        return
-    }
-    $uninstallCmdLine = (Get-ItemProperty -Path $registryPath).UninstallCmdLine
-
-    if ([string]::IsNullOrEmpty($uninstallCmdLine)) {
-        Write-Host "Cannot find uninstall methods for $Mode"
-        return
-    }
-
-    Write-Output "Uninstalling: $uninstallCmdLine"
-    Start-Process cmd.exe "/c $uninstallCmdLine" -WindowStyle Hidden -Wait
-}
-
-Uninstall-Edge
-    # "WebView" { Uninstall-WebView }
-    # "EdgeUpdate" { Uninstall-EdgeUpdate }

functions/private/ConvertTo-Icon.ps1

@@ -51,7 +51,7 @@ function ConvertTo-Icon {
             # Handle the thrown exception here...
         }
 
-        This Example make use of '-overrideIconFile' Optional Parameter, the default for this paramter is $true.
+        This Example make use of '-overrideIconFile' Optional Parameter, the default for this parameter is $true.
         By doing '-overrideIconFile $false', the 'ConvertTo-Icon' function will raise an exception that needs to be catched throw a 'catch' Code Block,
         otherwise it'll crash the running PowerShell instance/process.
 

functions/private/Uninstall-WinUtilEdgeBrowser.ps1

@@ -1,152 +1,101 @@
 Function Uninstall-WinUtilEdgeBrowser {
-
     <#
-
     .SYNOPSIS
-        This will uninstall edge by changing the region to Ireland and uninstalling edge the changing it back
-
+        Uninstall the Edge Browser (Chromium) from the system in an elegant way.
+    .DESCRIPTION
+        This will switch up the region to one of the EEA countries temporarily and uninstall the Edge Browser (Chromium).
     #>
 
-$msedgeProcess = Get-Process -Name "msedge" -ErrorAction SilentlyContinue
-$widgetsProcess = Get-Process -Name "widgets" -ErrorAction SilentlyContinue
-# Checking if Microsoft Edge is running
-if ($msedgeProcess) {
-    Stop-Process -Name "msedge" -Force
-} else {
-    Write-Output "msedge process is not running."
-}
-# Checking if Widgets is running
-if ($widgetsProcess) {
-    Stop-Process -Name "widgets" -Force
-} else {
-    Write-Output "widgets process is not running."
-}
+    function Uninstall-EdgeClient {
+        param (
+            [Parameter(Mandatory = $true)]
+            [string]$Key
+        )
 
-function Uninstall-Process {
-    param (
-        [Parameter(Mandatory = $true)]
-        [string]$Key
-    )
+        $originalNation = [microsoft.win32.registry]::GetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', [Microsoft.Win32.RegistryValueKind]::String)
 
-    $originalNation = [microsoft.win32.registry]::GetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', [Microsoft.Win32.RegistryValueKind]::String)
+        # Set Nation to any of the EEA regions temporarily
+        # Refer: https://learn.microsoft.com/en-us/windows/win32/intl/table-of-geographical-locations
+        $tmpNation = 68 # Ireland
+        [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', $tmpNation, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
 
-    # Set Nation to 84 (France) temporarily
-    [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', 68, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
+        $baseKey = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
+        $registryPath = $baseKey + '\ClientState\' + $Key
 
-    # credits to he3als for the Acl commands
-    $fileName = "IntegratedServicesRegionPolicySet.json"
-    $pathISRPS = [Environment]::SystemDirectory + "\" + $fileName
-    $aclISRPS = Get-Acl -Path $pathISRPS
-    $aclISRPSBackup = [System.Security.AccessControl.FileSecurity]::new()
-    $aclISRPSBackup.SetSecurityDescriptorSddlForm($acl.Sddl)
-    if (Test-Path -Path $pathISRPS) {
-        try {
-            $admin = [System.Security.Principal.NTAccount]$(New-Object System.Security.Principal.SecurityIdentifier('S-1-5-32-544')).Translate([System.Security.Principal.NTAccount]).Value
-
-            $aclISRPS.SetOwner($admin)
-            $rule = New-Object System.Security.AccessControl.FileSystemAccessRule($admin, 'FullControl', 'Allow')
-            $aclISRPS.AddAccessRule($rule)
-            Set-Acl -Path $pathISRPS -AclObject $aclISRPS
-
-            Rename-Item -Path $pathISRPS -NewName ($fileName + '.bak') -Force
+        if (!(Test-Path -Path $registryPath)) {
+            Write-Host "[$Mode] Registry key not found: $registryPath"
+            return
         }
-        catch {
-            Write-Error "[$Mode] Failed to set owner for $pathISRPS"
+
+        # Remove the status flag
+        Remove-ItemProperty -Path $baseKey -Name "IsEdgeStableUninstalled" -ErrorAction SilentlyContinue | Out-Null
+
+        Remove-ItemProperty -Path $registryPath -Name "experiment_control_labels" -ErrorAction SilentlyContinue | Out-Null
+
+        $uninstallString = (Get-ItemProperty -Path $registryPath).UninstallString
+        $uninstallArguments = (Get-ItemProperty -Path $registryPath).UninstallArguments
+
+        if ([string]::IsNullOrEmpty($uninstallString) -or [string]::IsNullOrEmpty($uninstallArguments)) {
+            Write-Host "[$Mode] Cannot find uninstall methods for $Mode"
+            return
+        }
+
+        # Extra arguments to nuke it
+        $uninstallArguments += " --force-uninstall --delete-profile"
+
+        # $uninstallCommand = "`"$uninstallString`"" + $uninstallArguments
+        if (!(Test-Path -Path $uninstallString)) {
+            Write-Host "[$Mode] setup.exe not found at: $uninstallString"
+            return
+        }
+        Start-Process -FilePath $uninstallString -ArgumentList $uninstallArguments -Wait -NoNewWindow -Verbose
+
+        # Restore Nation back to the original
+        [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', $originalNation, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
+
+        # might not exist in some cases
+        if ((Get-ItemProperty -Path $baseKey).IsEdgeStableUninstalled -eq 1) {
+            Write-Host "[$Mode] Edge Stable has been successfully uninstalled"
         }
     }
 
-    $baseKey = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
-    $registryPath = $baseKey + '\ClientState\' + $Key
+    function Uninstall-Edge {
+        Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
 
-    if (!(Test-Path -Path $registryPath)) {
-        Write-Host "[$Mode] Registry key not found: $registryPath"
-        return
+        [microsoft.win32.registry]::SetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdateDev", "AllowUninstall", 1, [Microsoft.Win32.RegistryValueKind]::DWord) | Out-Null
+
+        Uninstall-EdgeClient -Key '{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}'
     }
 
-    Remove-ItemProperty -Path $registryPath -Name "experiment_control_labels" -ErrorAction SilentlyContinue | Out-Null
+    function Uninstall-WebView {
+        # FIXME: might not work on some systems
 
-    $uninstallString = (Get-ItemProperty -Path $registryPath).UninstallString
-    $uninstallArguments = (Get-ItemProperty -Path $registryPath).UninstallArguments
+        Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
 
-    if ([string]::IsNullOrEmpty($uninstallString) -or [string]::IsNullOrEmpty($uninstallArguments)) {
-        Write-Host "[$Mode] Cannot find uninstall methods for $Mode"
-        return
+        Uninstall-EdgeClient -Key '{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
     }
 
-    $uninstallArguments += " --force-uninstall --delete-profile"
+    function Uninstall-EdgeUpdate {
+        # FIXME: might not work on some systems
 
-    # $uninstallCommand = "`"$uninstallString`"" + $uninstallArguments
-    if (!(Test-Path -Path $uninstallString)) {
-        Write-Host "[$Mode] setup.exe not found at: $uninstallString"
-        return
-    }
-    Start-Process -FilePath $uninstallString -ArgumentList $uninstallArguments -Wait -NoNewWindow -Verbose
+        Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
 
-    # Restore Acl
-    if (Test-Path -Path ($pathISRPS + '.bak')) {
-        Rename-Item -Path ($pathISRPS + '.bak') -NewName $fileName -Force
-        Set-Acl -Path $pathISRPS -AclObject $aclISRPSBackup
-    }
-
-    # Restore Nation
-    [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', $originalNation, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
-
-    if ((Get-ItemProperty -Path $baseKey).IsEdgeStableUninstalled -eq 1) {
-        Write-Host "[$Mode] Edge Stable has been successfully uninstalled"
-    }
-}
-
-function Uninstall-Edge {
-    Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-    [microsoft.win32.registry]::SetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdateDev", "AllowUninstall", 1, [Microsoft.Win32.RegistryValueKind]::DWord) | Out-Null
-
-    Uninstall-Process -Key '{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}'
-
-    @( "$env:ProgramData\Microsoft\Windows\Start Menu\Programs",
-       "$env:PUBLIC\Desktop",
-       "$env:USERPROFILE\Desktop" ) | ForEach-Object {
-        $shortcutPath = Join-Path -Path $_ -ChildPath "Microsoft Edge.lnk"
-        if (Test-Path -Path $shortcutPath) {
-            Remove-Item -Path $shortcutPath -Force
+        $registryPath = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
+        if (!(Test-Path -Path $registryPath)) {
+            Write-Host "Registry key not found: $registryPath"
+            return
         }
+        $uninstallCmdLine = (Get-ItemProperty -Path $registryPath).UninstallCmdLine
+
+        if ([string]::IsNullOrEmpty($uninstallCmdLine)) {
+            Write-Host "Cannot find uninstall methods for $Mode"
+            return
+        }
+
+        Start-Process cmd.exe "/c $uninstallCmdLine" -WindowStyle Hidden -Wait
     }
 
-}
-
-function Uninstall-WebView {
-    Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-    # Force to use system-wide WebView2
-    # [microsoft.win32.registry]::SetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge\WebView2\BrowserExecutableFolder", "*", "%%SystemRoot%%\System32\Microsoft-Edge-WebView")
-
-    Uninstall-Process -Key '{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
-}
-
-function Uninstall-EdgeUpdate {
-    Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-    $registryPath = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
-    if (!(Test-Path -Path $registryPath)) {
-        Write-Host "Registry key not found: $registryPath"
-        return
-    }
-    $uninstallCmdLine = (Get-ItemProperty -Path $registryPath).UninstallCmdLine
-
-    if ([string]::IsNullOrEmpty($uninstallCmdLine)) {
-        Write-Host "Cannot find uninstall methods for $Mode"
-        return
-    }
-
-    Write-Output "Uninstalling: $uninstallCmdLine"
-    Start-Process cmd.exe "/c $uninstallCmdLine" -WindowStyle Hidden -Wait
-}
-
-Uninstall-Edge
-    # "WebView" { Uninstall-WebView }
-    # "EdgeUpdate" { Uninstall-EdgeUpdate }
-
-
-
-
+    Uninstall-Edge
+    # Uninstall-WebView - WebView is needed for Visual Studio and some MS Store Games like Forza
+    Uninstall-EdgeUpdate
 }

requirements.txt

@@ -0,0 +1,51 @@
+Babel==2.15.0
+bracex==2.5
+cairocffi==1.7.1
+CairoSVG==2.7.1
+certifi==2024.7.4
+cffi==1.17.0
+charset-normalizer==3.3.2
+click==8.1.7
+colorama==0.4.6
+csscompressor==0.9.5
+cssselect2==0.7.0
+defusedxml==0.7.1
+ghp-import==2.1.0
+gitdb==4.0.11
+GitPython==3.1.43
+htmlmin2==0.1.13
+idna==3.7
+Jinja2==3.1.4
+jsmin==3.0.1
+Markdown==3.6
+MarkupSafe==2.1.5
+mergedeep==1.3.4
+mkdocs==1.6.0
+mkdocs-awesome-pages-plugin==2.9.3
+mkdocs-get-deps==0.2.0
+mkdocs-git-revision-date-localized-plugin==1.2.6
+mkdocs-material==9.5.31
+mkdocs-material-extensions==1.3.1
+mkdocs-minify-plugin==0.8.0
+natsort==8.4.0
+packaging==24.1
+paginate==0.5.6
+pathspec==0.12.1
+pillow==10.4.0
+platformdirs==4.2.2
+pycparser==2.22
+Pygments==2.18.0
+pymdown-extensions==10.9
+python-dateutil==2.9.0.post0
+pytz==2024.1
+PyYAML==6.0.2
+pyyaml_env_tag==0.1
+regex==2024.7.24
+requests==2.32.3
+six==1.16.0
+smmap==5.0.1
+tinycss2==1.3.0
+urllib3==2.2.2
+watchdog==4.0.1
+wcmatch==9.0
+webencodings==0.5.1

windev.ps1

@@ -28,7 +28,7 @@ function Get-LatestRelease {
 function RedirectToLatestPreRelease {
     $latestRelease = Get-LatestRelease
     if ($latestRelease) {
-        $url = "https://raw.githubusercontent.com/ChrisTitusTech/winutil/$latestRelease/winutil.ps1"
+        $url = "https://github.com/ChrisTitusTech/winutil/releases/download/$latestRelease/winutil.ps1"
     } else {
         Write-Host 'Unable to determine latest pre-release version.' -ForegroundColor Red
         Write-Host "Using latest Full Release"