120e6157c3
* Fix the WAP packaging project This commits fixes the centennial package by: * Forcing XBF (XAML binary format) files to be embedded in project PRI files. * Moving package content generation to before PRI generation * Collecting all of the package's PRI files to merge into resources.pri * Fixing the hardcoded resource paths to reflect the new reality. It also includes a magic value that fixes the bug where the project is autodetected as a Mixed (CLR + Native) project. Fixes #1816.
196 lines
10 KiB
XML
196 lines
10 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
|
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
|
<PropertyGroup>
|
|
<!-- cppwinrt.build.pre.props depends on these settings: -->
|
|
<!-- build a dll, not exe (Application) -->
|
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
<SubSystem>Console</SubSystem>
|
|
<!-- sets a bunch of Windows Universal properties -->
|
|
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
|
</PropertyGroup>
|
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
|
<PropertyGroup Label="Globals">
|
|
<ProjectGuid>{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}</ProjectGuid>
|
|
<ProjectName>TerminalApp</ProjectName>
|
|
<RootNamespace>TerminalApp</RootNamespace>
|
|
<!--
|
|
This is an override that, puzzlingly, _forces XBF (XAML binary) embedding_.
|
|
We have to do this to overcome a layout issue in the WAP packaging project.
|
|
When we do this, the XBF ends up in resources.pri.
|
|
-->
|
|
<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
|
|
</PropertyGroup>
|
|
<!-- ========================= XAML files ======================== -->
|
|
<ItemGroup>
|
|
<!-- HERE BE DRAGONS:
|
|
For any types that use XAML information, if their .idl, .cpp, and .h
|
|
aren't all marked DependentUpon the corresponding .xaml file,
|
|
XamlTypeInfo.g.h won't pick it up correctly.
|
|
-->
|
|
<ApplicationDefinition Include="App.xaml">
|
|
<SubType>Designer</SubType>
|
|
</ApplicationDefinition>
|
|
</ItemGroup>
|
|
<!-- When we add other user controls, they should go in here as so: -->
|
|
<!-- <ItemGroup>
|
|
<Page Include="MyUserControl.xaml">
|
|
<SubType>Designer</SubType>
|
|
</Page>
|
|
</ItemGroup> -->
|
|
<!-- ========================= Headers ======================== -->
|
|
<ItemGroup>
|
|
<ClInclude Include="App.base.h" />
|
|
<ClInclude Include="TerminalPage.h">
|
|
<DependentUpon>TerminalPage.xaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</ClInclude>
|
|
<ClInclude Include="MinMaxCloseControl.h">
|
|
<DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="Tab.h" />
|
|
<ClInclude Include="Pane.h" />
|
|
<ClInclude Include="ColorScheme.h" />
|
|
<ClInclude Include="GlobalAppSettings.h" />
|
|
<ClInclude Include="Profile.h" />
|
|
<ClInclude Include="CascadiaSettings.h" />
|
|
<ClInclude Include="AppKeyBindingsSerialization.h" />
|
|
<ClInclude Include="KeyChordSerialization.h" />
|
|
<ClInclude Include="Utils.h" />
|
|
<ClInclude Include="pch.h" />
|
|
<ClInclude Include="AppKeyBindings.h">
|
|
<DependentUpon>AppKeyBindings.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="App.h">
|
|
<DependentUpon>App.xaml</DependentUpon>
|
|
</ClInclude>
|
|
</ItemGroup>
|
|
<!-- ========================= Cpp Files ======================== -->
|
|
<ItemGroup>
|
|
<ClCompile Include="TerminalPage.cpp">
|
|
<DependentUpon>TerminalPage.xaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</ClCompile>
|
|
<ClCompile Include="MinMaxCloseControl.cpp">
|
|
<DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
|
|
</ClCompile>
|
|
<Midl Include="TerminalPage.idl">
|
|
<DependentUpon>TerminalPage.xaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Midl>
|
|
<Midl Include="MinMaxCloseControl.idl">
|
|
<DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Midl>
|
|
<ClCompile Include="Tab.cpp" />
|
|
<ClCompile Include="Pane.cpp" />
|
|
<ClCompile Include="ColorScheme.cpp" />
|
|
<ClCompile Include="GlobalAppSettings.cpp" />
|
|
<ClCompile Include="Profile.cpp" />
|
|
<ClCompile Include="CascadiaSettings.cpp" />
|
|
<ClCompile Include="CascadiaSettingsSerialization.cpp" />
|
|
<ClCompile Include="AppKeyBindingsSerialization.cpp" />
|
|
<ClCompile Include="KeyChordSerialization.cpp" />
|
|
<ClCompile Include="Utils.cpp" />
|
|
<ClCompile Include="pch.cpp">
|
|
<PrecompiledHeader>Create</PrecompiledHeader>
|
|
</ClCompile>
|
|
<ClCompile Include="AppKeyBindings.cpp">
|
|
<DependentUpon>AppKeyBindings.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="App.cpp">
|
|
<DependentUpon>App.xaml</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
|
|
<!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
|
|
you want to use jsoncpp -->
|
|
<ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
|
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
</ClCompile>
|
|
</ItemGroup>
|
|
<!-- ========================= idl Files ======================== -->
|
|
<ItemGroup>
|
|
<Midl Include="App.idl">
|
|
<DependentUpon>App.xaml</DependentUpon>
|
|
</Midl>
|
|
<Midl Include="AppKeyBindings.idl" />
|
|
</ItemGroup>
|
|
<!-- ========================= Misc Files ======================== -->
|
|
<ItemGroup>
|
|
<None Include="packages.config" />
|
|
<None Include="TerminalApp.def" />
|
|
</ItemGroup>
|
|
<!-- ========================= Project References ======================== -->
|
|
<ItemGroup>
|
|
<!--
|
|
the packaging project won't recurse through our dependencies, you have to
|
|
make sure that if you add a cppwinrt dependency to any of these projects,
|
|
you also update all the consumers
|
|
-->
|
|
<ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj">
|
|
<Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj">
|
|
<Project>{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}</Project>
|
|
</ProjectReference>
|
|
<!-- This is needed to be able to reference the XamlApplication type. -->
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Page Include="TerminalPage.xaml">
|
|
<SubType>Designer</SubType>
|
|
</Page>
|
|
<Page Include="MinMaxCloseControl.xaml">
|
|
<SubType>Designer</SubType>
|
|
</Page>
|
|
</ItemGroup>
|
|
<PropertyGroup>
|
|
<!--
|
|
DON'T REDIRECT OUR OUTPUT.
|
|
Setting this will tell cppwinrt.build.post.props to copy our output from
|
|
the default OutDir up one level, so the wapproj will be able to find it.
|
|
-->
|
|
<NoOutputRedirection>true</NoOutputRedirection>
|
|
</PropertyGroup>
|
|
<ItemDefinitionGroup>
|
|
<ClCompile>
|
|
<AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
|
|
</ClCompile>
|
|
<Link>
|
|
<AdditionalDependencies>User32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
</ItemDefinitionGroup>
|
|
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
|
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
|
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
|
<PropertyGroup>
|
|
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
|
</PropertyGroup>
|
|
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
|
|
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props'))" />
|
|
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
|
|
</Target>
|
|
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
|
|
|
|
<!--
|
|
By default, the PRI file will contain resource paths beginning with the
|
|
project name. Since we enabled XBF embedding, this *also* includes App.xbf.
|
|
Well, App.xbf is hardcoded by the framework to be found at the resource ROOT.
|
|
To make that happen, we have to disable the prepending of the project name
|
|
to the App xaml files.
|
|
-->
|
|
<PropertyGroup>
|
|
<_GenerateProjectPriFileDependsOn>OpenConsolePlaceAppXbfAtRootOfResourceTree;$(_GenerateProjectPriFileDependsOn)</_GenerateProjectPriFileDependsOn>
|
|
</PropertyGroup>
|
|
<Target Name="OpenConsolePlaceAppXbfAtRootOfResourceTree" DependsOnTargets="GetPackagingOutputs">
|
|
<ItemGroup>
|
|
<_RelocatedAppXamlData Include="@(PackagingOutputs)" Condition="'%(Filename)' == 'App' and ('%(Extension)' == '.xaml' or '%(Extension)' == '.xbf')" />
|
|
<PackagingOutputs Remove="@(_RelocatedAppXamlData)" />
|
|
<PackagingOutputs Include="@(_RelocatedAppXamlData)">
|
|
<TargetPath>%(Filename)%(Extension)</TargetPath>
|
|
</PackagingOutputs>
|
|
</ItemGroup>
|
|
</Target>
|
|
</Project>
|