OneDrive Removal Updated, read description (#3659)

* Update tweaks.json

* Update tweaks.json

* Update tweaks.json

* Remove Unneccary -ErrorAction in OneDrive-Removal

* Format fixes for WPFTweaksRemoveOnedrive

config/tweaks.json

@@ -2714,95 +2714,12 @@
     "Order": "a031_",
     "InvokeScript": [
       "
-      $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 doesn't seem to be installed\" -ForegroundColor Red
-          Write-Host \"Running cleanup if OneDrive path exists\" -ForegroundColor Red
-      }
-
-      # 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
+      Write-Host \"Uninstalling OneDrive\"
+      Start-Process \"$env:SystemRoot\\System32\\OneDriveSetup.exe\" -ArgumentList /uninstall -NoNewWindow -Wait
 
       Write-Host \"Removing OneDrive leftovers\"
-        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:localappdata\\Microsoft\\OneDrive\"
-        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:localappdata\\OneDrive\"
-        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:programdata\\Microsoft OneDrive\"
-        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:systemdrive\\OneDriveTemp\"
-        reg delete \"HKEY_CURRENT_USER\\Software\\Microsoft\\OneDrive\" -f
-        # check if directory is empty before removing:
-        If ((Get-ChildItem \"$OneDrivePath\" -Recurse | Measure-Object).Count -eq 0) {
-            Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$OneDrivePath\"
-        }
-
-        Write-Host \"Remove Onedrive from Explorer sidebar\"
-        Set-ItemProperty -Path \"HKCR:\\CLSID\\{018D5C66-4533-4307-9B53-224DE2ED1FE6}\" -Name \"System.IsPinnedToNameSpaceTree\" -Value 0
-        Set-ItemProperty -Path \"HKCR:\\Wow6432Node\\CLSID\\{018D5C66-4533-4307-9B53-224DE2ED1FE6}\" -Name \"System.IsPinnedToNameSpaceTree\" -Value 0
-
-        Write-Host \"Removing run hook for new users\"
-        reg load \"hku\\Default\" \"C:\\Users\\Default\\NTUSER.DAT\"
-        reg delete \"HKEY_USERS\\Default\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run\" /v \"OneDriveSetup\" /f
-        reg unload \"hku\\Default\"
-
-        Write-Host \"Removing autostart key\"
-        reg delete \"HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run\" /v \"OneDrive\" /f
-
-        Write-Host \"Removing startmenu entry\"
-        Remove-Item -Force -ErrorAction SilentlyContinue \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\OneDrive.lnk\"
-
-        Write-Host \"Removing scheduled task\"
-        Get-ScheduledTask -TaskPath '\\' -TaskName 'OneDrive*' -ea SilentlyContinue | Unregister-ScheduledTask -Confirm:$false
-
-        # Add Shell folders restoring default locations
-        Write-Host \"Shell Fixing\"
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"AppData\" -Value \"$env:userprofile\\AppData\\Roaming\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Cache\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\INetCache\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Cookies\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\INetCookies\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Favorites\" -Value \"$env:userprofile\\Favorites\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"History\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\History\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Local AppData\" -Value \"$env:userprofile\\AppData\\Local\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Music\" -Value \"$env:userprofile\\Music\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Video\" -Value \"$env:userprofile\\Videos\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"NetHood\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Network Shortcuts\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"PrintHood\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Printer Shortcuts\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Programs\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Recent\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Recent\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"SendTo\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\SendTo\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Start Menu\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Startup\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Templates\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Templates\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{374DE290-123F-4565-9164-39C4925E467B}\" -Value \"$env:userprofile\\Downloads\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Desktop\" -Value \"$env:userprofile\\Desktop\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Pictures\" -Value \"$env:userprofile\\Pictures\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Personal\" -Value \"$env:userprofile\\Documents\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{F42EE2D3-909F-4907-8871-4C22FC0BF756}\" -Value \"$env:userprofile\\Documents\" -Type ExpandString
-        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{0DDD015D-B06C-45D5-8C4C-F59713854639}\" -Value \"$env:userprofile\\Pictures\" -Type ExpandString
-        Write-Host \"Restarting explorer\"
-        taskkill.exe /F /IM \"explorer.exe\"
-        Start-Process \"explorer.exe\"
-
-        Write-Host \"Waiting for Explorer to complete loading\"
-        Write-Host \"Please Note - The OneDrive folder at $OneDrivePath may still have items in it. You must manually delete it, but all the files should already be copied to the base user folder.\"
-        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 \"Nothing to Cleanup with OneDrive\" -ForegroundColor Red
-      }
+      Remove-Item \"$env:LocalAppData\\Microsoft\\OneDrive\" -Recurse -Force
+      Remove-Item \"$env:ProgramData\\Microsoft OneDrive\" -Recurse -Force
       "
     ],
     "UndoScript": [

functions/public/Invoke-WPFInstall.ps1

@@ -33,62 +33,6 @@ function Invoke-WPFInstall {
         try {
             $sync.ProcessRunning = $true
             if($packagesWinget.Count -gt 0 -and $packagesWinget -ne "0") {
-                Add-Type -AssemblyName System.DirectoryServices.AccountManagement
-                Add-Type -assembly System.Windows.Forms
-                $PrincipalContext = New-Object System.DirectoryServices.AccountManagement.PrincipalContext('Machine')
-                $user = $env:USERNAME
-
-                Get-LocalUser | Where-Object Enabled -eq $true | ForEach-Object {
-                        $validPassword = $false
-                        while (-not $validPassword) {
-                            try {
-                                $myPasswordIsBlank = $PrincipalContext.ValidateCredentials($user, $null)
-                                $validPassword = $true
-                            } catch {
-                                $form = New-Object System.Windows.Forms.Form
-                                $form.Text = "Set password for $user"
-                                $form.Size = New-Object System.Drawing.Size(500, 200)
-
-                                $label = New-Object System.Windows.Forms.Label
-                                $label.Text = 'Admin mode install failed. Set a USER password for login and user-based installation.'
-                                $label.Size = New-Object System.Drawing.Size(480, 60)
-                                $label.Location = New-Object System.Drawing.Point(10, 10)
-                                $form.Controls.Add($label)
-
-                                $passwordBox = New-Object System.Windows.Forms.TextBox
-                                $passwordBox.Size = New-Object System.Drawing.Size(380, 20)
-                                $passwordBox.UseSystemPasswordChar = $true
-                                $passwordBox.Location = New-Object System.Drawing.Point(10, 125)
-                                $form.Controls.Add($passwordBox)
-
-                                $button = New-Object System.Windows.Forms.Button
-                                $button.Text = 'Submit'
-                                $button.Size = New-Object System.Drawing.Size(75, 23)
-                                $button.Location = New-Object System.Drawing.Point(400, 125)
-                                $button.Add_Click({
-                                    $password = $passwordBox.Text | ConvertTo-SecureString -AsPlainText -Force
-                                    if ($password) {
-                                        try {
-                                            Set-LocalUser -Name $user -Password $password
-                                            $validPassword = $PrincipalContext.ValidateCredentials($user, $passwordBox.Text)
-                                            if ($validPassword) {
-                                                $form.Close()
-                                            } else {
-                                                [System.Windows.Forms.MessageBox]::Show('Invalid password! Please try again.')
-                                            }
-                                        } catch {
-                                            [System.Windows.Forms.MessageBox]::Show('Error setting password!')
-                                        }
-                                    } else {
-                                        [System.Windows.Forms.MessageBox]::Show('No password entered!')
-                                    }
-                                })
-                                $form.Controls.Add($button)
-                                $form.ShowDialog() | Out-Null
-                            }
-                        }
-                }
-
                 Show-WPFInstallAppBusy -text "Installing apps..."
                 Install-WinUtilWinget
                 Install-WinUtilProgramWinget -Action Install -Programs $packagesWinget