Merge branch 'main' into Win11ISO

Author: ChrisTitusTech

.github/workflows/auto-merge-docs.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   auto-merge:
-    if: github.event.pull_request.head.ref == 'docs-update' && github.event.pull_request.user.login == 'github-actions[bot]'
+    if: github.event.pull_request.head.ref == 'docs-update' && (github.event.pull_request.user.login == 'ChrisTitusTech' || github.event.pull_request.user.login == 'github-actions[bot]')
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -18,13 +18,14 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Auto-approve PR
+        if: github.event.pull_request.user.login == 'github-actions[bot]'
         run: gh pr review "$PR_NUMBER" --approve
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
           GH_TOKEN: ${{ secrets.AUTO_MERGE }}
 
       - name: Enable auto-merge
-        run: gh pr merge "$PR_NUMBER" --squash --auto --delete-branch
+        run: gh pr merge "$PR_NUMBER" --squash --delete-branch --admin
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.AUTO_MERGE }}

.github/workflows/docs.yaml

@@ -12,7 +12,7 @@ on:
   workflow_dispatch:
 
 permissions:
-  contents: write
+  contents: read
   pages: write
   id-token: write
   pull-requests: write
@@ -47,22 +47,27 @@ jobs:
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v5
+        
       - name: Generate Dev Docs from JSON
         shell: pwsh
         run: |
           Set-Location tools
           ./devdocs-generator.ps1
 
-      - name: Create Pull Request 🚀
+      - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v8
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: 'Update generated documentation'
+          token: ${{ secrets.AUTO_MERGE }}
+          commit-message: 'chore: Update generated dev docs'
           title: 'chore: Update Generated Dev Docs'
           body: 'Automated update of generated documentation from JSON sources'
           branch: docs-update
           delete-branch: true
+          add-paths: |
+            docs/content/dev/
+            config/tweaks.json
+            config/feature.json
           labels: |
             automated
             documentation

.github/workflows/pre-release.yaml

@@ -3,6 +3,7 @@ name: Pre-Release WinUtil
 permissions:
   contents: write
   actions: read
+  pull-requests: write
 
 on:
   workflow_dispatch: # Manual trigger added
@@ -22,25 +23,35 @@ jobs:
           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: |
           Set-ExecutionPolicy Bypass -Scope Process -Force; ./Compile.ps1
         continue-on-error: false # Directly fail the job on error, removing the need for a separate check
 
+      - name: Create Pull Request for Updated JSON Links
+        id: cpr
+        uses: peter-evans/create-pull-request@v8
+        with:
+          token: ${{ secrets.AUTO_MERGE }}
+          commit-message: 'chore: Update documentation links in JSON configs'
+          title: 'chore: Update Generated Dev Docs'
+          body: 'Automated update of documentation links in JSON configs from pre-release build'
+          branch: docs-update
+          delete-branch: true
+          add-paths: |
+            config/tweaks.json
+            config/feature.json
+          labels: |
+            automated
+            documentation
+
+      - name: Check outputs
+        shell: bash
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
       - name: Set Version to Todays Date
         id: extract_version
         run: |

.github/workflows/sponsors.yaml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Create Pull Request 🚀
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: 'Update sponsors in README'

config/preset.json

@@ -16,7 +16,6 @@
   ],
   "Minimal": [
     "WPFTweaksConsumerFeatures",
-    "WPFTweaksDisableExplorerAutoDiscovery",
     "WPFTweaksWPBT",
     "WPFTweaksServices",
     "WPFTweaksTelemetry"

config/tweaks.json

@@ -2615,7 +2615,7 @@
   },
   "WPFTweaksDisableExplorerAutoDiscovery": {
     "Content": "Disable Explorer Automatic Folder Discovery",
-    "Description": "Windows Explorer automatically tries to guess the type of the folder based on its contents, slowing down the browsing experience.",
+    "Description": "Windows Explorer automatically tries to guess the type of the folder based on its contents, slowing down the browsing experience. WARNING! Will disable file explorer grouping",
     "category": "Essential Tweaks",
     "panel": "1",
     "InvokeScript": [

docs/content/dev/features/Features/DisableLegacyRecovery.md

@@ -3,13 +3,12 @@ title: "Disable Legacy F8 Boot Recovery"
 description: ""
 ---
 
-```json {filename="config/feature.json",linenos=inline,linenostart=107}
+```json {filename="config/feature.json",linenos=inline,linenostart=100}
   "WPFFeatureDisableLegacyRecovery": {
     "Content": "Disable Legacy F8 Boot Recovery",
     "Description": "Disables Advanced Boot Options screen that lets you start Windows in advanced troubleshooting modes.",
     "category": "Features",
     "panel": "1",
-    "Order": "a019_",
     "feature": [],
     "InvokeScript": [
       "bcdedit /set bootmenupolicy standard"

docs/content/dev/features/Features/EnableLegacyRecovery.md

@@ -3,13 +3,12 @@ title: "Enable Legacy F8 Boot Recovery"
 description: ""
 ---
 
-```json {filename="config/feature.json",linenos=inline,linenostart=95}
+```json {filename="config/feature.json",linenos=inline,linenostart=89}
   "WPFFeatureEnableLegacyRecovery": {
     "Content": "Enable Legacy F8 Boot Recovery",
     "Description": "Enables Advanced Boot Options screen that lets you start Windows in advanced troubleshooting modes.",
     "category": "Features",
     "panel": "1",
-    "Order": "a018_",
     "feature": [],
     "InvokeScript": [
       "bcdedit /set bootmenupolicy legacy"

docs/content/dev/features/Features/RegBackup.md

@@ -3,13 +3,12 @@ title: "Enable Daily Registry Backup Task 12.30am"
 description: ""
 ---
 
-```json {filename="config/feature.json",linenos=inline,linenostart=77}
+```json {filename="config/feature.json",linenos=inline,linenostart=72}
   "WPFFeatureRegBackup": {
     "Content": "Enable Daily Registry Backup Task 12.30am",
     "Description": "Enables daily registry backup, previously disabled by Microsoft in Windows 10 1803.",
     "category": "Features",
     "panel": "1",
-    "Order": "a017_",
     "feature": [],
     "InvokeScript": [
       "

docs/content/dev/features/Features/Sandbox.md

@@ -3,13 +3,12 @@ title: "Windows Sandbox"
 description: ""
 ---
 
-```json {filename="config/feature.json",linenos=inline,linenostart=119}
+```json {filename="config/feature.json",linenos=inline,linenostart=111}
   "WPFFeaturesSandbox": {
     "Content": "Windows Sandbox",
     "Description": "Windows Sandbox is a lightweight virtual machine that provides a temporary desktop environment to safely run applications and programs in isolation.",
     "category": "Features",
     "panel": "1",
-    "Order": "a021_",
     "feature": [
       "Containers-DisposableClientVM"
     ],