Merge d2db3bec53 into 28bea518f0

Some people need this to avoid installing third-party programs like PuTTY

functions/microwin/Microwin-RemovePackages.ps1

@@ -35,7 +35,8 @@ function Microwin-RemovePackages {
                     $_ -NotLike "*VBSCRIPT*" -AND
                     $_ -NotLike "*License*" -AND
                     $_ -NotLike "*Hello-Face*" -AND
-                    $_ -NotLike "*ISE*"
+                    $_ -NotLike "*ISE*" -AND
+                    $_ -NotLike "*OpenSSH*"
                 }
         } else {
             $pkgList = dism /english /image="$scratchDir" /get-packages | Select-String -Pattern "Package Identity : " -CaseSensitive -SimpleMatch
@@ -58,7 +59,8 @@ function Microwin-RemovePackages {
                     $_ -NotLike "*VBSCRIPT*" -AND
                     $_ -NotLike "*License*" -AND
                     $_ -NotLike "*Hello-Face*" -AND
-                    $_ -NotLike "*ISE*"
+                    $_ -NotLike "*ISE*" -AND
+                    $_ -NotLike "*OpenSSH*"
                 }
             } else {
                 Write-Host "Packages could not be obtained with DISM. MicroWin processing will continue, but packages will be skipped."

functions/private/Set-WinUtilRegistry.ps1

@@ -47,6 +47,8 @@ function Set-WinUtilRegistry {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
     } catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
+    } catch [System.UnauthorizedAccessException]{
+       Write-Warning $psitem.Exception.Message
     } catch {
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace