maxmustermann
/
terminal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Leonard Hecker 2021-05-20 18:04:25 +02:00 committed by GitHub
parent c3bf8a5d25
commit eaeab7a807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 75 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spelling/allow/apis.txt vendored
View File

@ -1,5 +1,6 @@
ACCEPTFILES ACCEPTFILES
ACCESSDENIED ACCESSDENIED
alignas
alignof alignof
bitfield bitfield
bitfields bitfields

2
.vsconfig
View File

@ -17,7 +17,7 @@
"Microsoft.Net.Component.4.5.TargetingPack", "Microsoft.Net.Component.4.5.TargetingPack",
"Microsoft.VisualStudio.Component.DiagnosticTools", "Microsoft.VisualStudio.Component.DiagnosticTools",
"Microsoft.VisualStudio.Component.Debugger.JustInTime", "Microsoft.VisualStudio.Component.Debugger.JustInTime",
"Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Component.Windows10SDK.19041",
"Microsoft.VisualStudio.ComponentGroup.UWP.Support", "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
"Microsoft.VisualStudio.Component.VC.CoreIde", "Microsoft.VisualStudio.Component.VC.CoreIde",
"Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",

2
build/scripts/Create-AppxBundle.ps1
View File

@ -22,7 +22,7 @@ Param(
[Parameter(HelpMessage="Path to makeappx.exe")] [Parameter(HelpMessage="Path to makeappx.exe")]
[ValidateScript({Test-Path $_ -Type Leaf})] [ValidateScript({Test-Path $_ -Type Leaf})]
[string] [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)) { If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) {

2
build/scripts/Test-WindowsTerminalPackage.ps1
View File

@ -8,7 +8,7 @@ Param(
[Parameter(HelpMessage="Path to Windows Kit")] [Parameter(HelpMessage="Path to Windows Kit")]
[ValidateScript({Test-Path $_ -Type Leaf})] [ValidateScript({Test-Path $_ -Type Leaf})]
[string] [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" $ErrorActionPreference = "Stop"

4
doc/cascadia/Unittesting-CppWinRT-Xaml.md
View File

@ -380,7 +380,7 @@ Here's the AppxManifest we're using:
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
</Dependencies> </Dependencies>
@ -517,7 +517,7 @@ This is because of a few key lines we already put in the appxmanifest:
```xml ```xml
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
</Dependencies> </Dependencies>

3
samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj
View File

@ -23,7 +23,8 @@
<ProjectGuid>{96274800-9574-423E-892A-909FBE2AC8BE}</ProjectGuid> <ProjectGuid>{96274800-9574-423E-892A-909FBE2AC8BE}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>EchoCon</RootNamespace> <RootNamespace>EchoCon</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
View File

@ -3,8 +3,6 @@
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" /> <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
<Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" /> <Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<!-- <!--
These two properties are very important! These two properties are very important!
Without them, msbuild will stomp MinVersion and MaxVersionTested in the Without them, msbuild will stomp MinVersion and MaxVersionTested in the

4
src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
View File

@ -26,7 +26,7 @@
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
</Dependencies> </Dependencies>
<Resources> <Resources>
@ -122,7 +122,7 @@
</desktop5:ItemType> </desktop5:ItemType>
<desktop5:ItemType Type="Directory\Background"> <desktop5:ItemType Type="Directory\Background">
<desktop5:Verb Id="OpenTerminalDev" Clsid="52065414-e077-47ec-a3ac-1cc5455e1b54" /> <desktop5:Verb Id="OpenTerminalDev" Clsid="52065414-e077-47ec-a3ac-1cc5455e1b54" />
</desktop5:ItemType> </desktop5:ItemType>
</desktop4:FileExplorerContextMenus> </desktop4:FileExplorerContextMenus>
</desktop4:Extension> </desktop4:Extension>

2
src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
View File

@ -27,7 +27,7 @@
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
</Dependencies> </Dependencies>
<Resources> <Resources>

2
src/cascadia/CascadiaPackage/Package.appxmanifest
View File

@ -27,7 +27,7 @@
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
</Dependencies> </Dependencies>
<Resources> <Resources>

2
src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj
View File

@ -18,8 +18,6 @@
<ProjectName>LocalTests_SettingsModel</ProjectName> <ProjectName>LocalTests_SettingsModel</ProjectName>
<TargetName>SettingsModel.LocalTests</TargetName> <TargetName>SettingsModel.LocalTests</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject> <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
</PropertyGroup> </PropertyGroup>

2
src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml
View File

@ -28,7 +28,7 @@
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
</Dependencies> </Dependencies>

4
src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.manifest
View File

@ -7,10 +7,10 @@
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application> <application>
<!-- Windows 10 1903 --> <!-- Windows 10 20H1 -->
<!-- See https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/xaml-islands --> <!-- See https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/xaml-islands -->
<!-- "maxversiontested" is CASE SENSITIVE. Do not change this.--> <!-- "maxversiontested" is CASE SENSITIVE. Do not change this.-->
<maxversiontested Id="10.0.18362.0"/> <maxversiontested Id="10.0.19041.0"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application> </application>
</compatibility> </compatibility>

2
src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
View File

@ -18,8 +18,6 @@
<ProjectName>LocalTests_TerminalApp</ProjectName> <ProjectName>LocalTests_TerminalApp</ProjectName>
<TargetName>TerminalApp.LocalTests</TargetName> <TargetName>TerminalApp.LocalTests</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject> <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
</PropertyGroup> </PropertyGroup>

3
src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest
View File

@ -9,8 +9,7 @@
<uap:SupportedUsers>multiple</uap:SupportedUsers> <uap:SupportedUsers>multiple</uap:SupportedUsers>
</Properties> </Properties>
<Dependencies> <Dependencies>
<!-- We're manually setting the version here, because the CI only runs windows 17763 --> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.17763.0" />
</Dependencies> </Dependencies>
<Resources> <Resources>
<Resource Language="x-generate" /> <Resource Language="x-generate" />

2
src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
View File

@ -9,8 +9,6 @@
<AppContainerApplication>true</AppContainerApplication> <AppContainerApplication>true</AppContainerApplication>
<WindowsStoreApp>true</WindowsStoreApp> <WindowsStoreApp>true</WindowsStoreApp>
<ApplicationType>Windows Store</ApplicationType> <ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision> <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<OutputSubDir>Tests\Data</OutputSubDir> <OutputSubDir>Tests\Data</OutputSubDir>
<UseWmXml>true</UseWmXml> <UseWmXml>true</UseWmXml>

1
src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj
View File

@ -6,7 +6,6 @@
<ProjectName>Microsoft.Terminal.Remoting.Lib</ProjectName> <ProjectName>Microsoft.Terminal.Remoting.Lib</ProjectName>
<RootNamespace>Microsoft.Terminal.Remoting</RootNamespace> <RootNamespace>Microsoft.Terminal.Remoting</RootNamespace>
<TargetName>Microsoft.Terminal.Remoting.Lib</TargetName> <TargetName>Microsoft.Terminal.Remoting.Lib</TargetName>
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp> <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>

1
src/cascadia/TerminalApp/TerminalAppLib.vcxproj
View File

@ -6,7 +6,6 @@
<RootNamespace>TerminalApp</RootNamespace> <RootNamespace>TerminalApp</RootNamespace>
<ProjectName>TerminalAppLib</ProjectName> <ProjectName>TerminalAppLib</ProjectName>
<TargetName>TerminalAppLib</TargetName> <TargetName>TerminalAppLib</TargetName>
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp> <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>

1
src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj
View File

@ -6,7 +6,6 @@
<ProjectName>TerminalCore</ProjectName> <ProjectName>TerminalCore</ProjectName>
<TargetName>TerminalCore</TargetName> <TargetName>TerminalCore</TargetName>
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
<RootNamespace>Microsoft.Terminal.Core</RootNamespace> <RootNamespace>Microsoft.Terminal.Core</RootNamespace>
<!-- sets a bunch of Windows Universal properties --> <!-- sets a bunch of Windows Universal properties -->

3
src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj
View File

@ -6,7 +6,6 @@
<ProjectName>Microsoft.Terminal.Settings.Model.Lib</ProjectName> <ProjectName>Microsoft.Terminal.Settings.Model.Lib</ProjectName>
<RootNamespace>Microsoft.Terminal.Settings.Model</RootNamespace> <RootNamespace>Microsoft.Terminal.Settings.Model</RootNamespace>
<TargetName>Microsoft.Terminal.Settings.Model.Lib</TargetName> <TargetName>Microsoft.Terminal.Settings.Model.Lib</TargetName>
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp> <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
@ -241,6 +240,6 @@
<Target Name="_TerminalAppGenerateUserSettingsH" Inputs="userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile"> <Target Name="_TerminalAppGenerateUserSettingsH" Inputs="userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile">
<Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" /> <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" />
</Target> </Target>
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" /> <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
</Project> </Project>

2
src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj
View File

@ -7,8 +7,6 @@
<ProjectName>UnitTests_Control</ProjectName> <ProjectName>UnitTests_Control</ProjectName>
<TargetName>Control.Unit.Tests</TargetName> <TargetName>Control.Unit.Tests</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject> <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
</PropertyGroup> </PropertyGroup>

2
src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj
View File

@ -18,8 +18,6 @@
<ProjectName>UnitTests_Remoting</ProjectName> <ProjectName>UnitTests_Remoting</ProjectName>
<TargetName>Remoting.Unit.Tests</TargetName> <TargetName>Remoting.Unit.Tests</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject> <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
</PropertyGroup> </PropertyGroup>

2
src/cascadia/WindowsTerminal/WindowsTerminal.manifest
View File

@ -10,7 +10,7 @@
<!-- Windows 10 1903 --> <!-- Windows 10 1903 -->
<!-- See https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/xaml-islands --> <!-- See https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/xaml-islands -->
<!-- "maxversiontested" is CASE SENSITIVE. Do not change this.--> <!-- "maxversiontested" is CASE SENSITIVE. Do not change this.-->
<maxversiontested Id="10.0.18362.0"/> <maxversiontested Id="10.0.19041.0"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application> </application>
</compatibility> </compatibility>

6
src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
View File

@ -13,16 +13,13 @@
<ApplicationType>Windows Store</ApplicationType> <ApplicationType>Windows Store</ApplicationType>
<WindowsStoreApp>true</WindowsStoreApp> <WindowsStoreApp>true</WindowsStoreApp>
<WindowsAppContainer>false</WindowsAppContainer> <WindowsAppContainer>false</WindowsAppContainer>
<!-- IMPORTANT! Xaml Islands only works on >= 17709 -->
<!-- IMPORTANT! cppwinrt.pre.props specifies 17134 -->
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier> <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
<PgoTarget>true</PgoTarget> <PgoTarget>true</PgoTarget>
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" /> <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" /> <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
@ -174,4 +171,3 @@
<Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" /> <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
<Import Project="..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets" Condition="Exists('..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets')" /> <Import Project="..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets" Condition="Exists('..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets')" />
</Project> </Project>

32
src/cascadia/WindowsTerminalUniversal/Package-Dev.appxmanifest
View File

@ -1,46 +1,46 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces="uap mp"> IgnorableNamespaces="uap mp">
<Identity <Identity
Name="WindowsTerminalUniversalDev" Name="WindowsTerminalUniversalDev"
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
Version="0.0.1.0" /> Version="0.0.1.0" />
<mp:PhoneIdentity PhoneProductId="7fb1e1dc-944a-46c9-b7ec-3626d73c6580" PhonePublisherId="00000000-0000-0000-0000-000000000000"/> <mp:PhoneIdentity PhoneProductId="7fb1e1dc-944a-46c9-b7ec-3626d73c6580" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties> <Properties>
<DisplayName>ms-resource:AppNameDev</DisplayName> <DisplayName>ms-resource:AppNameDev</DisplayName>
<PublisherDisplayName>A Lone Developer</PublisherDisplayName> <PublisherDisplayName>A Lone Developer</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo> <Logo>Images\StoreLogo.png</Logo>
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
</Dependencies> </Dependencies>
<Resources> <Resources>
<Resource Language="x-generate" /> <Resource Language="x-generate" />
</Resources> </Resources>
<Applications> <Applications>
<Application Id="App" <Application Id="App"
Executable="$targetnametoken$.exe" Executable="$targetnametoken$.exe"
EntryPoint="WindowsTerminalUniversal.App"> EntryPoint="WindowsTerminalUniversal.App">
<uap:VisualElements <uap:VisualElements
DisplayName="ms-resource:AppNameDev" DisplayName="ms-resource:AppNameDev"
Description="ms-resource:AppDescriptionDev" Description="ms-resource:AppDescriptionDev"
Square150x150Logo="Images\Square150x150Logo.png" Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png" Square44x44Logo="Images\Square44x44Logo.png"
BackgroundColor="transparent"> BackgroundColor="transparent">
<uap:SplashScreen Image="Images\SplashScreen.png" /> <uap:SplashScreen Image="Images\SplashScreen.png" />
<uap:DefaultTile/> <uap:DefaultTile/>
</uap:VisualElements> </uap:VisualElements>
</Application> </Application>
</Applications> </Applications>
<Capabilities> <Capabilities>
<Capability Name="internetClient" /> <Capability Name="internetClient" />
<Capability Name="privateNetworkClientServer"/> <Capability Name="privateNetworkClientServer"/>

32
src/cascadia/WindowsTerminalUniversal/Package.appxmanifest
View File

@ -1,46 +1,46 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces="uap mp"> IgnorableNamespaces="uap mp">
<Identity <Identity
Name="Microsoft.WindowsTerminalUniversal" Name="Microsoft.WindowsTerminalUniversal"
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
Version="1.0.0.0" /> Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="c0be251a-4cdd-4a6c-ab49-938ed9b6c262" PhonePublisherId="00000000-0000-0000-0000-000000000000"/> <mp:PhoneIdentity PhoneProductId="c0be251a-4cdd-4a6c-ab49-938ed9b6c262" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties> <Properties>
<DisplayName>ms-resource:AppName</DisplayName> <DisplayName>ms-resource:AppName</DisplayName>
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName> <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo> <Logo>Images\StoreLogo.png</Logo>
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
</Dependencies> </Dependencies>
<Resources> <Resources>
<Resource Language="x-generate" /> <Resource Language="x-generate" />
</Resources> </Resources>
<Applications> <Applications>
<Application Id="App" <Application Id="App"
Executable="$targetnametoken$.exe" Executable="$targetnametoken$.exe"
EntryPoint="WindowsTerminalUniversal.App"> EntryPoint="WindowsTerminalUniversal.App">
<uap:VisualElements <uap:VisualElements
DisplayName="ms-resource:AppName" DisplayName="ms-resource:AppName"
Description="ms-resource:AppDescription" Description="ms-resource:AppDescription"
Square150x150Logo="Images\Square150x150Logo.png" Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png" Square44x44Logo="Images\Square44x44Logo.png"
BackgroundColor="transparent"> BackgroundColor="transparent">
<uap:SplashScreen Image="Images\SplashScreen.png" /> <uap:SplashScreen Image="Images\SplashScreen.png" />
<uap:DefaultTile/> <uap:DefaultTile/>
</uap:VisualElements> </uap:VisualElements>
</Application> </Application>
</Applications> </Applications>
<Capabilities> <Capabilities>
<Capability Name="internetClient" /> <Capability Name="internetClient" />
</Capabilities> </Capabilities>

2
src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml
View File

@ -29,7 +29,7 @@
<Description>TAEF Packaged Cwa FullTrust Application Host Process</Description> <Description>TAEF Packaged Cwa FullTrust Application Host Process</Description>
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" /> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
<PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
</Dependencies> </Dependencies>

2
src/cascadia/ut_app/TerminalApp.Unit.Tests.manifest
View File

@ -10,7 +10,7 @@
<!-- Windows 10 1903 --> <!-- Windows 10 1903 -->
<!-- See https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/xaml-islands --> <!-- See https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/xaml-islands -->
<!-- "maxversiontested" is CASE SENSITIVE. Do not change this.--> <!-- "maxversiontested" is CASE SENSITIVE. Do not change this.-->
<maxversiontested Id="10.0.18362.0"/> <maxversiontested Id="10.0.19041.0"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application> </application>
</compatibility> </compatibility>

2
src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj
View File

@ -7,8 +7,6 @@
<ProjectName>UnitTests_TerminalApp</ProjectName> <ProjectName>UnitTests_TerminalApp</ProjectName>
<TargetName>Terminal.App.Unit.Tests</TargetName> <TargetName>Terminal.App.Unit.Tests</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject> <OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject>
</PropertyGroup> </PropertyGroup>

2
src/cascadia/wt/wt.vcxproj
View File

@ -7,7 +7,6 @@
<ProjectName>wt</ProjectName> <ProjectName>wt</ProjectName>
<TargetName>wt</TargetName> <TargetName>wt</TargetName>
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" /> <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
@ -33,4 +32,3 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
</Project> </Project>

7
src/common.build.pre.props
View File

@ -23,8 +23,6 @@
<OpenConsoleCommonOutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OpenConsoleCommonOutDir> <OpenConsoleCommonOutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OpenConsoleCommonOutDir>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="AuditMode|Win32"> <ProjectConfiguration Include="AuditMode|Win32">
<Configuration>AuditMode</Configuration> <Configuration>AuditMode</Configuration>
@ -77,9 +75,12 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.18362.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.19041.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion Condition="'$(WindowsTargetPlatformMinVersion)' == ''">10.0.18362.0</WindowsTargetPlatformMinVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<!-- For ALL build types--> <!-- For ALL build types-->
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v142</PlatformToolset>

4
src/cppwinrt.build.pre.props
View File

@ -11,9 +11,6 @@
<Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.210309.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.210309.3\build\native\Microsoft.Windows.CppWinRT.props')" /> <Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.210309.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.210309.3\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<!-- 17134 is RS4, 17763 is RS5, 18362 is 19H1 -->
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion Condition="'$(WindowsTargetPlatformMinVersion)' == ''">10.0.18362.0</WindowsTargetPlatformMinVersion>
<CppWinRTEnabled>true</CppWinRTEnabled> <CppWinRTEnabled>true</CppWinRTEnabled>
<CppWinRTOptimized>true</CppWinRTOptimized> <CppWinRTOptimized>true</CppWinRTOptimized>
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
@ -110,4 +107,3 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
</Project> </Project>

7
src/inc/LibraryIncludes.h
View File

@ -103,7 +103,14 @@
#include <sal.h> #include <sal.h>
// WRL // 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 <wrl.h> #include <wrl.h>
#pragma warning(pop)
// WEX/TAEF testing // WEX/TAEF testing
// Include before TIL if we're unit testing so it can light up WEX/TAEF template extensions // Include before TIL if we're unit testing so it can light up WEX/TAEF template extensions

11
src/terminal/parser/tracing.cpp
View File

@ -7,11 +7,8 @@
using namespace Microsoft::Console::VirtualTerminal; using namespace Microsoft::Console::VirtualTerminal;
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 26494) // _Tlgdata uninitialized from TraceLoggingWrite #pragma warning(disable : 26447) // The function is declared 'noexcept' but calls function '_tlgWrapBinary<wchar_t>()' which may throw exceptions
#pragma warning(disable : 26477) // Use nullptr instead of NULL or 0 from TraceLoggingWrite #pragma warning(disable : 26477) // Use 'nullptr' rather than 0 or NULL
#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
ParserTracing::ParserTracing() noexcept ParserTracing::ParserTracing() noexcept
{ {
@ -36,7 +33,7 @@ void ParserTracing::TraceOnAction(const std::wstring_view name) const noexcept
TraceLoggingKeyword(TIL_KEYWORD_TRACE)); 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<INT16>(wch); const auto sch = gsl::narrow_cast<INT16>(wch);
TraceLoggingWrite(g_hConsoleVirtTermParserEventTraceProvider, TraceLoggingWrite(g_hConsoleVirtTermParserEventTraceProvider,
@ -47,7 +44,7 @@ void ParserTracing::TraceOnExecute(const wchar_t wch) const
TraceLoggingKeyword(TIL_KEYWORD_TRACE)); 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<INT16>(wch); const auto sch = gsl::narrow_cast<INT16>(wch);
TraceLoggingWrite(g_hConsoleVirtTermParserEventTraceProvider, TraceLoggingWrite(g_hConsoleVirtTermParserEventTraceProvider,

4
src/terminal/parser/tracing.hpp
View File

@ -25,8 +25,8 @@ namespace Microsoft::Console::VirtualTerminal
void TraceStateChange(const std::wstring_view name) const noexcept; void TraceStateChange(const std::wstring_view name) const noexcept;
void TraceOnAction(const std::wstring_view name) const noexcept; void TraceOnAction(const std::wstring_view name) const noexcept;
void TraceOnExecute(const wchar_t wch) const; void TraceOnExecute(const wchar_t wch) const noexcept;
void TraceOnExecuteFromEscape(const wchar_t wch) const; void TraceOnExecuteFromEscape(const wchar_t wch) const noexcept;
void TraceOnEvent(const std::wstring_view name) const noexcept; void TraceOnEvent(const std::wstring_view name) const noexcept;
void TraceCharInput(const wchar_t wch); void TraceCharInput(const wchar_t wch);

4
src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj
View File

@ -51,8 +51,8 @@
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" /> <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup> <PropertyGroup>
<ProjectGuid>f75e29d0-d288-478b-8d83-2c190f321a3f</ProjectGuid> <ProjectGuid>f75e29d0-d288-478b-8d83-2c190f321a3f</ProjectGuid>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion> <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled> <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<EntryPointProjectUniqueName>..\MonarchPeasantSample\MonarchPeasantSample.vcxproj</EntryPointProjectUniqueName> <EntryPointProjectUniqueName>..\MonarchPeasantSample\MonarchPeasantSample.vcxproj</EntryPointProjectUniqueName>

3
src/tools/vtpipeterm/VtPipeTerm.vcxproj
View File

@ -6,8 +6,7 @@
<RootNamespace>VtPipeTerm</RootNamespace> <RootNamespace>VtPipeTerm</RootNamespace>
<ProjectName>VtPipeTerm</ProjectName> <ProjectName>VtPipeTerm</ProjectName>
<TargetName>VtPipeTerm</TargetName> <TargetName>VtPipeTerm</TargetName>
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\common.build.pre.props" /> <Import Project="..\..\common.build.pre.props" />
<ItemGroup> <ItemGroup>

4
src/wap-common.build.pre.props
View File

@ -40,8 +40,8 @@
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" /> <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup> <PropertyGroup>
<TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion> <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion> <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
</PropertyGroup> </PropertyGroup>