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

Turns out if you do this, then the resources don't get built which fricken sucks.

Browse source
This commit is contained in:
Mike Griese 2021-11-22 14:40:10 -06:00
parent 73a86c6a1c
commit aac2ad2b92
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<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" />
@ -59,7 +59,6 @@
</PropertyGroup>
<Import Project="$(MSBuildThisFileDirectory)..\CascadiaResources.build.items" />
<Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
<!--
BODGY:
@ -70,31 +69,40 @@
think that the package needs rebuilding, which is quite costly. Simply don't
do this.
NOPE If you do that, then the resources.pri won't roll up the resources for
that dependency. Need to find another way.
Private=true wasn't it, the build failed trying to ReferenceCopyLocalPaths WindowsTerminal.winmd
CopyLocalSatelliteAssemblies>False wasn't it either, it still looked for the winmd.
-->
<ItemGroup>
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj">
<Project>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</Project>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<!-- <ReferenceOutputAssembly>False</ReferenceOutputAssembly> -->
<!-- <Private>true</Private> -->
<!-- <CopyLocalSatelliteAssemblies>False</CopyLocalSatelliteAssemblies> -->
</ProjectReference>
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj">
<Project>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</Project>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<!-- <ReferenceOutputAssembly>False</ReferenceOutputAssembly> -->
</ProjectReference>
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj">
<Project>{f2ed628a-db22-446f-a081-4cc845b51a2b}</Project>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<!-- <ReferenceOutputAssembly>False</ReferenceOutputAssembly> -->
</ProjectReference>
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\wt\wt.vcxproj">
<Project>{506fd703-baa7-4f6e-9361-64f550ec8fca}</Project>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<!-- <ReferenceOutputAssembly>False</ReferenceOutputAssembly> -->
</ProjectReference>
<ProjectReference Include="$(OpenConsoleDir)src\host\exe\Host.EXE.vcxproj">
<Project>{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}</Project>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<!-- <ReferenceOutputAssembly>False</ReferenceOutputAssembly> -->
</ProjectReference>
<ProjectReference Include="$(OpenConsoleDir)src\host\proxy\Host.Proxy.vcxproj">
<Project>{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}</Project>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<!-- <ReferenceOutputAssembly>False</ReferenceOutputAssembly> -->
</ProjectReference>
</ItemGroup>
<Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">

3
src/cascadia/TerminalApp/TerminalAppLib.vcxproj
View file

@ -316,6 +316,7 @@
<Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<!-- For whatever reason, we can't include the TerminalControl and
TerminalSettings projects' winmds via project references. So we'll have to
manually include the winmds as References below
@ -326,8 +327,6 @@
Up-to-date Check will look for the .xaml files from that project in our
output, which won't actually be there.
-->
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj">
<!-- Private:false and ReferenceOutputAssembly:false, in combination with
the manual reference to TerminalControl.winmd below make sure that this