Merge pull request #52 from meetrevision/dev

Merge Dev Branch 23.11

src/Configuration/features/revision/appx.yml

@@ -7,71 +7,138 @@ actions:
   - !writeStatus: {status: "Removing Appx Packages"}
   - !appx: {name: '*Disney*', type: family, weight: 10}
 
-  - !appx: {name: '*microsoft.microsoftedge.stable*', type: family, weight: 10, option: "remove-edge"}
-  - !appx: {name: '*Microsoft.MicrosoftEdge*', type: family, weight: 10, option: "remove-edge"}
-  - !appx: {name: '*Microsoft.MicrosoftEdgeDevToolsClient*', type: family, weight: 10, option: "remove-edge"}
-  - !file: {path: "C:\\Windows\\SystemApps\\Microsoft.MicrosoftEdgeDevToolsClient_8wekyb3d8bbwe", option: "remove-edge"}
+  - !appx: {name: '*microsoft.microsoftedge.stable*', type: family, ignoreErrors: true, weight: 10, option: "remove-edge"}
+  - !appx: {name: '*Microsoft.MicrosoftEdge*', type: family, ignoreErrors: true, weight: 10, option: "remove-edge"}
+  - !appx: {name: '*Microsoft.MicrosoftEdgeDevToolsClient*', ignoreErrors: true, type: family, weight: 10, option: "remove-edge"}
+  - !file: {path: "C:\\Windows\\SystemApps\\Microsoft.MicrosoftEdgeDevToolsClient_8wekyb3d8bbwe", ignoreErrors: true, option: "remove-edge"}
 
-  - !appx: {name: '*OneDrive*', type: family, weight: 10, option: "remove-onedrive"}
+  - !writeStatus: {status: "Removing OneDrive"}
+  - !appx: {name: '*OneDrive*', type: family, ignoreErrors: true, weight: 10, option: "remove-onedrive"}
+
+  - !writeStatus: {status: "Removing Spotify"}
   - !appx: {name: '*Spotify*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing SecureAssessmentBrowser"}
   - !appx: {name: '*SecureAssessmentBrowser*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing PeopleExperienceHost"}
   - !appx: {name: '*PeopleExperienceHost*', type: family, weight: 10}
 
+  - !writeStatus: {status: "Removing Photos"}
   - !appx: {name: '*Microsoft.Windows.Photos*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing Camera"}
   - !appx: {name: '*Microsoft.WindowsCamera*', type: family, weight: 10}
-  - !appx: {name: '*MicrosoftWindows.Client.WebExperience*', type: family, weight: 10}
+  
+  - !writeStatus: {status: "Removing WebExperience"}
+  - !appx: {name: '*MicrosoftWindows.Client.WebExperience*', ignoreErrors: true, type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing Alarms"}
   - !appx: {name: '*Microsoft.WindowsAlarms*', type: family, weight: 10}
+ 
+  - !writeStatus: {status: "Removing WindowsMaps"}
   - !appx: {name: '*Microsoft.WindowsMaps*', type: family, weight: 10}
+  
+  - !writeStatus: {status: "Removing StickyNotes"}
   - !appx: {name: '*Microsoft.MicrosoftStickyNotes*', type: family, weight: 10}
+  
+  - !writeStatus: {status: "Removing Mail"}
   - !appx: {name: '*microsoft.windowscommunicationsapps*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing People"}
   - !appx: {name: '*Microsoft.People*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing BingNews"}
   - !appx: {name: '*Microsoft.BingNews*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing BingWeather"}
   - !appx: {name: '*Microsoft.BingWeather*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing Solitaire"}
   - !appx: {name: '*Microsoft.MicrosoftSolitaireCollection*', type: family, weight: 10}
-  - !appx: {name: '*Microsoft.MicrosoftOfficeHub*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing Feedback"}
   - !appx: {name: '*Microsoft.WindowsFeedbackHub*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing GetHelp"}
   - !appx: {name: '*Microsoft.GetHelp*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing GetStarted"}
   - !appx: {name: '*Microsoft.Getstarted*', type: family, weight: 10}
+    # Get Started placeholder
+  - !appx: {name: '*WebExperienceHost*', type: app, weight: 10}
+
+  - !writeStatus: {status: "Removing Todos"}
   - !appx: {name: '*Microsoft.Todos*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing PowerAutomate"}
   - !appx: {name: '*Microsoft.PowerAutomateDesktop*', type: family, weight: 10}
     # Cortana
+  - !writeStatus: {status: "Removing Cortana"}
   - !appx: {name: '*Microsoft.549981C3F5F10*', type: family, weight: 10}
+  
+  - !writeStatus: {status: "Removing QuickAssist"}
   - !appx: {name: '*MicrosoftCorporationII.QuickAssist*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing MS Family"}
   - !appx: {name: '*MicrosoftCorporationII.MicrosoftFamily*', type: family, weight: 10}
+  
+  - !writeStatus: {status: "Removing ZuneMusic"}
   - !appx: {name: '*Microsoft.ZuneMusic*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing ZuneVideo"}
   - !appx: {name: '*Microsoft.ZuneVideo*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing SoundRecorder"}
   - !appx: {name: '*Microsoft.WindowsSoundRecorder*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing Clipchamp"}
   - !appx: {name: '*Clipchamp.Clipchamp*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing Whiteboard"}
   - !appx: {name: '*Microsoft.Whiteboard*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing skydrive"}
   - !appx: {name: '*microsoft.microsoftskydrive*', type: family, weight: 10}
+  
+  - !writeStatus: {status: "Removing TeamsforSurfaceHub"}
   - !appx: {name: '*Microsoft.MicrosoftTeamsforSurfaceHub*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing MailforSurfaceHub"}
   - !appx: {name: '*MicrosoftCorporationII.MailforSurfaceHub*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing PowerBI"}
   - !appx: {name: '*Microsoft.MicrosoftPowerBIForWindows*', type: family, weight: 10}
+  - !writeStatus: {status: "Removing Skype"}
   - !appx: {name: '*Microsoft.SkypeApp*', type: family, weight: 10}
+ 
+  - !writeStatus: {status: "Removing UWP Office"}
+  - !appx: {name: '*Microsoft.MicrosoftOfficeHub*', type: family, weight: 10}
   - !appx: {name: '*Microsoft.Office.Excel*', type: family, weight: 10}
   - !appx: {name: '*Microsoft.Office.PowerPoint*', type: family, weight: 10}
   - !appx: {name: '*Microsoft.Office.Word*', type: family, weight: 10}
   - !appx: {name: '*Microsoft.Office.OneNote*', type: family, weight: 10}
+    # 23H2
+  - !appx: {name: 'Microsoft.OutlookForWindows*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing 3DViewer"}
   - !appx: {name: '*Microsoft.Microsoft3DViewer*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing Advertising"}
   - !appx: {name: 'Microsoft.Advertising*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing MixedRealityPortal"}
   - !appx: {name: '*MixedReality.Portal*', type: family, weight: 10}
   
     # Paint 3D
+  - !writeStatus: {status: "Removing Paint"}
   - !appx: {name: '*Microsoft.MSPaint*', type: family, weight: 10}
 
-    # Get Started app
-  - !appx: {name: '*WebExperienceHost*', type: app, weight: 10}
-
+  - !writeStatus: {status: "Removing Teams"}
   - !taskKill: {name: "*teams*", ignoreErrors: true}
   - !appx: {name: '*MicrosoftTeams*', type: family, weight: 10}
 
-    # MicrosoftWindows.Client.Core_cw5n1h2txyewy!
+  - !writeStatus: {status: "Removing Banners"}
+    # MicrosoftWindows.Client.CBS_cw5n1h2txyewy!
   - !appx: {name: '*Global.ValueBanner*', type: app, weight: 50}
+  - !appx: {name: '*Global.WsxPackManager*', type: app, weight: 50}
     # MicrosoftWindows.Client.Core_cw5n1h2txyewy
   - !appx: {name: '*Global.BackupBanner*', type: app, weight: 50}
-   
-    # 23H2
-  - !appx: {name: 'Microsoft.OutlookForWindows*', type: family, weight: 10}
+
+  - !writeStatus: {status: "Removing DevHome"}
   - !appx: {name: '*DevHome*', type: family, option: "remove-uwp-devhome", weight: 10}
   
+  - !writeStatus: {status: "Removing Windows Backup"}
   - !appx: {name: '*WindowsBackup*', type: app, option: "remove-uwp-wbackup", weight: 10}

src/Configuration/features/revision/components.yml

@@ -8,10 +8,10 @@ actions:
 
     # Microsoft Edge
   - !writeStatus: {status: "Removing Microsoft Edge", option: "remove-edge"}
-  - !taskKill: {name: "MicrosoftEdgeUpdate", option: "remove-edge"}
-  - !taskKill: {name: "msedge", option: "remove-edge"}
-  - !taskKill: {name: "MicrosoftEdge*", option: "remove-edge"}
-  - !taskKill: {name: "setup", pathContains: "\\Edge", option: "remove-edge"}
+  - !taskKill: {name: "MicrosoftEdgeUpdate", ignoreErrors: true, option: "remove-edge"}
+  - !taskKill: {name: "msedge", ignoreErrors: true, option: "remove-edge"}
+  - !taskKill: {name: "MicrosoftEdge*", ignoreErrors: true, option: "remove-edge"}
+  - !taskKill: {name: "setup", ignoreErrors: true, pathContains: "\\Edge", option: "remove-edge"}
   - !run: {exeDir: true, exe: "EDGE.cmd", option: "remove-edge", weight: 40}
   - !file: {path: "%ProgramFiles(x86)%\\Microsoft\\Edge", option: "remove-edge", weight: 50}
   # - !service: {name: "edgeupdate", operation: delete}
@@ -26,12 +26,11 @@ actions:
   - !registryValue: {path: 'HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update', value: 'NoRemove', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView', value: 'NoRemove', type: REG_DWORD, data: '0'}
 
-
     # OneDrive
   - !writeStatus: {status: "Removing OneDrive", option: "remove-onedrive"}
-  - !taskKill: {name: "OneDriveStandaloneUpdater", option: "remove-onedrive"}
-  - !taskKill: {name: "OneDriveSetup", option: "remove-onedrive"}
-  - !taskKill: {name: "OneDrive*", option: "remove-onedrive"}
+  - !taskKill: {name: "OneDriveStandaloneUpdater", ignoreErrors: true, option: "remove-onedrive"}
+  - !taskKill: {name: "OneDriveSetup", ignoreErrors: true, option: "remove-onedrive"}
+  - !taskKill: {name: "OneDrive*", ignoreErrors: true, option: "remove-onedrive"}
 
   - !run: {exeDir: true, exe: "ONED.cmd", option: "remove-onedrive", weight: 40}
   # - !service: {name: "OneSyncSvc*", option: "remove-onedrive", operation: delete}

src/Configuration/features/revision/registry/configure-windows-settings.yml

@@ -5,7 +5,7 @@ privilege: TrustedInstaller
 actions:
 
     # === Hide stripped components from Settings - Windows Updates
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer', value: 'SettingsPageVisibility', type: REG_SZ, data: 'hide:home;cortana;privacy-automaticfiledownloads;privacy-feedback;windowsinsider;windowsupdate'}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer', value: 'SettingsPageVisibility', type: REG_SZ, data: 'hide:cortana;privacy-automaticfiledownloads;privacy-feedback;windowsinsider;windowsupdate'}
 
   # === Hide Insider page from Settings --> Windows Updates
   - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\WindowsSelfHost\UI\Visibility', value: 'HideInsiderPage', type: REG_DWORD, data: '1'}

src/Configuration/features/revision/start.yml

@@ -4,12 +4,14 @@ description: Copies Revision folders/files, and configures some initial settings
 privilege: TrustedInstaller
 actions:
   
-  - !taskKill: {name: "explorer"}
-  - !taskKill: {name: "SearchApp"}
-  - !taskKill: {name: "SearchHost"}
-  - !taskKill: {name: "RuntimeBroker"}
-  - !taskKill: {name: "TextInputHost"}
-  - !taskKill: {name: "ShellExperienceHost"}
+  - !taskKill: {name: "explorer", ignoreErrors: true}
+  - !taskKill: {name: "SearchApp", ignoreErrors: true}
+  - !taskKill: {name: "SearchHost", ignoreErrors: true}
+  - !taskKill: {name: "RuntimeBroker", ignoreErrors: true}
+  - !taskKill: {name: "TextInputHost", ignoreErrors: true}
+  - !taskKill: {name: "ShellExperienceHost", ignoreErrors: true}
+  - !taskKill: {name: "backgroundTaskHost", ignoreErrors: true}
+  - !taskKill: {name: "Widgets", ignoreErrors: true}
   
   - !writeStatus: {status: "Initializing"}
 

src/Executables/CLEANER.ps1

@@ -56,7 +56,7 @@ $foldersToRemove = @(
     "System32\LogFiles",
     "System32\sru"
     "Temp",
-    "WinSxS\Backup"
+    # "WinSxS\Backup"
     # "Panther",
     # "Prefetch"
 )
@@ -81,5 +81,5 @@ Start-ScheduledTask -TaskPath "\Microsoft\Windows\DiskCleanup\" -TaskName "Silen
 # Write-Host "Cleaning up Retail Demo Content"
 # Start-ScheduledTask -TaskPath "\Microsoft\Windows\RetailDemo\" -TaskName "CleanupOfflineContent"
 
-Write-Host "Cleaning up the WinSxS Components"
-DISM /Online /Cleanup-Image /StartComponentCleanup
+# Write-Host "Cleaning up the WinSxS Components"
+# DISM /Online /Cleanup-Image /StartComponentCleanup

src/Executables/DISM-FEATURES.ps1

@@ -9,17 +9,13 @@ function Toggle-Feature {
 	
 	$dismCmd = if ($bool) { "Enable" } else { "Disable" }
 	
-    if ($regKey -eq $null) {
+    if ($regKey -eq $null -or ($regKey.Selection -eq 0 -and $bool) -or ($regKey.Selection -eq 1 -and !$bool)) {
         Write-Host "$dismCmd $featureName"
-    } else {
-		if (($regKey.Selection -eq 0 -and $bool) -or ($regKey.Selection -eq 1 -and !$bool)) {
-            Write-Host "$dismCmd $featureName"
-			if ($bool) {
-				Enable-WindowsOptionalFeature -Online -FeatureName $featureName -NoRestart
-			} else {
-				Disable-WindowsOptionalFeature -Online -FeatureName $featureName -NoRestart
-			}
-		}
+        if ($bool) {
+            Enable-WindowsOptionalFeature -Online -FeatureName $featureName -NoRestart
+        } else {
+            Disable-WindowsOptionalFeature -Online -FeatureName $featureName -NoRestart
+        }
     }
 }
 

src/Executables/FINALIZE.cmd

@@ -1,5 +1,5 @@
 @echo off
-set version=23.10
+set version=23.11
 for /f "tokens=2 delims==" %%i in ('wmic os get BuildNumber /value ^| find "="') do set "build=%%i"
 if %build% gtr 19045 ( set "w11=true" )
 
@@ -27,9 +27,6 @@ if not defined w11 (
 	bcdedit /set description "ReviOS 11 %version%" >NUL 2>nul
   reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation" /v "Model"  /t REG_SZ /d "ReviOS 11 %version%" /f >NUL 2>nul
   reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v "RegisteredOrganization" /t REG_SZ /d "ReviOS 11 %version%" /f >NUL 2>nul
-
-  :: Credits to Garlin for the idea
-  PowerShell -NonInteractive -NoLogo -NoP -C "& { $Cbs = \"$env:SystemRoot\\SystemApps\\MicrosoftWindows.Client.CBS_cw5n1h2txyewy\"; $Manifest = Join-Path $Cbs 'appxmanifest.xml'; takeown /a /f $Manifest; icacls $Manifest /grant Administrators:F; $ReviManifest = Join-Path $Cbs \"appxmanifest.xml.revi\"; if (!(Test-Path $ReviManifest)) { Copy-Item -Path $Manifest -Destination $ReviManifest -Force; Remove-Item $Manifest -Force }; [xml]$xml = Get-Content -Path \"$Cbs\\appxmanifest.xml.revi\" -Raw; $applicationNode = $xml.Package.Applications.Application | Where-Object { $_.Id -eq 'WebExperienceHost' }; if ($applicationNode -ne $null) { $xml.Package.Applications.RemoveChild($applicationNode) } $xml.Save($Manifest) }"
 )
 
 PowerShell -NonInteractive -NoLogo -NoP -C "Get-CimInstance -Namespace "Root\cimv2\mdm\dmmap" -ClassName "MDM_EnterpriseModernAppManagement_AppManagement01" | Invoke-CimMethod -MethodName UpdateScanMethod" >NUL 2>nul

src/Executables/ONED.cmd

@@ -12,7 +12,7 @@ for /f "usebackq tokens=2 delims=\" %%e in (`reg query "HKEY_USERS" ^| findstr /
 	)
 )
 
-taskkill /f /im "OneDrive.exe"
+taskkill /f /im "OneDrive.exe" >NUL 2>nul
 
 for /f "usebackq delims=" %%a in (`dir /b /a:d "%SystemDrive%\Users"`) do (
 	rmdir /q /s "%SystemDrive%\Users\%%a\AppData\Local\Microsoft\OneDrive" >NUL 2>nul

src/Executables/WALLPAPER.cmd

@@ -1,7 +1,7 @@
 @echo off
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-robocopy "Web" "%windir%\Web" /E /PURGE /IM /IT /NP
+robocopy "Web" "%windir%\Web" /E /IM /IT /NP
 
 @REM :: Set wallpaper path for new users, as well as dark/light theme
 @REM type "!windir!\Resources\Themes\aero.theme" | findstr /c:"AppMode=" > nul

src/playbook.conf

@@ -7,7 +7,7 @@
     <Description>This Playbook will help you quickly deploy ReviOS on your current system.</Description>
     <Details>Experience an ideal, lightweight and stable system, designed to enhance performance and
         privacy while ensuring compatibility.</Details>
-    <Version>23.10</Version>
+    <Version>23.11</Version>
     <SupportedBuilds>
         <string>19044</string>
         <string>19045</string>