2019-07-25 22:31:41 +02:00
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
2019-05-03 00:29:04 +02:00
|
|
|
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
|
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
|
|
|
<Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
|
|
|
|
<PropertyGroup Label="Version">
|
|
|
|
<!-- These fields are picked up by PackageES -->
|
|
|
|
<VersionMajor>0</VersionMajor>
|
2019-08-23 00:38:30 +02:00
|
|
|
<VersionMinor>4</VersionMinor>
|
2019-05-03 00:29:04 +02:00
|
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup Label="Configuration">
|
2019-06-26 23:13:32 +02:00
|
|
|
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
|
|
|
|
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
|
2019-05-03 00:29:04 +02:00
|
|
|
<!--
|
|
|
|
These two properties are very important!
|
|
|
|
Without them, msbuild will stomp MinVersion and MaxVersionTested in the
|
|
|
|
Package.appxmanifest and replace them with whatever our values for
|
|
|
|
TargetPlatformMinVersion and TargetPlatformVersion are.
|
|
|
|
-->
|
|
|
|
<AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
|
|
|
|
<AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
|
|
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup>
|
|
|
|
<ProjectGuid>CA5CAD1A-224A-4171-B13A-F16E576FDD12</ProjectGuid>
|
|
|
|
<EntryPointProjectUniqueName>..\WindowsTerminal\WindowsTerminal.vcxproj</EntryPointProjectUniqueName>
|
2019-07-13 00:21:45 +02:00
|
|
|
<DebuggerType>NativeOnly</DebuggerType>
|
2019-05-03 00:29:04 +02:00
|
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup Condition="!Exists('CascadiaPackage_TemporaryKey.pfx')">
|
|
|
|
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
|
|
|
|
<AppxBundle>Never</AppxBundle>
|
|
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup Condition="Exists('CascadiaPackage_TemporaryKey.pfx')">
|
|
|
|
<AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
|
|
|
|
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
|
|
|
|
<PackageCertificateKeyFile>CascadiaPackage_TemporaryKey.pfx</PackageCertificateKeyFile>
|
|
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup Condition="Exists('CascadiaPackage_TemporaryKey.pfx')">
|
|
|
|
<None Include="CascadiaPackage_TemporaryKey.pfx" />
|
|
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
2019-05-10 20:56:06 +02:00
|
|
|
<AppxManifest Include="Package.appxmanifest" Condition="'$(WindowsTerminalReleaseBuild)'=='true'">
|
|
|
|
<SubType>Designer</SubType>
|
|
|
|
</AppxManifest>
|
|
|
|
<AppxManifest Include="Package-Dev.appxmanifest" Condition="'$(WindowsTerminalReleaseBuild)'!='true'">
|
2019-05-03 00:29:04 +02:00
|
|
|
<SubType>Designer</SubType>
|
|
|
|
</AppxManifest>
|
|
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
2019-06-18 04:34:27 +02:00
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LargeTile.scale-100.png">
|
|
|
|
<Link>Images\LargeTile.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LargeTile.scale-125.png">
|
|
|
|
<Link>Images\LargeTile.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LargeTile.scale-150.png">
|
|
|
|
<Link>Images\LargeTile.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LargeTile.scale-200.png">
|
|
|
|
<Link>Images\LargeTile.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LargeTile.scale-400.png">
|
|
|
|
<Link>Images\LargeTile.scale-400.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LockScreenLogo.scale-100.png">
|
|
|
|
<Link>Images\LockScreenLogo.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LockScreenLogo.scale-125.png">
|
|
|
|
<Link>Images\LockScreenLogo.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LockScreenLogo.scale-150.png">
|
|
|
|
<Link>Images\LockScreenLogo.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LockScreenLogo.scale-200.png">
|
|
|
|
<Link>Images\LockScreenLogo.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\LockScreenLogo.scale-400.png">
|
|
|
|
<Link>Images\LockScreenLogo.scale-400.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SmallTile.scale-100.png">
|
|
|
|
<Link>Images\SmallTile.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SmallTile.scale-125.png">
|
|
|
|
<Link>Images\SmallTile.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SmallTile.scale-150.png">
|
|
|
|
<Link>Images\SmallTile.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SmallTile.scale-200.png">
|
|
|
|
<Link>Images\SmallTile.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SmallTile.scale-400.png">
|
|
|
|
<Link>Images\SmallTile.scale-400.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SplashScreen.scale-100.png">
|
|
|
|
<Link>Images\SplashScreen.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SplashScreen.scale-125.png">
|
|
|
|
<Link>Images\SplashScreen.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SplashScreen.scale-150.png">
|
|
|
|
<Link>Images\SplashScreen.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SplashScreen.scale-200.png">
|
|
|
|
<Link>Images\SplashScreen.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\SplashScreen.scale-400.png">
|
|
|
|
<Link>Images\SplashScreen.scale-400.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square150x150Logo.scale-100.png">
|
|
|
|
<Link>Images\Square150x150Logo.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square150x150Logo.scale-125.png">
|
|
|
|
<Link>Images\Square150x150Logo.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square150x150Logo.scale-150.png">
|
|
|
|
<Link>Images\Square150x150Logo.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square150x150Logo.scale-200.png">
|
|
|
|
<Link>Images\Square150x150Logo.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square150x150Logo.scale-400.png">
|
|
|
|
<Link>Images\Square150x150Logo.scale-400.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.scale-100.png">
|
|
|
|
<Link>Images\Square44x44Logo.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.scale-125.png">
|
|
|
|
<Link>Images\Square44x44Logo.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.scale-150.png">
|
|
|
|
<Link>Images\Square44x44Logo.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.scale-200.png">
|
|
|
|
<Link>Images\Square44x44Logo.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.scale-400.png">
|
|
|
|
<Link>Images\Square44x44Logo.scale-400.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-16.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-16.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-16_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-16_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-20.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-20.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-20_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-20_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-24.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-24.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-24_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-24_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-256.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-256.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-256_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-256_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-30.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-30.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-30_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-30_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-32.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-32.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-32_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-32_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-36.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-36.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-36_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-36_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-40.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-40.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-40_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-40_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-48.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-48.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-48_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-48_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-60.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-60.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-60_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-60_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-64.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-64.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-64_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-64_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-72.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-72.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-72_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-72_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-80.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-80.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-80_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-80_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-96.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-96.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Square44x44Logo.targetsize-96_altform-unplated.png">
|
|
|
|
<Link>Images\Square44x44Logo.targetsize-96_altform-unplated.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\StoreLogo.scale-100.png">
|
|
|
|
<Link>Images\StoreLogo.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\StoreLogo.scale-125.png">
|
|
|
|
<Link>Images\StoreLogo.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\StoreLogo.scale-150.png">
|
|
|
|
<Link>Images\StoreLogo.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\StoreLogo.scale-200.png">
|
|
|
|
<Link>Images\StoreLogo.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\StoreLogo.scale-400.png">
|
|
|
|
<Link>Images\StoreLogo.scale-400.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Wide310x150Logo.scale-100.png">
|
|
|
|
<Link>Images\Wide310x150Logo.scale-100.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Wide310x150Logo.scale-125.png">
|
|
|
|
<Link>Images\Wide310x150Logo.scale-125.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Wide310x150Logo.scale-150.png">
|
|
|
|
<Link>Images\Wide310x150Logo.scale-150.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Wide310x150Logo.scale-200.png">
|
|
|
|
<Link>Images\Wide310x150Logo.scale-200.png</Link>
|
|
|
|
</Content>
|
|
|
|
<Content Include="$(OpenConsoleDir)res\terminal\Wide310x150Logo.scale-400.png">
|
|
|
|
<Link>Images\Wide310x150Logo.scale-400.png</Link>
|
|
|
|
</Content>
|
2019-05-22 22:03:10 +02:00
|
|
|
<Content Include="ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-100.png" />
|
|
|
|
<Content Include="ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-200.png" />
|
|
|
|
<Content Include="ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-100.png" />
|
|
|
|
<Content Include="ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-200.png" />
|
|
|
|
<Content Include="ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-100.png" />
|
|
|
|
<Content Include="ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-200.png" />
|
|
|
|
<Content Include="ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-100.png" />
|
|
|
|
<Content Include="ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-200.png" />
|
2019-07-25 22:31:41 +02:00
|
|
|
<Content Include="ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-100.png" />
|
|
|
|
<Content Include="ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-200.png" />
|
2019-05-03 00:29:04 +02:00
|
|
|
<PRIResource Include="Resources\en-US\Resources.resw" />
|
|
|
|
</ItemGroup>
|
|
|
|
<Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
|
|
|
|
<ItemGroup>
|
|
|
|
<ProjectReference Include="..\WindowsTerminal\WindowsTerminal.vcxproj" />
|
|
|
|
<ProjectReference Include="..\..\host\exe\Host.EXE.vcxproj" />
|
|
|
|
</ItemGroup>
|
|
|
|
<!-- Stomp the path to conhost.exe.
|
|
|
|
This task will copy OpenConsole.exe to the appx as conhost.exe, and place it
|
|
|
|
adjacent to WindowsTerminal.exe.
|
|
|
|
-->
|
2019-06-26 23:13:32 +02:00
|
|
|
<Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">
|
|
|
|
<ItemGroup>
|
2019-05-03 00:29:04 +02:00
|
|
|
<!-- Stomp all "SourceProject" values for all incoming dependencies to flatten the package. -->
|
2019-06-26 23:13:32 +02:00
|
|
|
<_TemporaryFilteredWapProjOutput Include="@(_FilteredNonWapProjProjectOutput)" />
|
|
|
|
<_FilteredNonWapProjProjectOutput Remove="@(_TemporaryFilteredWapProjOutput)" />
|
|
|
|
<_FilteredNonWapProjProjectOutput Include="@(_TemporaryFilteredWapProjOutput)">
|
2019-05-03 00:29:04 +02:00
|
|
|
<!-- Override the filename for OpenConsole.exe (only) -->
|
|
|
|
<TargetPath Condition="'%(Filename)' == 'OpenConsole' and '%(Extension)' == '.exe'">conhost.exe</TargetPath>
|
2019-06-26 23:13:32 +02:00
|
|
|
<!-- Blank the SourceProject here to vend all files into the root of the package. -->
|
2019-07-25 22:31:41 +02:00
|
|
|
<SourceProject>
|
|
|
|
</SourceProject>
|
2019-06-26 23:13:32 +02:00
|
|
|
</_FilteredNonWapProjProjectOutput>
|
|
|
|
</ItemGroup>
|
|
|
|
</Target>
|
2019-07-13 00:21:45 +02:00
|
|
|
|
|
|
|
<!-- Move all the PRI files that would be packaged into the appx into _PriFile so that
|
|
|
|
GenerateProjectPriFile catches them. This requires us to move payload collection
|
|
|
|
up before GenerateProjectPriFile, when it is typically _after_ it (because the
|
|
|
|
DesktopBridge project type is built to only prepare the payload during appx manifest
|
|
|
|
generation.
|
|
|
|
|
|
|
|
Since PRI file generation is _before_ manifest generation (for possibly obvious or
|
|
|
|
important reasons), that doesn't work for us.
|
|
|
|
-->
|
|
|
|
<PropertyGroup>
|
2019-09-13 23:34:41 +02:00
|
|
|
<!-- Only for MSBuild versions < 16.3.0 -->
|
|
|
|
<_GenerateProjectPriFileDependsOn Condition="$(MSBuildVersion) < '16.3.0'">OpenConsoleLiftDesktopBridgePriFiles;$(_GenerateProjectPriFileDependsOn)</_GenerateProjectPriFileDependsOn>
|
2019-07-13 00:21:45 +02:00
|
|
|
</PropertyGroup>
|
|
|
|
<Target Name="OpenConsoleLiftDesktopBridgePriFiles" DependsOnTargets="_ConvertItems">
|
|
|
|
<ItemGroup>
|
|
|
|
<_PriFile Include="@(_NonWapProjProjectOutput)" Condition="'%(Extension)' == '.pri'" />
|
|
|
|
<!-- Remove all other .pri files from the appx payload. -->
|
|
|
|
<AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(Extension)' == '.pri'" />
|
|
|
|
</ItemGroup>
|
|
|
|
</Target>
|
|
|
|
|
2019-09-13 23:34:41 +02:00
|
|
|
<!-- VS 16.3.0 added a rule to the WAP packaging project that removes all non-WAP payload, which we were relying on to
|
|
|
|
roll up our subproject resources. We have to suppress that rule but keep part of its logic, because that rule is
|
|
|
|
where the AppxPackagePayload items are created. -->
|
|
|
|
<PropertyGroup>
|
|
|
|
<!-- Only for MSBuild versions <= 16.4.0 -->
|
|
|
|
<!-- TODO: Change this to hard less than once the 16.4.0 previews fix the bug. -->
|
|
|
|
<WapProjBeforeGenerateAppxManifestDependsOn
|
|
|
|
Condition="$(MSBuildVersion) <= '16.4.0'">
|
|
|
|
$([MSBuild]::Unescape('$(WapProjBeforeGenerateAppxManifestDependsOn.Replace('_RemoveAllNonWapUWPItems', '_OpenConsoleRemoveAllNonWapUWPItems'))'))
|
|
|
|
</WapProjBeforeGenerateAppxManifestDependsOn>
|
|
|
|
</PropertyGroup>
|
|
|
|
<Target Name="_OpenConsoleRemoveAllNonWapUWPItems">
|
|
|
|
<ItemGroup>
|
|
|
|
<AppxPackagePayload Include="@(WapProjPackageFile)" />
|
|
|
|
<AppxUploadPackagePayload Include="@(UploadWapProjPackageFile)" />
|
|
|
|
<!-- 16.3.0 - remove non-resources.pri PRI files since we just forced them back in. -->
|
|
|
|
<AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(Extension)' == '.pri' and '%(Filename)' != 'resources'" />
|
|
|
|
<AppxUploadPackagePayload Remove="@(AppxUploadPackagePayload)" Condition="'%(Extension)' == '.pri' and '%(Filename)' != 'resources'" />
|
|
|
|
</ItemGroup>
|
|
|
|
</Target>
|
|
|
|
|
2019-07-31 01:35:08 +02:00
|
|
|
</Project>
|