starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-04 05:35:20 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Merge remote-tracking branch 'origin/main' into dev/migrie/oop-core-interactivity-control

Browse Source
This commit is contained in:
Mike Griese
2021-03-31 05:55:36 -05:00
parent 7a0dc43e95 07c5735471
commit 68f375300f
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj
View File

@@ -49,7 +49,6 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(OpenConsoleDir)\build\rules\Branding.targets" />
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
<!-- Override GetPackagingOutputs to roll up our DLL.

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

@@ -169,7 +169,6 @@
<!-- **END VC LIBS HACK** -->
</Target>
<Import Project="$(OpenConsoleDir)\build\rules\Branding.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')" />
</Project>

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

@@ -203,4 +203,6 @@
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\dep\wil\README.md') Or !Exists('$(SolutionDir)\dep\gsl\README.md')" Text="$([System.String]::Format('$(ErrorText)'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\build\rules\Branding.targets" />
</Project>