From 51c0b423fb8e3a0cde3ae17b7a2d08a13c793bad Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Fri, 7 Oct 2022 02:09:27 +0200 Subject: [PATCH] Upgrade to Windows SDK 22621 (#14135) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The diff between the 22000 and 22621 SDKs is fairly small, but it does include a number of C++ correctness fixes, updates to libraries like DirectXMath and the latest updates to DirectWrite and DXGI which I make heavy use off. ## Validation Steps Performed * It builds ✅ --- .vsconfig | 2 +- README.md | 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 | 2 +- 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 +- src/cascadia/WindowsTerminal/WindowsTerminal.manifest | 1 + src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml | 2 +- src/cascadia/ut_app/TerminalApp.Unit.Tests.manifest | 1 + src/common.build.pre.props | 2 +- src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj | 2 +- src/wap-common.build.pre.props | 2 +- 18 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.vsconfig b/.vsconfig index 4df96d6cdf..505228514f 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.Windows11SDK.22000", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.ComponentGroup.UWP.Support", "Microsoft.VisualStudio.Component.VC.CoreIde", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", diff --git a/README.md b/README.md index 19a06dec55..29024feb37 100644 --- a/README.md +++ b/README.md @@ -289,7 +289,7 @@ If you would like to ask a question that you feel doesn't warrant an issue app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development) to locally install and run Windows Terminal * You must have [PowerShell 7 or later](https://github.com/PowerShell/PowerShell/releases/latest) installed -* You must have the [Windows 11 (10.0.22000.0) +* You must have the [Windows 11 (10.0.22621.0) SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/) installed * You must have at least [VS diff --git a/build/scripts/Create-AppxBundle.ps1 b/build/scripts/Create-AppxBundle.ps1 index bc8e484ec7..9c120f6320 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.22000.0\x86\MakeAppx.exe" + $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.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 8adc308782..aa9cca6d10 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.22000.0" + $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0" ) $ErrorActionPreference = "Stop" diff --git a/doc/cascadia/Unittesting-CppWinRT-Xaml.md b/doc/cascadia/Unittesting-CppWinRT-Xaml.md index 9ddcae046a..c52f4abe49 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 42ea2a739d..ddd8590864 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.22000.0 + 10.0.22621.0 10.0.17763.0 diff --git a/scratch/ScratchIslandApp/Package/Package.appxmanifest b/scratch/ScratchIslandApp/Package/Package.appxmanifest index fecc1bfd12..4fbd2b16ba 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 102539275c..59e6667daf 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 934a105044..03d484c67d 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 82b1ce1b5d..a8ff0b52d5 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 746e92c630..1cb3a5c849 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 4e2425442f..f2beb373fd 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/WindowsTerminal/WindowsTerminal.manifest b/src/cascadia/WindowsTerminal/WindowsTerminal.manifest index 8a61b53a59..3be6f3c7bf 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.manifest +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.manifest @@ -19,6 +19,7 @@ entries separately. They are treated like an array. This one turns on Segoe UI Variable, GH #12452 --> + diff --git a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml index ab6fdb0f47..be33718464 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/cascadia/ut_app/TerminalApp.Unit.Tests.manifest b/src/cascadia/ut_app/TerminalApp.Unit.Tests.manifest index 8a61b53a59..3be6f3c7bf 100644 --- a/src/cascadia/ut_app/TerminalApp.Unit.Tests.manifest +++ b/src/cascadia/ut_app/TerminalApp.Unit.Tests.manifest @@ -19,6 +19,7 @@ entries separately. They are treated like an array. This one turns on Segoe UI Variable, GH #12452 --> + diff --git a/src/common.build.pre.props b/src/common.build.pre.props index 0d9491204c..6ec431dee3 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -75,7 +75,7 @@ - 10.0.22000.0 + 10.0.22621.0 10.0.18362.0 diff --git a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj index 0aa07336b9..ded757cf99 100644 --- a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj +++ b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj @@ -53,7 +53,7 @@ f75e29d0-d288-478b-8d83-2c190f321a3f - 10.0.22000.0 + 10.0.22621.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 bfdb538770..f99f1e164b 100644 --- a/src/wap-common.build.pre.props +++ b/src/wap-common.build.pre.props @@ -63,7 +63,7 @@ - 10.0.22000.0 + 10.0.22621.0 10.0.18362.0 en-US