Deploying to main from @ ChrisTitusTech/winutil@307980a7ef 🚀

.github/SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+If you find a security issue please make post it in the issues tab. If you think it should be private you can email me at contact@christitus.com. 
+
+For immediate response check out our discord server @ [![](https://dcbadge.limes.pink/api/server/https://discord.gg/RUbZUZyByQ?theme=default-inverted&style=for-the-badge)](https://discord.gg/RUbZUZyByQ)

.github/mkdocs.yml

@@ -1,4 +1,5 @@
 site_name: WinUtil Documentation
+docs_dir: '../docs'
 repo_url: https://github.com/ChrisTitusTech/winutil
 
 nav:
@@ -12,7 +13,7 @@ nav:
 
 theme:
   name: material
-  custom_dir: 'overrides'
+  custom_dir: '../overrides'
   features:
     - navigation.tabs
     - navigation.sections

.github/workflows/github-pages.yaml

@@ -24,8 +24,8 @@ jobs:
           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: Install Necessary Dependencies using 'pip install -r .github/requirements.txt'
+        run: pip install -r .github/requirements.txt
 
       - name: Build & Deploy using 'mkdocs'
-        run: mkdocs gh-deploy --force
+        run: mkdocs gh-deploy --force -f .github/mkdocs.yml

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/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 -->
+<!-- sponsors --><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/robertsandrock"><img src="https://github.com/robertsandrock.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><a href="https://github.com/claudemods"><img src="https://github.com/claudemods.png" width="60px" alt="Claudemods" /></a><!-- sponsors -->
 
 ## 🏅 Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.

docs/contribute.md

@@ -1,3 +1,3 @@
---8<-- "CONTRIBUTING.md"
+--8<-- ".github/CONTRIBUTING.md"
 
 <!-- The content is sourced from "CONTRIBUTING.md," located in the root directory of the project. -->

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -101,7 +101,9 @@ function Remove-Packages {
                 $_ -NotLike "*DesktopAppInstaller*" -AND
                 $_ -NotLike "*WebMediaExtensions*" -AND
                 $_ -NotLike "*WMIC*" -AND
-                $_ -NotLike "*UI.XaML*"
+                $_ -NotLike "*UI.XaML*" -AND
+                $_ -NotLike "*Ethernet*" -AND
+                $_ -NotLike "*Wifi*"
             }
 
         foreach ($pkg in $pkglist) {
@@ -132,42 +134,48 @@ function Remove-ProvisionedPackages() {
         .EXAMPLE
         Remove-ProvisionedPackages
     #>
-    $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object    {
-            $_.PackageName -NotLike "*AppInstaller*" -AND
-            $_.PackageName -NotLike "*Store*" -and
-            $_.PackageName -NotLike "*dism*" -and
-            $_.PackageName -NotLike "*Foundation*" -and
-            $_.PackageName -NotLike "*FodMetadata*" -and
-            $_.PackageName -NotLike "*LanguageFeatures*" -and
-            $_.PackageName -NotLike "*Notepad*" -and
-            $_.PackageName -NotLike "*Printing*" -and
-            $_.PackageName -NotLike "*Wifi*" -and
-            $_.PackageName -NotLike "*Foundation*" -and
-            $_.PackageName -NotLike "*YourPhone*" -and
-            $_.PackageName -NotLike "*Xbox*" -and
-            $_.PackageName -NotLike "*WindowsTerminal*" -and
-            $_.PackageName -NotLike "*Calculator*" -and
-            $_.PackageName -NotLike "*Photos*" -and
-            $_.PackageName -NotLike "*VCLibs*" -and
-            $_.PackageName -NotLike "*Paint*" -and
-            $_.PackageName -NotLike "*Gaming*" -and
-            $_.PackageName -NotLike "*Extension*" -and
-            $_.PackageName -NotLike "*SecHealthUI*"
-
+    try
+    {
+        $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object {
+                $_.PackageName -NotLike "*AppInstaller*" -AND
+                $_.PackageName -NotLike "*Store*" -and
+                $_.PackageName -NotLike "*dism*" -and
+                $_.PackageName -NotLike "*Foundation*" -and
+                $_.PackageName -NotLike "*FodMetadata*" -and
+                $_.PackageName -NotLike "*LanguageFeatures*" -and
+                $_.PackageName -NotLike "*Notepad*" -and
+                $_.PackageName -NotLike "*Printing*" -and
+                $_.PackageName -NotLike "*Foundation*" -and
+                $_.PackageName -NotLike "*YourPhone*" -and
+                $_.PackageName -NotLike "*Xbox*" -and
+                $_.PackageName -NotLike "*WindowsTerminal*" -and
+                $_.PackageName -NotLike "*Calculator*" -and
+                $_.PackageName -NotLike "*Photos*" -and
+                $_.PackageName -NotLike "*VCLibs*" -and
+                $_.PackageName -NotLike "*Paint*" -and
+                $_.PackageName -NotLike "*Gaming*" -and
+                $_.PackageName -NotLike "*Extension*" -and
+                $_.PackageName -NotLike "*SecHealthUI*"
         }
 
-    $counter = 0
-    foreach ($appx in $appxProvisionedPackages) {
-        $status = "Removing Provisioned $($appx.PackageName)"
-        Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
-        try {
-            Remove-AppxProvisionedPackage -Path "$scratchDir" -PackageName $appx.PackageName -ErrorAction SilentlyContinue
-        } catch {
-            Write-Host "Application $($appx.PackageName) could not be removed"
-            continue
+        $counter = 0
+        foreach ($appx in $appxProvisionedPackages) {
+            $status = "Removing Provisioned $($appx.PackageName)"
+            Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
+            try {
+                Remove-AppxProvisionedPackage -Path "$scratchDir" -PackageName $appx.PackageName -ErrorAction SilentlyContinue
+            } catch {
+                Write-Host "Application $($appx.PackageName) could not be removed"
+                continue
+            }
         }
+        Write-Progress -Activity "Removing Provisioned Apps" -Status "Ready" -Completed
+    }
+    catch
+    {
+        # This can happen if getting AppX packages fails
+        Write-Host "Unable to get information about the AppX packages. MicroWin processing will continue, but AppX packages will not be processed"
     }
-    Write-Progress -Activity "Removing Provisioned Apps" -Status "Ready" -Completed
 }
 
 function Copy-ToUSB([string]$fileToCopy) {

gpedit-home.ps1

@@ -1,4 +0,0 @@
-Get-ChildItem @(
-    "$env:SystemRoot\servicing\Packages\Microsoft-Windows-GroupPolicy-ClientTools-Package*.mum",
-    "$env:SystemRoot\servicing\Packages\Microsoft-Windows-GroupPolicy-ClientExtensions-Package*.mum"
-) | ForEach-Object { dism.exe /online /norestart /add-package:"$_" }

tools/devdocs-generator.ps1

@@ -563,17 +563,17 @@ function Add-LinkAttributeToJson {
 }
 
 Update-Progress "Loading JSON files" 10
-$tweaks = Get-Content -Path "config/tweaks.json" | ConvertFrom-Json
-$features = Get-Content -Path "config/feature.json" | ConvertFrom-Json
+$tweaks = Get-Content -Path "../config/tweaks.json" | ConvertFrom-Json
+$features = Get-Content -Path "../config/feature.json" | ConvertFrom-Json
 
 Update-Progress "Getting last modified dates of the JSON files" 20
-$tweaksLastModified = (Get-Item "config/tweaks.json").LastWriteTime.ToString("yyyy-MM-dd")
-$featuresLastModified = (Get-Item "config/feature.json").LastWriteTime.ToString("yyyy-MM-dd")
+$tweaksLastModified = (Get-Item "../config/tweaks.json").LastWriteTime.ToString("yyyy-MM-dd")
+$featuresLastModified = (Get-Item "../config/feature.json").LastWriteTime.ToString("yyyy-MM-dd")
 
-$tweaksOutputDir = "docs/dev/tweaks"
-$featuresOutputDir = "docs/dev/features"
-$privateFunctionsDir = "functions/private"
-$publicFunctionsDir = "functions/public"
+$tweaksOutputDir = "../docs/dev/tweaks"
+$featuresOutputDir = "../docs/dev/features"
+$privateFunctionsDir = "../functions/private"
+$publicFunctionsDir = "../functions/public"
 $functions = @{}
 $itemnametocut = "WPF(WinUtil|Toggle|Features?|Tweaks?|Panel|Fix(es)?)?"
 
@@ -592,7 +592,7 @@ Load-Functions -dir $publicFunctionsDir
 Update-Progress "Adding documentation links to JSON files" 50
 
 # Define the JSON file paths
-$jsonPaths = @(".\config\feature.json", ".\config\tweaks.json")
+$jsonPaths = @("../config/feature.json", "../config/tweaks.json")
 
 # Loop through each JSON file path
 foreach ($jsonPath in $jsonPaths) {
@@ -612,12 +612,12 @@ foreach ($jsonPath in $jsonPaths) {
     Set-Content -Path $jsonPath -Value $jsonString
 }
 
-Add-LinkAttributeToJson -jsonFilePath "config/tweaks.json" -outputDir "dev/tweaks"
-Add-LinkAttributeToJson -jsonFilePath "config/feature.json" -outputDir "dev/features"
+Add-LinkAttributeToJson -jsonFilePath "../config/tweaks.json" -outputDir "dev/tweaks"
+Add-LinkAttributeToJson -jsonFilePath "../config/feature.json" -outputDir "dev/features"
 
 Update-Progress "Generating content for documentation" 60
-$tweakResult = Generate-MarkdownFiles -data $tweaks -outputDir $tweaksOutputDir -jsonFilePath "config/tweaks.json" -lastModified $tweaksLastModified -type "tweak" -initialProgress 60
-$featureResult = Generate-MarkdownFiles -data $features -outputDir $featuresOutputDir -jsonFilePath "config/feature.json" -lastModified $featuresLastModified -type "feature" -initialProgress 70
+$tweakResult = Generate-MarkdownFiles -data $tweaks -outputDir $tweaksOutputDir -jsonFilePath "../config/tweaks.json" -lastModified $tweaksLastModified -type "tweak" -initialProgress 60
+$featureResult = Generate-MarkdownFiles -data $features -outputDir $featuresOutputDir -jsonFilePath "../config/feature.json" -lastModified $featuresLastModified -type "feature" -initialProgress 70
 
 Update-Progress "Generating table of contents" 80
 $allTocEntries = $tweakResult.TocEntries + $featureResult.TocEntries
@@ -639,6 +639,6 @@ $indexContent += Process-MultilineStrings @"
     \\
 "@
 $indexContent += $(Generate-TypeSectionContent $featureEntries) + "`r`n"
-Set-Content -Path "docs/devdocs.md" -Value $indexContent -Encoding utf8
+Set-Content -Path "../docs/devdocs.md" -Value $indexContent -Encoding utf8
 
 Update-Progress "Process Completed" 100