Merge pull request #2805 from freddydk/master

Issue #307
microsoft · Nov 29, 2022 · 901cde2 · 901cde2
2 parents 8787008 + b0ac865
commit 901cde2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/AppHandling/Sign-NavContainerApp.ps1 b/AppHandling/Sign-NavContainerApp.ps1
@@ -89,7 +89,15 @@ try {
                 Write-Host "Downloading Signing Tools"
                 $winSdkSetupExe = "c:\run\install\winsdksetup.exe"
                 $winSdkSetupUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2023014"
-                (New-Object System.Net.WebClient).DownloadFile($winSdkSetupUrl, $winSdkSetupExe)
+                try {
+                    Invoke-WebRequest -UseBasicParsing -Uri $winSdkSetupUrl -OutFile $winSdkSetupExe
+                }
+                catch {
+                    Write-Host (GetExtendedErrorMessage -errorRecord $_)
+                    Start-Sleep -Seconds 5
+                    Write-Host "Retrying..."
+                    Invoke-WebRequest -UseBasicParsing -Uri $winSdkSetupUrl -OutFile $winSdkSetupExe
+                }
                 Write-Host "Installing Signing Tools"
                 Start-Process $winSdkSetupExe -ArgumentList "/features OptionId.SigningTools /q" -Wait
                 if (!(Test-Path "C:\Program Files (x86)\Windows Kits\10\bin\*\x64\SignTool.exe")) {

diff --git a/CreateScript.ps1 b/CreateScript.ps1
@@ -1224,7 +1224,15 @@ $Step.Isolation {
 
         try {
             $bestContainerOS = "The image, which matches your host OS best is $($bestContainerOsVersion.ToString())"
-            if ($hostOsVersion.Major -eq $bestContainerOsVersion.Major -and $hostOsVersion.Minor -eq $bestContainerOsVersion.Minor -and $hostOsVersion.Build -eq $bestContainerOsVersion.Build) {
+            if ($hostOsVersion.Build -ge 20348 -and $bestContainerOsVersion.Build -ge 20348) {
+                if ($bestContainerOsVersion -le $hostOsVersion) {
+                    $defaultIsolation = "process"
+                }
+                else {
+                    $defaultIsolation = "Hyper-V"
+                }
+            }
+            elseif ($hostOsVersion.Major -eq $bestContainerOsVersion.Major -and $hostOsVersion.Minor -eq $bestContainerOsVersion.Minor -and $hostOsVersion.Build -eq $bestContainerOsVersion.Build) {
                 $defaultIsolation = "Process"
             }
             else {