From eaeab7a8075e176911064b81b4f35f2167011088 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Thu, 20 May 2021 18:04:25 +0200 Subject: [PATCH] Upgrade Windows SDK to 19041 (#10118) ## Summary of the Pull Request Upgrade the Windows SDK to 19041 by setting `WindowsTargetPlatformMinVersion` to 17763 and `WindowsTargetPlatformVersion` to 19041. ## PR Checklist * [x] I work here * [x] Tests added/passed ## Validation Steps Performed General usage of the Windows Terminal application appears fine. --- .github/actions/spelling/allow/apis.txt | 1 + .vsconfig | 2 +- build/scripts/Create-AppxBundle.ps1 | 2 +- build/scripts/Test-WindowsTerminalPackage.ps1 | 2 +- doc/cascadia/Unittesting-CppWinRT-Xaml.md | 4 +-- .../ConPTY/EchoCon/EchoCon/EchoCon.vcxproj | 3 +- .../CascadiaPackage/CascadiaPackage.wapproj | 2 -- .../CascadiaPackage/Package-Dev.appxmanifest | 4 +-- .../CascadiaPackage/Package-Pre.appxmanifest | 2 +- .../CascadiaPackage/Package.appxmanifest | 2 +- .../SettingsModel.LocalTests.vcxproj | 2 -- ...lApp.LocalTests.AppxManifest.prototype.xml | 2 +- .../TerminalApp.LocalTests.manifest | 4 +-- .../TerminalApp.LocalTests.vcxproj | 2 -- .../TestHostApp/Package.appxmanifest | 3 +- .../TestHostApp/TestHostApp.vcxproj | 2 -- .../Microsoft.Terminal.RemotingLib.vcxproj | 1 - .../TerminalApp/TerminalAppLib.vcxproj | 1 - .../TerminalCore/lib/terminalcore-lib.vcxproj | 1 - ...crosoft.Terminal.Settings.ModelLib.vcxproj | 3 +- .../Control.UnitTests.vcxproj | 2 -- .../Remoting.UnitTests.vcxproj | 2 -- .../WindowsTerminal/WindowsTerminal.manifest | 2 +- .../WindowsTerminal/WindowsTerminal.vcxproj | 6 +--- .../Package-Dev.appxmanifest | 32 +++++++++---------- .../Package.appxmanifest | 32 +++++++++---------- .../TerminalApp.Unit.Tests.AppxManifest.xml | 2 +- .../ut_app/TerminalApp.Unit.Tests.manifest | 2 +- .../ut_app/TerminalApp.UnitTests.vcxproj | 2 -- src/cascadia/wt/wt.vcxproj | 2 -- src/common.build.pre.props | 7 ++-- src/cppwinrt.build.pre.props | 4 --- src/inc/LibraryIncludes.h | 7 ++++ src/terminal/parser/tracing.cpp | 11 +++---- src/terminal/parser/tracing.hpp | 4 +-- .../MonarchPeasantPackage.wapproj | 4 +-- src/tools/vtpipeterm/VtPipeTerm.vcxproj | 3 +- src/wap-common.build.pre.props | 4 +-- 38 files changed, 75 insertions(+), 98 deletions(-) diff --git a/.github/actions/spelling/allow/apis.txt b/.github/actions/spelling/allow/apis.txt index d4aa706a0..8252b10b7 100644 --- a/.github/actions/spelling/allow/apis.txt +++ b/.github/actions/spelling/allow/apis.txt @@ -1,5 +1,6 @@ ACCEPTFILES ACCESSDENIED +alignas alignof bitfield bitfields diff --git a/.vsconfig b/.vsconfig index 9d9827efe..94372a82e 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.18362", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", "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 8dd29b2a5..08d371828 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.17763.0\x86\MakeAppx.exe" + $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.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 f8bb00c80..a3da6f7b9 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.18362.0" + $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0" ) $ErrorActionPreference = "Stop" diff --git a/doc/cascadia/Unittesting-CppWinRT-Xaml.md b/doc/cascadia/Unittesting-CppWinRT-Xaml.md index 8db09be12..eed227eed 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 1f96a0ac4..df56a6dea 100644 --- a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj +++ b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj @@ -23,7 +23,8 @@ {96274800-9574-423E-892A-909FBE2AC8BE} Win32Proj EchoCon - 10.0.17763.0 + 10.0.19041.0 + 10.0.17763.0 diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj index 5a6b85ee4..b18c6d57a 100644 --- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj +++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj @@ -3,8 +3,6 @@ - 10.0.18362.0 - 10.0.18362.0 + - + diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj index 66edaa8cc..9cc573240 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj @@ -18,8 +18,6 @@ LocalTests_TerminalApp TerminalApp.LocalTests DynamicLibrary - 10.0.18362.0 - 10.0.18362.0 true diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest index ac8f695cb..b13151415 100644 --- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest +++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest @@ -9,8 +9,7 @@ multiple - - + diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj index dccc97add..2e8bd4bb3 100644 --- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj @@ -9,8 +9,6 @@ true true Windows Store - 10.0.18362.0 - 10.0.18362.0 10.0 Tests\Data true diff --git a/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj b/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj index 2241d3c0e..a2d6e8ae6 100644 --- a/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj +++ b/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj @@ -6,7 +6,6 @@ Microsoft.Terminal.Remoting.Lib Microsoft.Terminal.Remoting Microsoft.Terminal.Remoting.Lib - 10.0.17763.0 StaticLibrary Console true diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj index 3e188fd94..2c763b2d4 100644 --- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj @@ -6,7 +6,6 @@ TerminalApp TerminalAppLib TerminalAppLib - 10.0.17763.0 StaticLibrary Console true diff --git a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj index dba70a7d9..9ced8ea9f 100644 --- a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj +++ b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj @@ -6,7 +6,6 @@ TerminalCore TerminalCore StaticLibrary - 10.0.17763.0 Microsoft.Terminal.Core diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj index b9351f9a6..c2b645bd0 100644 --- a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj +++ b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj @@ -6,7 +6,6 @@ Microsoft.Terminal.Settings.Model.Lib Microsoft.Terminal.Settings.Model Microsoft.Terminal.Settings.Model.Lib - 10.0.17763.0 StaticLibrary Console true @@ -241,6 +240,6 @@ - + diff --git a/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj b/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj index 5ebe26096..08cc06523 100644 --- a/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj +++ b/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj @@ -7,8 +7,6 @@ UnitTests_Control Control.Unit.Tests DynamicLibrary - 10.0.18362.0 - 10.0.18362.0 true diff --git a/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj b/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj index a67eba4f3..03a47de4a 100644 --- a/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj +++ b/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj @@ -18,8 +18,6 @@ UnitTests_Remoting Remoting.Unit.Tests DynamicLibrary - 10.0.18362.0 - 10.0.18362.0 true diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.manifest b/src/cascadia/WindowsTerminal/WindowsTerminal.manifest index a447bc8fd..aa6b42660 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.manifest +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.manifest @@ -10,7 +10,7 @@ - + diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj index d0b116ff3..5f27d6ad4 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj @@ -13,16 +13,13 @@ Windows Store true false - - - 10.0.18362.0 Windows true - + true @@ -174,4 +171,3 @@ - diff --git a/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest b/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest index 578f748db..1fff0fba4 100644 --- a/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest +++ b/src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest @@ -1,46 +1,46 @@  - - + - + ms-resource:AppNameDev A Lone Developer Images\StoreLogo.png - + - + - + - + - - - + diff --git a/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest b/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest index b654ef77d..12272fc9e 100644 --- a/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest +++ b/src/cascadia/WindowsTerminalUniversal/Package.appxmanifest @@ -1,46 +1,46 @@  - - + - + ms-resource:AppName Microsoft Corporation Images\StoreLogo.png - + - + - + - + - - - + diff --git a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml index 17b61c423..f22c9c3d7 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 a447bc8fd..aa6b42660 100644 --- a/src/cascadia/ut_app/TerminalApp.Unit.Tests.manifest +++ b/src/cascadia/ut_app/TerminalApp.Unit.Tests.manifest @@ -10,7 +10,7 @@ - + diff --git a/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj b/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj index 276daed17..5a7f3fbef 100644 --- a/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj +++ b/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj @@ -7,8 +7,6 @@ UnitTests_TerminalApp Terminal.App.Unit.Tests DynamicLibrary - 10.0.18362.0 - 10.0.18362.0 true diff --git a/src/cascadia/wt/wt.vcxproj b/src/cascadia/wt/wt.vcxproj index ee7c78de6..e1e47c170 100644 --- a/src/cascadia/wt/wt.vcxproj +++ b/src/cascadia/wt/wt.vcxproj @@ -7,7 +7,6 @@ wt wt Application - 10.0.18362.0 @@ -33,4 +32,3 @@ - diff --git a/src/common.build.pre.props b/src/common.build.pre.props index 2331ac4f3..ef0111a3a 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -23,8 +23,6 @@ $(SolutionDir)bin\$(Platform)\$(Configuration)\ - - AuditMode @@ -77,9 +75,12 @@ - 10.0.18362.0 + 10.0.19041.0 + 10.0.18362.0 + + v142 diff --git a/src/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props index 2d9b38f93..ba3e1244e 100644 --- a/src/cppwinrt.build.pre.props +++ b/src/cppwinrt.build.pre.props @@ -11,9 +11,6 @@ - - 10.0.18362.0 - 10.0.18362.0 true true en-US @@ -110,4 +107,3 @@ - diff --git a/src/inc/LibraryIncludes.h b/src/inc/LibraryIncludes.h index 856fdcd6d..75bc23816 100644 --- a/src/inc/LibraryIncludes.h +++ b/src/inc/LibraryIncludes.h @@ -103,7 +103,14 @@ #include // WRL +// Microsoft::WRL::Details::StaticStorage contains a programming error. +// The author attempted to create a properly aligned backing storage for a type T, +// but instead of giving the member the proper alignas, the struct got it. +// The compiler doesn't like that. --> Suppress the warning. +#pragma warning(push) +#pragma warning(disable: 4324) // structure was padded due to alignment specifier #include +#pragma warning(pop) // WEX/TAEF testing // Include before TIL if we're unit testing so it can light up WEX/TAEF template extensions diff --git a/src/terminal/parser/tracing.cpp b/src/terminal/parser/tracing.cpp index 5255f8b9d..a964c05f2 100644 --- a/src/terminal/parser/tracing.cpp +++ b/src/terminal/parser/tracing.cpp @@ -7,11 +7,8 @@ using namespace Microsoft::Console::VirtualTerminal; #pragma warning(push) -#pragma warning(disable : 26494) // _Tlgdata uninitialized from TraceLoggingWrite -#pragma warning(disable : 26477) // Use nullptr instead of NULL or 0 from TraceLoggingWrite -#pragma warning(disable : 26485) // _Tlgdata, no array to pointer decay from TraceLoggingWrite -#pragma warning(disable : 26446) // Prefer gsl::at over unchecked subscript from TraceLoggingLevel -#pragma warning(disable : 26482) // Only index to arrays with constant expressions from TraceLoggingLevel +#pragma warning(disable : 26447) // The function is declared 'noexcept' but calls function '_tlgWrapBinary()' which may throw exceptions +#pragma warning(disable : 26477) // Use 'nullptr' rather than 0 or NULL ParserTracing::ParserTracing() noexcept { @@ -36,7 +33,7 @@ void ParserTracing::TraceOnAction(const std::wstring_view name) const noexcept TraceLoggingKeyword(TIL_KEYWORD_TRACE)); } -void ParserTracing::TraceOnExecute(const wchar_t wch) const +void ParserTracing::TraceOnExecute(const wchar_t wch) const noexcept { const auto sch = gsl::narrow_cast(wch); TraceLoggingWrite(g_hConsoleVirtTermParserEventTraceProvider, @@ -47,7 +44,7 @@ void ParserTracing::TraceOnExecute(const wchar_t wch) const TraceLoggingKeyword(TIL_KEYWORD_TRACE)); } -void ParserTracing::TraceOnExecuteFromEscape(const wchar_t wch) const +void ParserTracing::TraceOnExecuteFromEscape(const wchar_t wch) const noexcept { const auto sch = gsl::narrow_cast(wch); TraceLoggingWrite(g_hConsoleVirtTermParserEventTraceProvider, diff --git a/src/terminal/parser/tracing.hpp b/src/terminal/parser/tracing.hpp index 05e712674..ae7bb1832 100644 --- a/src/terminal/parser/tracing.hpp +++ b/src/terminal/parser/tracing.hpp @@ -25,8 +25,8 @@ namespace Microsoft::Console::VirtualTerminal void TraceStateChange(const std::wstring_view name) const noexcept; void TraceOnAction(const std::wstring_view name) const noexcept; - void TraceOnExecute(const wchar_t wch) const; - void TraceOnExecuteFromEscape(const wchar_t wch) const; + void TraceOnExecute(const wchar_t wch) const noexcept; + void TraceOnExecuteFromEscape(const wchar_t wch) const noexcept; void TraceOnEvent(const std::wstring_view name) const noexcept; void TraceCharInput(const wchar_t wch); diff --git a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj index c94201f9e..2bfb25b19 100644 --- a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj +++ b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj @@ -51,8 +51,8 @@ f75e29d0-d288-478b-8d83-2c190f321a3f - 10.0.18362.0 - 10.0.17763.0 + 10.0.19041.0 + 10.0.18362.0 en-US false ..\MonarchPeasantSample\MonarchPeasantSample.vcxproj diff --git a/src/tools/vtpipeterm/VtPipeTerm.vcxproj b/src/tools/vtpipeterm/VtPipeTerm.vcxproj index c724f5f02..9dbbe7824 100644 --- a/src/tools/vtpipeterm/VtPipeTerm.vcxproj +++ b/src/tools/vtpipeterm/VtPipeTerm.vcxproj @@ -6,8 +6,7 @@ VtPipeTerm VtPipeTerm VtPipeTerm - Application - 10.0.18362.0 + Application diff --git a/src/wap-common.build.pre.props b/src/wap-common.build.pre.props index 93bd26345..58d8b2ceb 100644 --- a/src/wap-common.build.pre.props +++ b/src/wap-common.build.pre.props @@ -40,8 +40,8 @@ - 10.0.17134.0 - 10.0.17134.0 + 10.0.19041.0 + 10.0.18362.0 en-US