diff --git a/.pipelines/uwp-ci.yml b/.pipelines/uwp-ci.yml index ab420270df..5e5c7d3555 100644 --- a/.pipelines/uwp-ci.yml +++ b/.pipelines/uwp-ci.yml @@ -22,7 +22,7 @@ variables: pool: name: Azure Pipelines - vmImage: windows-2019 + vmImage: windows-2022 steps: - task: NuGetToolInstaller@0 diff --git a/.pipelines/winui3-ci.yml b/.pipelines/winui3-ci.yml index 4949873da9..99eb9fb546 100644 --- a/.pipelines/winui3-ci.yml +++ b/.pipelines/winui3-ci.yml @@ -22,7 +22,7 @@ variables: pool: name: Azure Pipelines - vmImage: windows-2019 + vmImage: windows-latest steps: - task: NuGetToolInstaller@1 @@ -50,6 +50,17 @@ steps: targetType: 'inline' script: | choco install windows-sdk-10-version-1809-all + + $winget = (Get-Command winget -ErrorAction SilentlyContinue) + if (-not $winget) { + Write-Host 'winget not found. Installing App Installer (DesktopAppInstaller) silently...' + + Invoke-WebRequest -Uri "https://aka.ms/getwinget" -OutFile "$env:Temp\AppInstaller.msixbundle" + Add-AppxPackage -Path "$env:Temp\AppInstaller.msixbundle" + } + + + winget install --id Microsoft.WindowsSDK.10.0.22000 -e --silent --accept-package-agreements --accept-source-agreements - task: VSBuild@1 name: VSBuild4 diff --git a/source/dotnet/Samples/ImageRendererServer/ImageRendererServer.csproj b/source/dotnet/Samples/ImageRendererServer/ImageRendererServer.csproj index 85b4be1e4f..9f1066f1f8 100644 --- a/source/dotnet/Samples/ImageRendererServer/ImageRendererServer.csproj +++ b/source/dotnet/Samples/ImageRendererServer/ImageRendererServer.csproj @@ -11,6 +11,7 @@ + diff --git a/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject.wapproj b/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject.wapproj index 984f52f530..6812e320be 100644 --- a/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject.wapproj +++ b/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject.wapproj @@ -43,7 +43,7 @@ en-US AdaptiveCards.Sample.WPFVisualizer.PackageProject_TemporaryKey.pfx ..\WPFVisualizer\AdaptiveCards.Sample.WPFVisualizer.csproj - 3bd5fc86b707a862b32aa301f34e37c77de44a11 + EC31E8FE4FFAAA30604BDACABF17F0CEAA1F8CC5 True diff --git a/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject_TemporaryKey.pfx b/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject_TemporaryKey.pfx index 14b43ae563..258001754a 100644 Binary files a/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject_TemporaryKey.pfx and b/source/dotnet/Samples/WPFVisualizer.PackageProject/AdaptiveCards.Sample.WPFVisualizer.PackageProject_TemporaryKey.pfx differ