Fix onedrive remove for msapps

config/tweaks.json

@@ -2682,17 +2682,26 @@
       "
       $OneDrivePath = $($env:OneDrive)
       Write-Host \"Removing OneDrive\"
+
+      # Check both traditional and Microsoft Store installations
       $regPath = \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OneDriveSetup.exe\"
+      $msStorePath = \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Appx\\AppxAllUserStore\\Applications\\*OneDrive*\"
+
       if (Test-Path $regPath) {
           $OneDriveUninstallString = Get-ItemPropertyValue \"$regPath\" -Name \"UninstallString\"
           $OneDriveExe, $OneDriveArgs = $OneDriveUninstallString.Split(\" \")
           Start-Process -FilePath $OneDriveExe -ArgumentList \"$OneDriveArgs /silent\" -NoNewWindow -Wait
+      } elseif (Test-Path $msStorePath) {
+          Write-Host \"OneDrive appears to be installed via Microsoft Store\" -ForegroundColor Yellow
+          # Attempt to uninstall via winget
+          Start-Process -FilePath winget -ArgumentList \"uninstall -e --purge --accept-source-agreements Microsoft.OneDrive\" -NoNewWindow -Wait
       } else {
-          Write-Host \"Onedrive dosn't seem to be installed anymore\" -ForegroundColor Red
-          return
+          Write-Host \"OneDrive doesn't seem to be installed\" -ForegroundColor Red
+          Write-Host \"Running cleanup if OneDrive path exists\" -ForegroundColor Red
       }
-      # Check if OneDrive got Uninstalled
-      if (-not (Test-Path $regPath)) {
+
+      # Check if OneDrive got Uninstalled (both paths)
+      if (Test-Path $OneDrivePath) {
         Write-Host \"Copy downloaded Files from the OneDrive Folder to Root UserProfile\"
         Start-Process -FilePath powershell -ArgumentList \"robocopy '$($OneDrivePath)' '$($env:USERPROFILE.TrimEnd())\\' /mov /e /xj\" -NoNewWindow -Wait
 
@@ -2758,7 +2767,7 @@
         Write-Host \"If there are Files missing afterwards, please Login to Onedrive.com and Download them manually\" -ForegroundColor Yellow
         Start-Sleep 5
       } else {
-        Write-Host \"Something went Wrong during the Unistallation of OneDrive\" -ForegroundColor Red
+        Write-Host \"Nothing to Cleanup with OneDrive\" -ForegroundColor Red
       }
       "
     ],

functions/microwin/Microwin-NewFirstRun.ps1

@@ -63,22 +63,6 @@ function Microwin-NewFirstRun {
     {
 
     }
-
-    # Get BCD entries and set bootmgr timeout accordingly
-    try
-    {
-        # Check if the number of occurrences of "path" is 2 - this fixes the Boot Manager screen issue (#2562)
-        if ((bcdedit | Select-String "path").Count -eq 2)
-        {
-            # Set bootmgr timeout to 0
-            bcdedit /set `{bootmgr`} timeout 0
-        }
-    }
-    catch
-    {
-
-    }
-
 '@
     $firstRun | Out-File -FilePath "$env:temp\FirstStartup.ps1" -Force
 }

functions/microwin/Microwin-NewUnattend.ps1

@@ -31,7 +31,7 @@ function Microwin-NewUnattend {
                             <Group>Administrators</Group>
                             <Password>
                                 <Value>PW-REPLACEME</Value>
-                                <PlainText>PT-STATUS</PlainText>
+                                <PlainText>true</PlainText>
                             </Password>
                         </LocalAccount>
                     </LocalAccounts>
@@ -42,7 +42,7 @@ function Microwin-NewUnattend {
                     <LogonCount>1</LogonCount>
                     <Password>
                         <Value>PW-REPLACEME</Value>
-                        <PlainText>PT-STATUS</PlainText>
+                        <PlainText>true</PlainText>
                     </Password>
                 </AutoLogon>
                 <OOBE>
@@ -295,40 +295,15 @@ function Microwin-NewUnattend {
     </settings>
 '@
     if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,22000,1))) -eq $false) {
-        # Replace the placeholder text with an empty string to make it valid for Windows 10 Setup
-        $unattend = $unattend.Replace("<#REPLACEME#>", "").Trim()
+    # Replace the placeholder text with an empty string to make it valid for Windows 10 Setup
+    $unattend = $unattend.Replace("<#REPLACEME#>", "").Trim()
     } else {
-        # Replace the placeholder text with the Specialize pass
-        $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim()
+    # Replace the placeholder text with the Specialize pass
+    $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim()
     }
-
-    # User password in Base64. According to Microsoft, this is the way you can hide this sensitive information.
-    # More information can be found here: https://learn.microsoft.com/en-us/windows-hardware/customize/desktop/wsim/hide-sensitive-data-in-an-answer-file
-    # Yeah, I know this is not the best way to protect this kind of data, but we all know how Microsoft is - "the Apple of security" (in a sense, it takes them
-    # an eternity to implement basic security features right. Just look at the NTLM and Kerberos situation!)
-
-    $b64pass = ""
-
     # Replace default User and Password values with the provided parameters
     $unattend = $unattend.Replace("USER-REPLACEME", $userName).Trim()
-    try {
-        # I want to play it safe here - I don't want encoding mismatch problems like last time
-
-        # NOTE: "Password" needs to be appended to the password specified by the user. Otherwise, a parse error will occur when processing oobeSystem.
-        # This will not be added to the actual password stored in the target system's SAM file - only the provided password
-        $b64pass = [Convert]::ToBase64String([System.Text.Encoding]::Unicode.GetBytes("$($userPassword)Password"))
-    } catch {
-        $b64pass = ""
-    }
-    if ($b64pass -ne "") {
-        # If we could encode the password with Base64, put it in the answer file and indicate that it's NOT in plain text
-        $unattend = $unattend.Replace("PW-REPLACEME", $b64pass).Trim()
-        $unattend = $unattend.Replace("PT-STATUS", "false").Trim()
-        $b64pass = ""
-    } else {
-        $unattend = $unattend.Replace("PW-REPLACEME", $userPassword).Trim()
-        $unattend = $unattend.Replace("PT-STATUS", "true").Trim()
-    }
+    $unattend = $unattend.Replace("PW-REPLACEME", $userPassword).Trim()
 
     # Save unattended answer file with UTF-8 encoding
     $unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force -Encoding utf8

functions/microwin/Microwin-RemovePackages.ps1

@@ -45,8 +45,7 @@ function Microwin-RemovePackages {
                 $_ -NotLike "*Foundation*" -AND
                 $_ -NotLike "*LanguageFeatures*" -AND
                 $_ -NotLike "*VBSCRIPT*" -AND
-                $_ -NotLike "*License*" -AND
-                $_ -NotLike "*Hello-Face*"
+                $_ -NotLike "*License*"
             }
 
         $failedCount = 0