From fc85bdf314e2f36c218d7b1daf1479ee223021f3 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Thu, 18 Nov 2021 19:08:26 +0100 Subject: [PATCH] Upgrade to Windows SDK 22000 (#11728) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upgrades our SDK from 19041 (Windows 10 20H1) to 22000 (Windows 11 RTM). The newer SDK is more compatible with /Zc:preprocessor and will allow us to use newer Windows 11 APIs directly. ## PR Checklist * [x] I work here * [x] Tests added/passed ## Validation Steps Performed * Compiles ✔️ * Runs ✔️ --- .vsconfig | 2 +- build/scripts/Create-AppxBundle.ps1 | 2 +- build/scripts/Test-WindowsTerminalPackage.ps1 | 2 +- doc/cascadia/Unittesting-CppWinRT-Xaml.md | 4 ++-- samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj | 4 ++-- scratch/ScratchIslandApp/Package/Package.appxmanifest | 2 +- src/cascadia/CascadiaPackage/Package-Dev.appxmanifest | 2 +- src/cascadia/CascadiaPackage/Package-Pre.appxmanifest | 2 +- src/cascadia/CascadiaPackage/Package.appxmanifest | 2 +- .../TerminalApp.LocalTests.AppxManifest.prototype.xml | 2 +- .../LocalTests_TerminalApp/TestHostApp/Package.appxmanifest | 2 +- .../WindowsTerminalUniversal/Package-Dev.appxmanifest | 2 +- src/cascadia/WindowsTerminalUniversal/Package.appxmanifest | 2 +- src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml | 2 +- src/common.build.pre.props | 2 +- src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj | 2 +- src/wap-common.build.pre.props | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.vsconfig b/.vsconfig index 94372a82e..d48915872 100644 --- a/.vsconfig +++ b/.vsconfig @@ -17,7 +17,7 @@ "Microsoft.Net.Component.4.5.TargetingPack", "Microsoft.VisualStudio.Component.DiagnosticTools", "Microsoft.VisualStudio.Component.Debugger.JustInTime", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows10SDK.22000", "Microsoft.VisualStudio.ComponentGroup.UWP.Support", "Microsoft.VisualStudio.Component.VC.CoreIde", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", diff --git a/build/scripts/Create-AppxBundle.ps1 b/build/scripts/Create-AppxBundle.ps1 index 08d371828..bc8e484ec 100644 --- a/build/scripts/Create-AppxBundle.ps1 +++ b/build/scripts/Create-AppxBundle.ps1 @@ -22,7 +22,7 @@ Param( [Parameter(HelpMessage="Path to makeappx.exe")] [ValidateScript({Test-Path $_ -Type Leaf})] [string] - $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\MakeAppx.exe" + $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x86\MakeAppx.exe" ) If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) { diff --git a/build/scripts/Test-WindowsTerminalPackage.ps1 b/build/scripts/Test-WindowsTerminalPackage.ps1 index a3da6f7b9..8adc30878 100644 --- a/build/scripts/Test-WindowsTerminalPackage.ps1 +++ b/build/scripts/Test-WindowsTerminalPackage.ps1 @@ -8,7 +8,7 @@ Param( [Parameter(HelpMessage="Path to Windows Kit")] [ValidateScript({Test-Path $_ -Type Leaf})] [string] - $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0" + $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0" ) $ErrorActionPreference = "Stop" diff --git a/doc/cascadia/Unittesting-CppWinRT-Xaml.md b/doc/cascadia/Unittesting-CppWinRT-Xaml.md index eed227eed..4160e035e 100644 --- a/doc/cascadia/Unittesting-CppWinRT-Xaml.md +++ b/doc/cascadia/Unittesting-CppWinRT-Xaml.md @@ -380,7 +380,7 @@ Here's the AppxManifest we're using: - + @@ -517,7 +517,7 @@ This is because of a few key lines we already put in the appxmanifest: ```xml - + diff --git a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj index df56a6dea..42ee96148 100644 --- a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj +++ b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj @@ -23,7 +23,7 @@ {96274800-9574-423E-892A-909FBE2AC8BE} Win32Proj EchoCon - 10.0.19041.0 + 10.0.22000.0 10.0.17763.0 @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/scratch/ScratchIslandApp/Package/Package.appxmanifest b/scratch/ScratchIslandApp/Package/Package.appxmanifest index dcd54adca..abd2a9bf7 100644 --- a/scratch/ScratchIslandApp/Package/Package.appxmanifest +++ b/scratch/ScratchIslandApp/Package/Package.appxmanifest @@ -27,7 +27,7 @@ - + diff --git a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest index f73f4c62f..0b01af7ca 100644 --- a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest @@ -26,7 +26,7 @@ - + diff --git a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest index f4123a10e..33f9366d4 100644 --- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest @@ -27,7 +27,7 @@ - + diff --git a/src/cascadia/CascadiaPackage/Package.appxmanifest b/src/cascadia/CascadiaPackage/Package.appxmanifest index b73a6453b..023ed7ab2 100644 --- a/src/cascadia/CascadiaPackage/Package.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package.appxmanifest @@ -27,7 +27,7 @@ - + diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml index 1db5396e9..746e92c63 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml @@ -28,7 +28,7 @@ - + diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest index b13151415..4900114d2 100644 --- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest +++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest @@ -9,7 +9,7 @@ multiple - + diff --git a/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest b/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest index 1fff0fba4..a7258dee2 100644 --- a/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest +++ b/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest @@ -18,7 +18,7 @@ - + diff --git a/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest b/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest index 12272fc9e..797bdbe57 100644 --- a/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest +++ b/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest @@ -18,7 +18,7 @@ - + diff --git a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml index f22c9c3d7..ab6fdb0f4 100644 --- a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml +++ b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml @@ -29,7 +29,7 @@ TAEF Packaged Cwa FullTrust Application Host Process - + diff --git a/src/common.build.pre.props b/src/common.build.pre.props index 1ec821e3f..8238e3a93 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -75,7 +75,7 @@ - 10.0.19041.0 + 10.0.22000.0 10.0.18362.0 diff --git a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj index 2bfb25b19..03419ef67 100644 --- a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj +++ b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj @@ -51,7 +51,7 @@ f75e29d0-d288-478b-8d83-2c190f321a3f - 10.0.19041.0 + 10.0.22000.0 10.0.18362.0 en-US false diff --git a/src/wap-common.build.pre.props b/src/wap-common.build.pre.props index b6a0d829e..a6c1f8970 100644 --- a/src/wap-common.build.pre.props +++ b/src/wap-common.build.pre.props @@ -60,7 +60,7 @@ - 10.0.19041.0 + 10.0.22000.0 10.0.18362.0 en-US