From ee8d47de177fc8f6edb4fe83a4e2d98f3f2afbf0 Mon Sep 17 00:00:00 2001 From: Kaleb Luedtke Date: Wed, 28 Feb 2024 15:24:21 -0600 Subject: [PATCH] UI Packages are now at Github (#141342) --- Tools/SandboxTest.ps1 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Tools/SandboxTest.ps1 b/Tools/SandboxTest.ps1 index 067d4b45694..f7009c9f1ff 100644 --- a/Tools/SandboxTest.ps1 +++ b/Tools/SandboxTest.ps1 @@ -20,7 +20,7 @@ Param( $ErrorActionPreference = 'Stop' -$useNuGetForMicrosoftUIXaml = $true +$useNuGetForMicrosoftUIXaml = $false $mapFolder = (Resolve-Path -Path $MapFolder).Path if (-Not (Test-Path -Path $mapFolder -PathType Container)) { @@ -127,18 +127,23 @@ $vcLibsUwp = @{ hash = 'B56A9101F706F9D95F815F5B7FA6EFBAC972E86573D378B96A07CFF5540C5961' SaveTo = $(Join-Path $tempFolder -ChildPath 'Microsoft.VCLibs.x64.14.00.Desktop.appx') } -$uiLibsUwp = @{ +$uiLibsUwp_2_7 = @{ url = 'https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.7.3/Microsoft.UI.Xaml.2.7.x64.appx' hash = '8CE30D92ABEC6522BEB2544E7B716983F5CBA50751B580D89A36048BF4D90316' SaveTo = $(Join-Path $tempFolder -ChildPath 'Microsoft.UI.Xaml.2.7.x64.appx') } +$uiLibsUwp_2_8 = @{ + url = 'https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.6/Microsoft.UI.Xaml.2.8.x64.appx' + hash = '249D2AFB41CC009494841372BD6DD2DF46F87386D535DDF8D9F32C97226D2E46' + SaveTo = $(Join-Path $tempFolder -ChildPath 'Microsoft.UI.Xaml.2.8.x64.appx') +} $uiLibs_nuget = @{ url = 'https://www.nuget.org/api/v2/package/Microsoft.UI.Xaml/2.8.6' hash = '6B62BD3C277F55518C3738121B77585AC5E171C154936EC58D87268BBAE91736' SaveTo = $(Join-Path $tempFolder -ChildPath 'Microsoft.UI.Xaml.2.8.zip') } -$dependencies = @($desktopAppInstaller, $vcLibsUwp, $uiLibsUwp) +$dependencies = @($desktopAppInstaller, $vcLibsUwp, $uiLibsUwp_2_7, $uiLibsUwp_2_8) if ($useNuGetForMicrosoftUIXaml) { $dependencies += $uiLibs_nuget @@ -255,7 +260,8 @@ Write-Host @' `$ProgressPreference = 'SilentlyContinue' try { Add-AppxPackage -Path '$($vcLibsUwp.pathInSandbox)' -ErrorAction Stop - Add-AppxPackage -Path '$($uiLibsUwp.pathInSandbox)' -ErrorAction Stop + Add-AppxPackage -Path '$($uiLibsUwp_2_7.pathInSandbox)' -ErrorAction Stop + Add-AppxPackage -Path '$($uiLibsUwp_2_8.pathInSandbox)' -ErrorAction Stop Add-AppxPackage -Path '$($desktopAppInstaller.pathInSandbox)' -ErrorAction Stop } catch { Write-Host -ForegroundColor Red 'Could not install from cached packages. Falling back to Repair-WinGetPackageManager cmdlet'