Unify and clean up the common build properties (#3429)
This commit cleans up and deduplicates all of the common build preamble/postamble across exe, dll, lib and c++/winrt projects. The following specific changes have been made: * All projects now define their ConfigurationType * All projects now set all their properties *before* including a common build file (or any other build files) * cppwinrt.pre and cppwinrt.post now delegate most of their configuration to common.pre and common.post * (becuase of the above,) all build options are conserved between console and c++/winrt components, including specific warnings and preprocessor definitions. * More properties that are configurable per-project are now conditioned so the common props don't override them. * The exe, dll, exe.or.dll, and lib postincludes have been merged into pre or post and switched based on condition as required * Shared items (-shared, -common) are now explicitly vcxitems instead of vcxproj files. * The link line is now manipulated after Microsoft.Cpp sets it, so the libraries we specify "win". All console things link first against onecore_apiset.lib. * Fix all compilation errors caused by build unification * Move CascadiaPackage's resources into a separate item file Fixes #922.
This commit is contained in:
Dustin L. Howett (MSFT)
GitHub
parent
52d7de38b1
commit
9dc922fc37
|
|
@ -99,10 +99,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Propsheet.DLL", "src\propsh
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build Common", "_Build Common", "{04170EEF-983A-4195-BFEF-2321E5E38A1E}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build Common", "_Build Common", "{04170EEF-983A-4195-BFEF-2321E5E38A1E}"
|
||||||
ProjectSection(SolutionItems) = preProject
|
ProjectSection(SolutionItems) = preProject
|
||||||
src\common.build.dll.props = src\common.build.dll.props
|
|
||||||
src\common.build.exe.or.dll.props = src\common.build.exe.or.dll.props
|
|
||||||
src\common.build.exe.props = src\common.build.exe.props
|
|
||||||
src\common.build.lib.props = src\common.build.lib.props
|
|
||||||
src\common.build.post.props = src\common.build.post.props
|
src\common.build.post.props = src\common.build.post.props
|
||||||
src\common.build.pre.props = src\common.build.pre.props
|
src\common.build.pre.props = src\common.build.pre.props
|
||||||
src\common.build.tests.props = src\common.build.tests.props
|
src\common.build.tests.props = src\common.build.tests.props
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{0CF235BD-2DA0-407E-90EE-C467E8BBC714}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>bufferout</RootNamespace>
|
||||||
|
<ProjectName>BufferOut</ProjectName>
|
||||||
|
<TargetName>ConBufferOut</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\AttrRow.cpp" />
|
<ClCompile Include="..\AttrRow.cpp" />
|
||||||
|
|
@ -49,19 +57,6 @@
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
<ClInclude Include="..\UnicodeStorage.hpp" />
|
<ClInclude Include="..\UnicodeStorage.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{0CF235BD-2DA0-407E-90EE-C467E8BBC714}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>bufferout</RootNamespace>
|
|
||||||
<ProjectName>BufferOut</ProjectName>
|
|
||||||
<TargetName>ConBufferOut</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)\dep;$(SolutionDir)\dep\Console;$(SolutionDir)\dep\Win32K;$(SolutionDir)\dep\AppModel;$(SolutionDir)\dep\MinCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{531C23E7-4B76-4C08-8BBD-04164CB628C9}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>TextBufferUnitTests</RootNamespace>
|
||||||
|
<ProjectName>TextBuffer.Unit.Tests</ProjectName>
|
||||||
|
<TargetName>TextBuffer.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="TextColorTests.cpp" />
|
<ClCompile Include="TextColorTests.cpp" />
|
||||||
|
|
@ -17,20 +25,12 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{531C23E7-4B76-4C08-8BBD-04164CB628C9}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>TextBufferUnitTests</RootNamespace>
|
|
||||||
<ProjectName>TextBuffer.Unit.Tests</ProjectName>
|
|
||||||
<TargetName>TextBuffer.Unit.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -45,233 +45,14 @@
|
||||||
</AppxManifest>
|
</AppxManifest>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<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>
|
|
||||||
<!-- Fonts -->
|
|
||||||
<Content Include="$(OpenConsoleDir)res\Cascadia.ttf" Condition="'$(WindowsTerminalReleaseBuild)'=='true'">
|
|
||||||
<Link>Cascadia.ttf</Link>
|
|
||||||
</Content>
|
|
||||||
<!-- Profile Icons -->
|
|
||||||
<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" />
|
|
||||||
<Content Include="ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-100.png" />
|
|
||||||
<Content Include="ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-200.png" />
|
|
||||||
<!-- Default Settings -->
|
|
||||||
<Content Include="$(OpenConsoleDir)src\cascadia\TerminalApp\defaults.json">
|
|
||||||
<Link>defaults.json</Link>
|
|
||||||
</Content>
|
|
||||||
<!-- Resources -->
|
<!-- Resources -->
|
||||||
|
<!-- This resw only defines things that are used in this package's AppxManifest,
|
||||||
|
so it's not in the common resource items. -->
|
||||||
<PRIResource Include="Resources\en-US\Resources.resw" />
|
<PRIResource Include="Resources\en-US\Resources.resw" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Import Project="$(MSBuildThisFileDirectory)..\CascadiaResources.build.items" />
|
||||||
|
|
||||||
<Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
248
src/cascadia/CascadiaResources.build.items
Normal file
248
src/cascadia/CascadiaResources.build.items
Normal file
|
|
@ -0,0 +1,248 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<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>
|
||||||
|
<!-- Fonts -->
|
||||||
|
<Content Include="$(OpenConsoleDir)res\Cascadia.ttf" Condition="'$(WindowsTerminalReleaseBuild)'=='true'">
|
||||||
|
<Link>Cascadia.ttf</Link>
|
||||||
|
</Content>
|
||||||
|
<!-- Profile Icons -->
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-100.png">
|
||||||
|
<Link>ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-100.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-200.png">
|
||||||
|
<Link>ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-200.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-100.png">
|
||||||
|
<Link>ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-100.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-200.png">
|
||||||
|
<Link>ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-200.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-100.png">
|
||||||
|
<Link>ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-100.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-200.png">
|
||||||
|
<Link>ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-200.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-100.png">
|
||||||
|
<Link>ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-100.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-200.png">
|
||||||
|
<Link>ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-200.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-100.png">
|
||||||
|
<Link>ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-100.png</Link>
|
||||||
|
</Content>
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)CascadiaPackage\ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-200.png">
|
||||||
|
<Link>ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-200.png</Link>
|
||||||
|
</Content>
|
||||||
|
<!-- Default Settings -->
|
||||||
|
<Content Include="$(MSBuildThisFileDirectory)\TerminalApp\defaults.json">
|
||||||
|
<Link>defaults.json</Link>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,5 +1,29 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{CA5CAD1A-b11c-4ddb-a4fe-c3afae9b5506}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>TerminalAppLocalTests</RootNamespace>
|
||||||
|
<ProjectName>LocalTests_TerminalApp</ProjectName>
|
||||||
|
<TargetName>TerminalApp.LocalTests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||||
|
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||||
|
<!-- We'll manage our own OutDir/IntDir -->
|
||||||
|
<NoOutputRedirection>true</NoOutputRedirection>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<!-- Manually change our outdir to be in a subdirectory. We don't really want
|
||||||
|
to put our output in the bin root, because if we do, we'll copy
|
||||||
|
TerminalApp.winmd to the bin root, and then every subsequent mdmerge step
|
||||||
|
(in _any_ cppwinrt project) will automatically try to pick up
|
||||||
|
TerminalApp.winmd as a dependency (which is just wrong). This MUST be done
|
||||||
|
before importing common.build.pre.props -->
|
||||||
|
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)\src\common.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)\src\common.build.pre.props" />
|
||||||
|
|
||||||
|
|
@ -40,15 +64,6 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- ========================= Globals ======================== -->
|
<!-- ========================= Globals ======================== -->
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{CA5CAD1A-b11c-4ddb-a4fe-c3afae9b5506}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>TerminalAppLocalTests</RootNamespace>
|
|
||||||
<ProjectName>LocalTests_TerminalApp</ProjectName>
|
|
||||||
<TargetName>TerminalApp.LocalTests</TargetName>
|
|
||||||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
|
||||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- ====================== Compiler & Linker Flags ===================== -->
|
<!-- ====================== Compiler & Linker Flags ===================== -->
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
|
|
@ -70,21 +85,9 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
|
<Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<!-- Manually change our outdir to be in a subdirectory. We don't really want
|
|
||||||
to put our output in the bin root, because if we do, we'll copy
|
|
||||||
TerminalApp.winmd to the bin root, and then every subsequent mdmerge step
|
|
||||||
(in _any_ cppwinrt project) will automatically try to pick up
|
|
||||||
TerminalApp.winmd as a dependency (which is just wrong). This MUST be done
|
|
||||||
after importing common.build.post.props-->
|
|
||||||
<OutDir>$(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
|
|
||||||
<IntDir>$(OpenConsoleDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_CppWinrtBinRoot>"$(OpenConsoleDir)$(Platform)\$(Configuration)\"</_CppWinrtBinRoot>
|
<_CppWinrtBinRoot>"$(OpenConsoleDir)$(Platform)\$(Configuration)\"</_CppWinrtBinRoot>
|
||||||
<!-- From Microsoft.UI.Xaml.targets -->
|
<!-- From Microsoft.UI.Xaml.targets -->
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
|
||||||
<PropertyGroup Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<VCProjectVersion>16.0</VCProjectVersion>
|
<VCProjectVersion>16.0</VCProjectVersion>
|
||||||
<ProjectGuid>{84848BFA-931D-42CE-9ADF-01EE54DE7890}</ProjectGuid>
|
<ProjectGuid>{84848BFA-931D-42CE-9ADF-01EE54DE7890}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>PublicTerminalCore</RootNamespace>
|
<RootNamespace>PublicTerminalCore</RootNamespace>
|
||||||
<ProjectName>PublicTerminalCore</ProjectName>
|
<ProjectName>PublicTerminalCore</ProjectName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="pch.cpp">
|
<ClCompile Include="pch.cpp">
|
||||||
<PrecompiledHeader>Create</PrecompiledHeader>
|
<PrecompiledHeader>Create</PrecompiledHeader>
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
<ClInclude Include="HwndTerminal.hpp" />
|
<ClInclude Include="HwndTerminal.hpp" />
|
||||||
<ClInclude Include="pch.h" />
|
<ClInclude Include="pch.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\terminal\input\lib\terminalinput.vcxproj">
|
<ProjectReference Include="..\..\terminal\input\lib\terminalinput.vcxproj">
|
||||||
<Project>{1cf55140-ef6a-4736-a403-957e4f7430bb}</Project>
|
<Project>{1cf55140-ef6a-4736-a403-957e4f7430bb}</Project>
|
||||||
|
|
@ -45,12 +46,12 @@
|
||||||
<Project>{48d21369-3d7b-4431-9967-24e81292cf62}</Project>
|
<Project>{48d21369-3d7b-4431-9967-24e81292cf62}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ namespace winrt::TerminalApp::implementation
|
||||||
dialog.RequestedTheme(_settings->GlobalSettings().GetRequestedTheme());
|
dialog.RequestedTheme(_settings->GlobalSettings().GetRequestedTheme());
|
||||||
|
|
||||||
// Display the dialog.
|
// Display the dialog.
|
||||||
Controls::ContentDialogResult result = co_await dialog.ShowAsync(Controls::ContentDialogPlacement::Popup);
|
co_await dialog.ShowAsync(Controls::ContentDialogPlacement::Popup);
|
||||||
|
|
||||||
// After the dialog is dismissed, the dialog lock (held by `lock`) will
|
// After the dialog is dismissed, the dialog lock (held by `lock`) will
|
||||||
// be released so another can be shown
|
// be released so another can be shown
|
||||||
|
|
|
||||||
|
|
@ -383,14 +383,14 @@ std::string GlobalAppSettings::_SerializeInitialPosition(const std::optional<int
|
||||||
std::string serializedInitialPos = "";
|
std::string serializedInitialPos = "";
|
||||||
if (initialX.has_value())
|
if (initialX.has_value())
|
||||||
{
|
{
|
||||||
serializedInitialPos += initialX.value();
|
serializedInitialPos += std::to_string(initialX.value());
|
||||||
}
|
}
|
||||||
|
|
||||||
serializedInitialPos += ", ";
|
serializedInitialPos += ", ";
|
||||||
|
|
||||||
if (initialY.has_value())
|
if (initialY.has_value())
|
||||||
{
|
{
|
||||||
serializedInitialPos += initialY.value();
|
serializedInitialPos += std::to_string(initialY.value());
|
||||||
}
|
}
|
||||||
|
|
||||||
return serializedInitialPos;
|
return serializedInitialPos;
|
||||||
|
|
|
||||||
|
|
@ -21,18 +21,18 @@ namespace winrt::TerminalApp::implementation
|
||||||
|
|
||||||
// These event handlers simply forward each buttons click events up to the
|
// These event handlers simply forward each buttons click events up to the
|
||||||
// events we've exposed.
|
// events we've exposed.
|
||||||
void MinMaxCloseControl::_MinimizeClick(winrt::Windows::Foundation::IInspectable const& sender,
|
void MinMaxCloseControl::_MinimizeClick(winrt::Windows::Foundation::IInspectable const& /*sender*/,
|
||||||
RoutedEventArgs const& e)
|
RoutedEventArgs const& e)
|
||||||
{
|
{
|
||||||
_minimizeClickHandlers(*this, e);
|
_minimizeClickHandlers(*this, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MinMaxCloseControl::_MaximizeClick(winrt::Windows::Foundation::IInspectable const& sender,
|
void MinMaxCloseControl::_MaximizeClick(winrt::Windows::Foundation::IInspectable const& /*sender*/,
|
||||||
RoutedEventArgs const& e)
|
RoutedEventArgs const& e)
|
||||||
{
|
{
|
||||||
_maximizeClickHandlers(*this, e);
|
_maximizeClickHandlers(*this, e);
|
||||||
}
|
}
|
||||||
void MinMaxCloseControl::_CloseClick(winrt::Windows::Foundation::IInspectable const& sender,
|
void MinMaxCloseControl::_CloseClick(winrt::Windows::Foundation::IInspectable const& /*sender*/,
|
||||||
RoutedEventArgs const& e)
|
RoutedEventArgs const& e)
|
||||||
{
|
{
|
||||||
_closeClickHandlers(*this, e);
|
_closeClickHandlers(*this, e);
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,26 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<ProjectGuid>{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}</ProjectGuid>
|
||||||
|
<ProjectName>TerminalApp</ProjectName>
|
||||||
<PropertyGroup>
|
<RootNamespace>TerminalApp</RootNamespace>
|
||||||
<!-- cppwinrt.build.pre.props depends on these settings: -->
|
<!-- cppwinrt.build.pre.props depends on these settings: -->
|
||||||
<!-- build a dll, not exe (Application) -->
|
<!-- build a dll, not exe (Application) -->
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<!-- sets a bunch of Windows Universal properties -->
|
<!-- sets a bunch of Windows Universal properties -->
|
||||||
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
||||||
|
<!--
|
||||||
|
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>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}</ProjectGuid>
|
|
||||||
<ProjectName>TerminalApp</ProjectName>
|
|
||||||
<RootNamespace>TerminalApp</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- ========================= XAML files ======================== -->
|
<!-- ========================= XAML files ======================== -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- DON'T PUT XAML FILES HERE! Put them in TerminalAppLib.vcxproj -->
|
<!-- DON'T PUT XAML FILES HERE! Put them in TerminalAppLib.vcxproj -->
|
||||||
|
|
@ -85,14 +89,6 @@
|
||||||
<_BinRoot Condition="'$(Platform)' == 'Win32'">$(OpenConsoleDir)$(Configuration)\</_BinRoot>
|
<_BinRoot Condition="'$(Platform)' == 'Win32'">$(OpenConsoleDir)$(Configuration)\</_BinRoot>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<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>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
|
||||||
|
|
@ -105,7 +101,6 @@
|
||||||
<AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions>
|
<AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
||||||
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -666,7 +666,7 @@ namespace winrt::TerminalApp::implementation
|
||||||
_tabView.TabItems().RemoveAt(tabIndex);
|
_tabView.TabItems().RemoveAt(tabIndex);
|
||||||
|
|
||||||
auto focusedTabIndex = _GetFocusedTabIndex();
|
auto focusedTabIndex = _GetFocusedTabIndex();
|
||||||
if (tabIndex == focusedTabIndex)
|
if (gsl::narrow_cast<int>(tabIndex) == focusedTabIndex)
|
||||||
{
|
{
|
||||||
auto const tabCount = gsl::narrow_cast<decltype(focusedTabIndex)>(_tabs.size());
|
auto const tabCount = gsl::narrow_cast<decltype(focusedTabIndex)>(_tabs.size());
|
||||||
if (focusedTabIndex >= tabCount)
|
if (focusedTabIndex >= tabCount)
|
||||||
|
|
@ -1175,7 +1175,7 @@ namespace winrt::TerminalApp::implementation
|
||||||
// Arguments:
|
// Arguments:
|
||||||
// - sender: the control that originated this event
|
// - sender: the control that originated this event
|
||||||
// - eventArgs: the event's constituent arguments
|
// - eventArgs: the event's constituent arguments
|
||||||
void TerminalPage::_OnTabItemsChanged(const IInspectable& sender, const Windows::Foundation::Collections::IVectorChangedEventArgs& eventArgs)
|
void TerminalPage::_OnTabItemsChanged(const IInspectable& /*sender*/, const Windows::Foundation::Collections::IVectorChangedEventArgs& /*eventArgs*/)
|
||||||
{
|
{
|
||||||
_UpdateTabView();
|
_UpdateTabView();
|
||||||
}
|
}
|
||||||
|
|
@ -1200,7 +1200,7 @@ namespace winrt::TerminalApp::implementation
|
||||||
// Arguments:
|
// Arguments:
|
||||||
// - sender: the control that originated this event
|
// - sender: the control that originated this event
|
||||||
// - eventArgs: the event's constituent arguments
|
// - eventArgs: the event's constituent arguments
|
||||||
void TerminalPage::_OnTabSelectionChanged(const IInspectable& sender, const WUX::Controls::SelectionChangedEventArgs& eventArgs)
|
void TerminalPage::_OnTabSelectionChanged(const IInspectable& sender, const WUX::Controls::SelectionChangedEventArgs& /*eventArgs*/)
|
||||||
{
|
{
|
||||||
auto tabView = sender.as<MUX::Controls::TabView>();
|
auto tabView = sender.as<MUX::Controls::TabView>();
|
||||||
auto selectedIndex = tabView.SelectedIndex();
|
auto selectedIndex = tabView.SelectedIndex();
|
||||||
|
|
@ -1252,7 +1252,7 @@ namespace winrt::TerminalApp::implementation
|
||||||
// Arguments:
|
// Arguments:
|
||||||
// - sender: the control that originated this event
|
// - sender: the control that originated this event
|
||||||
// - eventArgs: the event's constituent arguments
|
// - eventArgs: the event's constituent arguments
|
||||||
void TerminalPage::_OnTabCloseRequested(const IInspectable& sender, const MUX::Controls::TabViewTabCloseRequestedEventArgs& eventArgs)
|
void TerminalPage::_OnTabCloseRequested(const IInspectable& /*sender*/, const MUX::Controls::TabViewTabCloseRequestedEventArgs& eventArgs)
|
||||||
{
|
{
|
||||||
const auto tabViewItem = eventArgs.Tab();
|
const auto tabViewItem = eventArgs.Tab();
|
||||||
_RemoveTabViewItem(tabViewItem);
|
_RemoveTabViewItem(tabViewItem);
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ namespace winrt::TerminalApp::implementation
|
||||||
ContentRoot().Content(content);
|
ContentRoot().Content(content);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TitlebarControl::Root_SizeChanged(const IInspectable& sender,
|
void TitlebarControl::Root_SizeChanged(const IInspectable& /*sender*/,
|
||||||
const Windows::UI::Xaml::SizeChangedEventArgs& e)
|
const Windows::UI::Xaml::SizeChangedEventArgs& /*e*/)
|
||||||
{
|
{
|
||||||
const auto windowWidth = ActualWidth();
|
const auto windowWidth = ActualWidth();
|
||||||
const auto minMaxCloseWidth = MinMaxCloseControl().ActualWidth();
|
const auto minMaxCloseWidth = MinMaxCloseControl().ActualWidth();
|
||||||
|
|
@ -66,17 +66,17 @@ namespace winrt::TerminalApp::implementation
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TitlebarControl::Maximize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
|
void TitlebarControl::Maximize_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::RoutedEventArgs const& /*e*/)
|
||||||
{
|
{
|
||||||
_OnMaximizeOrRestore(HTMAXBUTTON);
|
_OnMaximizeOrRestore(HTMAXBUTTON);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TitlebarControl::DragBar_DoubleTapped(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& e)
|
void TitlebarControl::DragBar_DoubleTapped(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& /*e*/)
|
||||||
{
|
{
|
||||||
_OnMaximizeOrRestore(HTCAPTION);
|
_OnMaximizeOrRestore(HTCAPTION);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TitlebarControl::Minimize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
|
void TitlebarControl::Minimize_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::RoutedEventArgs const& /*e*/)
|
||||||
{
|
{
|
||||||
if (_window)
|
if (_window)
|
||||||
{
|
{
|
||||||
|
|
@ -84,7 +84,7 @@ namespace winrt::TerminalApp::implementation
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TitlebarControl::Close_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
|
void TitlebarControl::Close_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::RoutedEventArgs const& /*e*/)
|
||||||
{
|
{
|
||||||
::PostMessage(_window, WM_SYSCOMMAND, SC_CLOSE, 0);
|
::PostMessage(_window, WM_SYSCOMMAND, SC_CLOSE, 0);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,23 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
<Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<ProjectGuid>{CA5CAD1A-9A12-429C-B551-8562EC954746}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
<!-- ========================= CppWinRT Metadata ======================== -->
|
<RootNamespace>TerminalApp</RootNamespace>
|
||||||
<PropertyGroup>
|
<ProjectName>TerminalAppLib</ProjectName>
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
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>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
This is an override that, puzzlingly, _forces XBF (XAML binary) embedding_.
|
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.
|
We have to do this to overcome a layout issue in the WAP packaging project.
|
||||||
|
|
@ -15,6 +25,8 @@
|
||||||
-->
|
-->
|
||||||
<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
|
<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||||
|
|
||||||
<!-- ========================= XAML files ======================== -->
|
<!-- ========================= XAML files ======================== -->
|
||||||
|
|
@ -249,25 +261,7 @@
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- ========================= Globals ======================== -->
|
<!-- ========================= Globals ======================== -->
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{CA5CAD1A-9A12-429C-B551-8562EC954746}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>TerminalApp</RootNamespace>
|
|
||||||
<ProjectName>TerminalAppLib</ProjectName>
|
|
||||||
<TargetName>TerminalAppLib</TargetName>
|
|
||||||
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
|
|
||||||
<!-- Manually include MUX here, instead of importing its targets file. We need
|
<!-- Manually include MUX here, instead of importing its targets file. We need
|
||||||
|
|
|
||||||
|
|
@ -11,23 +11,23 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
AzureConnection::AzureConnection(uint32_t rows, uint32_t columns)
|
AzureConnection::AzureConnection(uint32_t /*rows*/, uint32_t /*columns*/)
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
winrt::event_token AzureConnection::TerminalOutput(Microsoft::Terminal::TerminalConnection::TerminalOutputEventArgs const& handler)
|
winrt::event_token AzureConnection::TerminalOutput(Microsoft::Terminal::TerminalConnection::TerminalOutputEventArgs const& /*handler*/)
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
void AzureConnection::TerminalOutput(winrt::event_token const& token)
|
void AzureConnection::TerminalOutput(winrt::event_token const& /*token*/)
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
winrt::event_token AzureConnection::TerminalDisconnected(Microsoft::Terminal::TerminalConnection::TerminalDisconnectedEventArgs const& handler)
|
winrt::event_token AzureConnection::TerminalDisconnected(Microsoft::Terminal::TerminalConnection::TerminalDisconnectedEventArgs const& /*handler*/)
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
void AzureConnection::TerminalDisconnected(winrt::event_token const& token)
|
void AzureConnection::TerminalDisconnected(winrt::event_token const& /*token*/)
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
|
|
@ -35,11 +35,11 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
void AzureConnection::WriteInput(hstring const& data)
|
void AzureConnection::WriteInput(hstring const& /*data*/)
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
void AzureConnection::Resize(uint32_t rows, uint32_t columns)
|
void AzureConnection::Resize(uint32_t /*rows*/, uint32_t /*columns*/)
|
||||||
{
|
{
|
||||||
throw hresult_not_implemented();
|
throw hresult_not_implemented();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,24 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}</ProjectGuid>
|
<ProjectGuid>{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}</ProjectGuid>
|
||||||
<ProjectName>TerminalConnection</ProjectName>
|
<ProjectName>TerminalConnection</ProjectName>
|
||||||
<RootNamespace>Microsoft.Terminal.TerminalConnection</RootNamespace>
|
<RootNamespace>Microsoft.Terminal.TerminalConnection</RootNamespace>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
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>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Platform)' == 'x64'">
|
<PropertyGroup Condition="'$(Platform)' == 'x64'">
|
||||||
<VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows</VcpkgTriplet>
|
<VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows</VcpkgTriplet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
@ -21,6 +28,7 @@
|
||||||
<PropertyGroup Condition="'$(Platform)' == 'arm64'">
|
<PropertyGroup Condition="'$(Platform)' == 'arm64'">
|
||||||
<VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">arm64-windows</VcpkgTriplet>
|
<VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">arm64-windows</VcpkgTriplet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="AzureClientID.h" Condition="'$(Platform)'!='ARM64'" />
|
<ClInclude Include="AzureClientID.h" Condition="'$(Platform)'!='ARM64'" />
|
||||||
<ClInclude Include="AzureConnection.h" Condition="'$(Platform)'!='ARM64'" />
|
<ClInclude Include="AzureConnection.h" Condition="'$(Platform)'!='ARM64'" />
|
||||||
|
|
@ -58,11 +66,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<Link>
|
|
||||||
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<!-- ========================= Project References ======================== -->
|
<!-- ========================= Project References ======================== -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!--
|
<!--
|
||||||
|
|
@ -74,16 +78,9 @@
|
||||||
<Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
|
<Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</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>
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
|
|
||||||
<Import Project="..\..\..\packages\vcpkg-cpprestsdk.2.10.0\build\native\vcpkg-cpprestsdk.targets" Condition="Exists('..\..\..\packages\vcpkg-cpprestsdk.2.10.0\build\native\vcpkg-cpprestsdk.targets')" />
|
<Import Project="..\..\..\packages\vcpkg-cpprestsdk.2.10.0\build\native\vcpkg-cpprestsdk.targets" Condition="Exists('..\..\..\packages\vcpkg-cpprestsdk.2.10.0\build\native\vcpkg-cpprestsdk.targets')" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -630,8 +630,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto modifiers = _GetPressedModifierKeys();
|
const auto modifiers = _GetPressedModifierKeys();
|
||||||
const auto vkey = static_cast<WORD>(e.OriginalKey());
|
const auto vkey = gsl::narrow_cast<WORD>(e.OriginalKey());
|
||||||
const auto scanCode = e.KeyStatus().ScanCode;
|
const auto scanCode = gsl::narrow_cast<WORD>(e.KeyStatus().ScanCode);
|
||||||
bool handled = false;
|
bool handled = false;
|
||||||
|
|
||||||
// GH#2235: Terminal::Settings hasn't been modified to differentiate between AltGr and Ctrl+Alt yet.
|
// GH#2235: Terminal::Settings hasn't been modified to differentiate between AltGr and Ctrl+Alt yet.
|
||||||
|
|
@ -1020,7 +1020,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TermControl::_ScrollbarChangeHandler(Windows::Foundation::IInspectable const& sender,
|
void TermControl::_ScrollbarChangeHandler(Windows::Foundation::IInspectable const& /*sender*/,
|
||||||
Controls::Primitives::RangeBaseValueChangedEventArgs const& args)
|
Controls::Primitives::RangeBaseValueChangedEventArgs const& args)
|
||||||
{
|
{
|
||||||
const auto newValue = args.NewValue();
|
const auto newValue = args.NewValue();
|
||||||
|
|
@ -1276,11 +1276,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
|
||||||
{
|
{
|
||||||
auto terminalPosition = _GetTerminalPosition(cursorPosition);
|
auto terminalPosition = _GetTerminalPosition(cursorPosition);
|
||||||
|
|
||||||
const short lastVisibleRow = std::max(_terminal->GetViewport().Height() - 1, 0);
|
const short lastVisibleRow = std::max<short>(_terminal->GetViewport().Height() - 1, 0);
|
||||||
const short lastVisibleCol = std::max(_terminal->GetViewport().Width() - 1, 0);
|
const short lastVisibleCol = std::max<short>(_terminal->GetViewport().Width() - 1, 0);
|
||||||
|
|
||||||
terminalPosition.Y = std::clamp(terminalPosition.Y, short{ 0 }, lastVisibleRow);
|
terminalPosition.Y = std::clamp<short>(terminalPosition.Y, 0, lastVisibleRow);
|
||||||
terminalPosition.X = std::clamp(terminalPosition.X, short{ 0 }, lastVisibleCol);
|
terminalPosition.X = std::clamp<short>(terminalPosition.X, 0, lastVisibleCol);
|
||||||
|
|
||||||
// save location (for rendering) + render
|
// save location (for rendering) + render
|
||||||
_terminal->SetEndSelectionPosition(terminalPosition);
|
_terminal->SetEndSelectionPosition(terminalPosition);
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,27 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<PropertyGroup Label="Globals">
|
||||||
<PropertyGroup>
|
<ProjectGuid>{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}</ProjectGuid>
|
||||||
|
<ProjectName>TerminalControl</ProjectName>
|
||||||
|
<RootNamespace>Microsoft.Terminal.TerminalControl</RootNamespace>
|
||||||
<!-- cppwinrt.build.pre.props depends on these settings: -->
|
<!-- cppwinrt.build.pre.props depends on these settings: -->
|
||||||
<!-- build a dll, not exe (Application) -->
|
<!-- build a dll, not exe (Application) -->
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<!-- sets a bunch of Windows Universal properties -->
|
<!-- sets a bunch of Windows Universal properties -->
|
||||||
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
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>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}</ProjectGuid>
|
|
||||||
<ProjectName>TerminalControl</ProjectName>
|
|
||||||
<RootNamespace>Microsoft.Terminal.TerminalControl</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="pch.h" />
|
<ClInclude Include="pch.h" />
|
||||||
<ClInclude Include="TermControlUiaProvider.hpp" />
|
<ClInclude Include="TermControlUiaProvider.hpp" />
|
||||||
|
|
@ -69,6 +76,9 @@
|
||||||
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
|
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
|
@ -77,14 +87,4 @@
|
||||||
<AdditionalIncludeDirectories>$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<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>
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@ std::deque<UiaTextRange*> UiaTextRange::GetSelectionRanges(_In_ IUiaData* pData,
|
||||||
{
|
{
|
||||||
UiaTextRangeBase* temp = ranges[0];
|
UiaTextRangeBase* temp = ranges[0];
|
||||||
ranges.pop_front();
|
ranges.pop_front();
|
||||||
|
temp->Release();
|
||||||
}
|
}
|
||||||
THROW_HR(E_INVALIDARG);
|
THROW_HR(E_INVALIDARG);
|
||||||
}
|
}
|
||||||
|
|
@ -173,10 +174,10 @@ IFACEMETHODIMP UiaTextRange::Clone(_Outptr_result_maybenull_ ITextRangeProvider*
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
IFACEMETHODIMP UiaTextRange::FindText(_In_ BSTR text,
|
IFACEMETHODIMP UiaTextRange::FindText(_In_ BSTR /*text*/,
|
||||||
_In_ BOOL searchBackward,
|
_In_ BOOL /*searchBackward*/,
|
||||||
_In_ BOOL ignoreCase,
|
_In_ BOOL /*ignoreCase*/,
|
||||||
_Outptr_result_maybenull_ ITextRangeProvider** ppRetVal)
|
_Outptr_result_maybenull_ ITextRangeProvider** /*ppRetVal*/)
|
||||||
{
|
{
|
||||||
// TODO GitHub #605: Search functionality
|
// TODO GitHub #605: Search functionality
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
|
|
|
||||||
|
|
@ -60,18 +60,18 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
|
||||||
THROW_IF_FAILED(_uiaProvider->ExpandToEnclosingUnit(static_cast<UIA::TextUnit>(unit)));
|
THROW_IF_FAILED(_uiaProvider->ExpandToEnclosingUnit(static_cast<UIA::TextUnit>(unit)));
|
||||||
}
|
}
|
||||||
|
|
||||||
XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindAttribute(int32_t textAttributeId,
|
XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindAttribute(int32_t /*textAttributeId*/,
|
||||||
winrt::Windows::Foundation::IInspectable val,
|
winrt::Windows::Foundation::IInspectable /*val*/,
|
||||||
bool searchBackward)
|
bool /*searchBackward*/)
|
||||||
{
|
{
|
||||||
// TODO GitHub #2161: potential accessibility improvement
|
// TODO GitHub #2161: potential accessibility improvement
|
||||||
// we don't support this currently
|
// we don't support this currently
|
||||||
throw winrt::hresult_not_implemented();
|
throw winrt::hresult_not_implemented();
|
||||||
}
|
}
|
||||||
|
|
||||||
XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindText(winrt::hstring text,
|
XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindText(winrt::hstring /*text*/,
|
||||||
bool searchBackward,
|
bool /*searchBackward*/,
|
||||||
bool ignoreCase)
|
bool /*ignoreCase*/)
|
||||||
{
|
{
|
||||||
// TODO GitHub #605: Search functionality
|
// TODO GitHub #605: Search functionality
|
||||||
// we need to wrap this around the UiaTextRange FindText() function
|
// we need to wrap this around the UiaTextRange FindText() function
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,21 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
|
||||||
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
|
||||||
|
|
||||||
<!-- DONT ADD NEW FILES HERE, ADD THEM TO terminalcore-common.vcxproj -->
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cascadia\TerminalCore\terminalcore-common.vcxproj" />
|
|
||||||
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{CA5CAD1A-ABCD-429C-B551-8562EC954746}</ProjectGuid>
|
<ProjectGuid>{CA5CAD1A-ABCD-429C-B551-8562EC954746}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<ProjectName>TerminalCore</ProjectName>
|
<ProjectName>TerminalCore</ProjectName>
|
||||||
<TargetName>TerminalCore</TargetName>
|
<TargetName>TerminalCore</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
||||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
|
||||||
<RootNamespace>Microsoft.Terminal.Core</RootNamespace>
|
<RootNamespace>Microsoft.Terminal.Core</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
|
|
||||||
|
<!-- DONT ADD NEW FILES HERE, ADD THEM TO terminalcore-common.vcxitems -->
|
||||||
|
<Import Project="$(OpenConsoleDir)src\cascadia\TerminalCore\terminalcore-common.vcxitems" />
|
||||||
|
|
||||||
<!-- ============================ References ============================ -->
|
<!-- ============================ References ============================ -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj">
|
<ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj">
|
||||||
|
|
@ -51,6 +51,5 @@
|
||||||
|
|
||||||
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,26 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<PropertyGroup Label="Globals">
|
||||||
<PropertyGroup>
|
<ProjectGuid>{CA5CAD1A-d7ec-4107-b7c6-79cb77ae2907}</ProjectGuid>
|
||||||
|
<ProjectName>TerminalSettings</ProjectName>
|
||||||
|
<RootNamespace>Microsoft.Terminal.Settings</RootNamespace>
|
||||||
<!-- cppwinrt.build.pre.props depends on these settings: -->
|
<!-- cppwinrt.build.pre.props depends on these settings: -->
|
||||||
<!-- build a dll, not exe (Application) -->
|
<!-- build a dll, not exe (Application) -->
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<!-- sets a bunch of Windows Universal properties -->
|
<!-- sets a bunch of Windows Universal properties -->
|
||||||
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
||||||
|
<!--
|
||||||
|
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>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{CA5CAD1A-d7ec-4107-b7c6-79cb77ae2907}</ProjectGuid>
|
|
||||||
<ProjectName>TerminalSettings</ProjectName>
|
|
||||||
<RootNamespace>Microsoft.Terminal.Settings</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="pch.h" />
|
<ClInclude Include="pch.h" />
|
||||||
<ClInclude Include="KeyChord.h">
|
<ClInclude Include="KeyChord.h">
|
||||||
|
|
@ -48,14 +54,5 @@
|
||||||
<None Include="TerminalSettings.def" />
|
<None Include="TerminalSettings.def" />
|
||||||
</ItemGroup>
|
</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>
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>TerminalCoreUnitTests</RootNamespace>
|
||||||
|
<ProjectName>UnitTests_TerminalCore</ProjectName>
|
||||||
|
<TargetName>Terminal.Core.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(SolutionDir)\src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)\src\common.build.pre.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="ScreenSizeLimitsTest.cpp" />
|
<ClCompile Include="ScreenSizeLimitsTest.cpp" />
|
||||||
<ClCompile Include="SelectionTest.cpp" />
|
<ClCompile Include="SelectionTest.cpp" />
|
||||||
|
|
@ -34,13 +44,6 @@
|
||||||
<ClInclude Include="MockTermSettings.h" />
|
<ClInclude Include="MockTermSettings.h" />
|
||||||
<ClInclude Include="precomp.h" />
|
<ClInclude Include="precomp.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>TerminalCoreUnitTests</RootNamespace>
|
|
||||||
<ProjectName>UnitTests_TerminalCore</ProjectName>
|
|
||||||
<TargetName>Terminal.Core.Unit.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalSettings\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalSettings\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
|
@ -51,7 +54,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,23 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<ProjectGuid>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
<!-- ========================= CppWinRT Metadata ======================== -->
|
<RootNamespace>WinRTUtils</RootNamespace>
|
||||||
<PropertyGroup>
|
<ProjectName>WinRTUtils</ProjectName>
|
||||||
|
<TargetName>WinRTUtils</TargetName>
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
||||||
|
<!--
|
||||||
|
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>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||||
|
|
||||||
<!-- ========================= Headers ======================== -->
|
<!-- ========================= Headers ======================== -->
|
||||||
|
|
@ -50,22 +59,6 @@
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- ========================= Globals ======================== -->
|
<!-- ========================= Globals ======================== -->
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>WinRTUtils</RootNamespace>
|
|
||||||
<ProjectName>WinRTUtils</ProjectName>
|
|
||||||
<TargetName>WinRTUtils</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<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>
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,32 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
|
||||||
|
|
||||||
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
|
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
|
|
||||||
<ApplicationType>Windows Store</ApplicationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<VCProjectVersion>15.0</VCProjectVersion>
|
|
||||||
<ProjectGuid>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</ProjectGuid>
|
<ProjectGuid>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>WindowsTerminal</RootNamespace>
|
<RootNamespace>WindowsTerminal</RootNamespace>
|
||||||
<ProjectName>WindowsTerminal</ProjectName>
|
<ProjectName>WindowsTerminal</ProjectName>
|
||||||
<TargetName>WindowsTerminal</TargetName>
|
<TargetName>WindowsTerminal</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
|
||||||
|
<ApplicationType>Windows Store</ApplicationType>
|
||||||
<!-- IMPORTANT! Xaml Islands only works on >= 17709 -->
|
<!-- IMPORTANT! Xaml Islands only works on >= 17709 -->
|
||||||
<!-- IMPORTANT! cppwinrt.pre.props specifies 17134 -->
|
<!-- IMPORTANT! cppwinrt.pre.props specifies 17134 -->
|
||||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||||
|
<!-- DON'T REDIRECT OUR OUTPUT -->
|
||||||
|
<NoOutputRedirection>true</NoOutputRedirection>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
|
||||||
|
|
@ -76,14 +76,14 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<!-- Dependencies -->
|
<!-- Dependencies -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Even though we do have proper recursive dependencies, we want to keep some of these here
|
<!-- Even though we do have proper recursive dependencies, we want to keep some of these here
|
||||||
so that the AppX Manifest contains their activatable classes. -->
|
so that the AppX Manifest contains their activatable classes. -->
|
||||||
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj" />
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj" />
|
||||||
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
|
||||||
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
|
||||||
|
|
||||||
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj" />
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj" />
|
||||||
|
|
||||||
<ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
|
<ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
@ -98,12 +98,12 @@
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<!-- DON'T REDIRECT OUR OUTPUT -->
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
<NoOutputRedirection>true</NoOutputRedirection>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.2.191021001-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.191021001-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
|
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.2.191021001-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.191021001-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
|
||||||
|
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
|
||||||
|
<Import Project="..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets" Condition="Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets')" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
<PropertyGroup>
|
<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>
|
<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>
|
||||||
|
|
@ -114,12 +114,6 @@
|
||||||
<Error Condition="!Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets'))" />
|
<Error Condition="!Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets'))" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
|
||||||
|
|
||||||
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview7\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
|
|
||||||
<Import Project="..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets" Condition="Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.1-rc\build\native\Microsoft.VCRTForwarders.140.targets')" />
|
|
||||||
|
|
||||||
<!-- Override GetPackagingOutputs to roll up all our dependencies.
|
<!-- Override GetPackagingOutputs to roll up all our dependencies.
|
||||||
This ensures that when the WAP packaging project asks what files go into
|
This ensures that when the WAP packaging project asks what files go into
|
||||||
the package, we tell it.
|
the package, we tell it.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,29 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>TerminalAppUnitTests</RootNamespace>
|
||||||
|
<ProjectName>UnitTests_TerminalApp</ProjectName>
|
||||||
|
<TargetName>Terminal.App.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||||
|
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||||
|
<!-- We'll manage our own OutDir/IntDir -->
|
||||||
|
<NoOutputRedirection>true</NoOutputRedirection>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<!-- Manually change our outdir to be in a subdirectory. We don't really want
|
||||||
|
to put our output in the bin root, because if we do, we'll copy
|
||||||
|
TerminalApp.winmd to the bin root, and then every subsequent mdmerge step
|
||||||
|
(in _any_ cppwinrt project) will automatically try to pick up
|
||||||
|
TerminalApp.winmd as a dependency (which is just wrong). This MUST be done
|
||||||
|
before importing common.build.pre.props -->
|
||||||
|
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)\src\common.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)\src\common.build.pre.props" />
|
||||||
|
|
||||||
|
|
@ -29,15 +53,6 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- ========================= Globals ======================== -->
|
<!-- ========================= Globals ======================== -->
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>TerminalAppUnitTests</RootNamespace>
|
|
||||||
<ProjectName>UnitTests_TerminalApp</ProjectName>
|
|
||||||
<TargetName>Terminal.App.Unit.Tests</TargetName>
|
|
||||||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
|
||||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- ====================== Compiler & Linker Flags ===================== -->
|
<!-- ====================== Compiler & Linker Flags ===================== -->
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
|
|
@ -62,21 +77,9 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\common.build.post.props" />
|
||||||
<Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
|
<Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<!-- Manually change our outdir to be in a subdirectory. We don't really want
|
|
||||||
to put our output in the bin root, because if we do, we'll copy
|
|
||||||
TerminalApp.winmd to the bin root, and then every subsequent mdmerge step
|
|
||||||
(in _any_ cppwinrt project) will automatically try to pick up
|
|
||||||
TerminalApp.winmd as a dependency (which is just wrong). This MUST be done
|
|
||||||
after importing common.build.post.props-->
|
|
||||||
<OutDir>$(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
|
|
||||||
<IntDir>$(OpenConsoleDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_CppWinrtBinRoot>"$(OpenConsoleDir)$(Platform)\$(Configuration)\"</_CppWinrtBinRoot>
|
<_CppWinrtBinRoot>"$(OpenConsoleDir)$(Platform)\$(Configuration)\"</_CppWinrtBinRoot>
|
||||||
<!-- From Microsoft.UI.Xaml.targets -->
|
<!-- From Microsoft.UI.Xaml.targets -->
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="common.build.exe.or.dll.props"/>
|
|
||||||
<PropertyGroup>
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<PreprocessorDefinitions>_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<ProgramDatabaseFile>$(OutDir)$(TargetName)FullPDB.pdb</ProgramDatabaseFile>
|
|
||||||
<AdditionalDependencies>onecore_apiset.lib;dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;uxtheme.lib;dwmapi.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<!--
|
|
||||||
There's a property that dictates which libraries are linked by default: MinimalCoreWin.
|
|
||||||
When it's enabled, only a sparing few libraries are injected into Link.AdditionalDependencies.
|
|
||||||
|
|
||||||
ARM/ARM64 set it to true, whereas x86/64 do not.
|
|
||||||
Because the rules check whether MinimalCoreWin is "true" or explicitly blank,
|
|
||||||
*AND* it being blank is used to determine whether to override it to _be_ "true", we can't actually
|
|
||||||
set it to something that'll disable it.
|
|
||||||
(cf. $(VCTargetsPath)/Microsoft.Cpp.CoreWin.props)
|
|
||||||
|
|
||||||
Re-inject some necessary libs when MinimalCoreWin has been enabled.
|
|
||||||
-->
|
|
||||||
<AdditionalDependencies Condition="'$(MinimalCoreWin)'=='true'">gdi32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="common.build.exe.or.dll.props"/>
|
|
||||||
<PropertyGroup>
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,35 +1,57 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<!-- By default, binplace our output under the bin/ directory in the root of
|
|
||||||
the project. The other non-cppwinrt projects are binplaced there as well.
|
|
||||||
However, Cascadia projects want to be built into an appx, and the wapproj
|
|
||||||
that consumes them will complain if you do this. So they'll set
|
|
||||||
NoOutputRedirection before including this props file.
|
|
||||||
-->
|
|
||||||
<PropertyGroup Condition="'$(NoOutputRedirection)'!='true'">
|
|
||||||
<OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
|
<Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
<!-- Definition the program database type has to come after Microsoft.Cpp.props or it will be
|
|
||||||
rewritten to /ZI (edit-and-continue) type every time. -->
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
|
<!-- Definition the program database type has to come after Microsoft.Cpp.props or it will be
|
||||||
|
rewritten to /ZI (edit-and-continue) type every time. -->
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<!--
|
||||||
|
There's a property that dictates which libraries are linked by default: MinimalCoreWin.
|
||||||
|
When it's enabled, only a sparing few libraries are injected into Link.AdditionalDependencies.
|
||||||
|
|
||||||
|
ARM/ARM64 set it to true, whereas x86/64 do not.
|
||||||
|
Because the rules check whether MinimalCoreWin is "true" or explicitly blank,
|
||||||
|
*AND* it being blank is used to determine whether to override it to _be_ "true", we can't actually
|
||||||
|
set it to something that'll disable it.
|
||||||
|
(cf. $(VCTargetsPath)/Microsoft.Cpp.CoreWin.props)
|
||||||
|
|
||||||
|
Re-inject some necessary libs when MinimalCoreWin has been enabled.
|
||||||
|
-->
|
||||||
|
<AdditionalDependencies Condition="'$(MinimalCoreWin)'=='true'">gdi32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<AdditionalDependencies>onecore_apiset.lib;dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;uxtheme.lib;dwmapi.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<!-- DLLs Only -->
|
||||||
</ImportGroup>
|
<ItemDefinitionGroup Condition="'$(ConfigurationType)' == 'DynamicLibrary'">
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
|
<!-- Static Libs Only -->
|
||||||
|
<ItemDefinitionGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
|
||||||
<!-- Exclude our dependencies from static analysis. CAExcludePath can only be
|
<!-- Exclude our dependencies from static analysis. CAExcludePath can only be
|
||||||
set after we've imported Microsoft.Cpp.targets -->
|
set after we've imported Microsoft.Cpp.targets -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CAExcludePath>$(SolutionDir)\dep\;$(CAExcludePath)</CAExcludePath>
|
<CAExcludePath>$(SolutionDir)\dep\;$(CAExcludePath)</CAExcludePath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Target Name="_ComputePrecompToCleanUp">
|
<Target Name="_ComputePrecompToCleanUp">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PCHFileToClean Include="$(IntDir)\**\*.pch" />
|
<PCHFileToClean Include="$(IntDir)\**\*.pch" />
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,19 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<!-- By default, binplace our output under the bin/ directory in the root of
|
||||||
|
the project. The other non-cppwinrt projects are binplaced there as well.
|
||||||
|
However, Cascadia projects want to be built into an appx, and the wapproj
|
||||||
|
that consumes them will complain if you do this. So they'll set
|
||||||
|
NoOutputRedirection before including this props file.
|
||||||
|
-->
|
||||||
|
<PropertyGroup Condition="'$(NoOutputRedirection)'!='true'">
|
||||||
|
<OutputPath>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||||
|
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<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>
|
||||||
|
|
@ -39,22 +52,18 @@
|
||||||
<Platform>ARM64</Platform>
|
<Platform>ARM64</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.18362.0</WindowsTargetPlatformVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- For ALL build types-->
|
||||||
<PropertyGroup Label="Configuration">
|
<PropertyGroup Label="Configuration">
|
||||||
<PlatformToolset>v142</PlatformToolset>
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='AuditMode'" Label="Configuration">
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- For ALL build types-->
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
|
|
@ -63,8 +72,8 @@
|
||||||
<!--<WarningLevel>EnableAllWarnings</WarningLevel>-->
|
<!--<WarningLevel>EnableAllWarnings</WarningLevel>-->
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
<!-- disable warning on nameless structs (4201) -->
|
<!-- disable warning on nameless structs (4201) -->
|
||||||
<DisableSpecificWarnings>4201;4312;4467</DisableSpecificWarnings>
|
<DisableSpecificWarnings>4201;4312;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
<PreprocessorDefinitions>EXTERNAL_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_WINDOWS;EXTERNAL_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
|
|
@ -76,14 +85,21 @@
|
||||||
<AdditionalOptions>/std:c++17 /utf-8 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/std:c++17 /utf-8 %(AdditionalOptions)</AdditionalOptions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<PreprocessorDefinitions>EXTERNAL_BUILD;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>EXTERNAL_BUILD;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
|
<ProgramDatabaseFile>$(OutDir)$(TargetName)FullPDB.pdb</ProgramDatabaseFile>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<SetChecksum>true</SetChecksum>
|
<SetChecksum>true</SetChecksum>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- For Debug ONLY -->
|
<!-- For Debug ONLY -->
|
||||||
|
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
|
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
|
|
@ -93,7 +109,13 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- For Release ONLY -->
|
<!-- For Release ONLY -->
|
||||||
|
<PropertyGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='AuditMode'" Label="Configuration">
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='AuditMode'">
|
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='AuditMode'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
|
@ -107,12 +129,14 @@
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- For Win32 (x86) ONLY ... we use all defaults for AMD64. No def for those. -->
|
<!-- For Win32 (x86) ONLY ... we use all defaults for AMD64. No def for those. -->
|
||||||
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
|
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- For our Audit mode -->
|
<!-- For our Audit mode -->
|
||||||
<PropertyGroup Condition="'$(Configuration)'=='AuditMode'">
|
<PropertyGroup Condition="'$(Configuration)'=='AuditMode'">
|
||||||
<CodeAnalysisRuleSet>$(SolutionDir)\src\StaticAnalysis.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>$(SolutionDir)\src\StaticAnalysis.ruleset</CodeAnalysisRuleSet>
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildThisFileDirectory)common.build.post.props" />
|
||||||
<!-- By default, binplace our output under the bin/ directory in the root of
|
|
||||||
the project. The other non-cppwinrt projects are binplaced there as well.
|
|
||||||
However, Cascadia projects want to be built into an appx, and the wapproj
|
|
||||||
that consumes them will complain if you do this. So they'll set
|
|
||||||
NoOutputRedirection before including this props file.
|
|
||||||
-->
|
|
||||||
<PropertyGroup Condition="'$(NoOutputRedirection)'!='true'">
|
|
||||||
<OutputPath>$(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutputPath>
|
|
||||||
<OutDir>$(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
|
|
||||||
<IntDir>$(OpenConsoleDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- For Cascadia projects, we want to copy the output dll up a directory
|
<!-- For Cascadia projects, we want to copy the output dll up a directory
|
||||||
from where it was binplaced.
|
from where it was binplaced.
|
||||||
|
|
@ -27,19 +16,18 @@
|
||||||
<Command>
|
<Command>
|
||||||
echo OutDir=$(OutDir)
|
echo OutDir=$(OutDir)
|
||||||
(xcopy /Y "$(OutDir)$(ProjectName).dll" "$(OpenConsoleDir)$(Platform)\$(Configuration)\$(ProjectName).dll*" )
|
(xcopy /Y "$(OutDir)$(ProjectName).dll" "$(OpenConsoleDir)$(Platform)\$(Configuration)\$(ProjectName).dll*" )
|
||||||
(xcopy /Y "$(OutDir)$(ProjectName).pdb" "$(OpenConsoleDir)$(Platform)\$(Configuration)\$(ProjectName).pdb*" )
|
(xcopy /Y "$(OutDir)$(ProjectName)FullPDB.pdb" "$(OpenConsoleDir)$(Platform)\$(Configuration)\$(ProjectName)FullPDB.pdb*" )
|
||||||
</Command>
|
</Command>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
<PostBuildEvent Condition="'$(Platform)'=='Win32'">
|
<PostBuildEvent Condition="'$(Platform)'=='Win32'">
|
||||||
<Command>
|
<Command>
|
||||||
echo OutDir=$(OutDir)
|
echo OutDir=$(OutDir)
|
||||||
(xcopy /Y "$(OutDir)$(ProjectName).dll" "$(OpenConsoleDir)$(Configuration)\$(ProjectName).dll*" )
|
(xcopy /Y "$(OutDir)$(ProjectName).dll" "$(OpenConsoleDir)$(Configuration)\$(ProjectName).dll*" )
|
||||||
(xcopy /Y "$(OutDir)$(ProjectName).pdb" "$(OpenConsoleDir)$(Configuration)\$(ProjectName).pdb*" )
|
(xcopy /Y "$(OutDir)$(ProjectName)FullPDB.pdb" "$(OpenConsoleDir)$(Configuration)\$(ProjectName)FullPDB.pdb*" )
|
||||||
</Command>
|
</Command>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
For whatever reason, GENERATEPROJECTPRIFILE is incapable of creating this
|
For whatever reason, GENERATEPROJECTPRIFILE is incapable of creating this
|
||||||
directory on its own, it just assumes it exists.
|
directory on its own, it just assumes it exists.
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,9 @@
|
||||||
<Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" />
|
<Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" />
|
||||||
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<!-- 17134 is RS4 -->
|
<!-- 17134 is RS4, 17763 is RS5, 18362 is 19H1 -->
|
||||||
<!-- 17763 is RS5 -->
|
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.18362.0</WindowsTargetPlatformVersion>
|
||||||
<!-- 18362 is 19H1 -->
|
<WindowsTargetPlatformMinVersion Condition="'$(WindowsTargetPlatformMinVersion)' == ''">10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||||
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
|
|
||||||
<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>
|
||||||
|
|
@ -43,90 +41,35 @@
|
||||||
<GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
|
<GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug|Win32">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|Win32">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug|x64">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|x64">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug|ARM64">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>ARM64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|ARM64">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>ARM64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Label="Configuration">
|
<PropertyGroup Label="Configuration">
|
||||||
<ConfigurationType Condition="'$(ConfigurationType)'==''">DynamicLibrary</ConfigurationType>
|
|
||||||
<PlatformToolset>v142</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<GenerateManifest>false</GenerateManifest>
|
<GenerateManifest>false</GenerateManifest>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
|
<Import Project="$(MSBuildThisFileDirectory)common.build.pre.props" />
|
||||||
|
|
||||||
|
<!-- Overrides for common build settings -->
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
|
<!-- C++/WinRT hardcodes pch.h -->
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<!-- All new code should be in non-permissive mode. Big objects for C++/WinRT. -->
|
||||||
<AdditionalOptions>%(AdditionalOptions) /permissive- /bigobj /Zc:twoPhase- /std:c++17</AdditionalOptions>
|
<AdditionalOptions>%(AdditionalOptions) /permissive- /bigobj /Zc:twoPhase-</AdditionalOptions>
|
||||||
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
|
<DisableSpecificWarnings>28204;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||||
<PreprocessorDefinitions Condition="'$(ConfigurationType)'=='DynamicLibrary'">_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem Condition="'$(SubSystem)'==''">Console</SubSystem>
|
<SubSystem Condition="'%(SubSystem)'==''">Console</SubSystem>
|
||||||
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
|
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
|
||||||
<ModuleDefinitionFile Condition="'$(ConfigurationType)'=='DynamicLibrary' And '$(NoDll)'!='true'">$(ProjectName).def</ModuleDefinitionFile>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
|
|
||||||
<ClCompile>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\src\cascadia\WinRTUtils\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\gsl\include;$(OpenConsoleDir)\dep\wil\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\cascadia\WinRTUtils\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
|
@ -134,6 +77,15 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
|
<!-- DLLs -->
|
||||||
|
<ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'">
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{E437B604-3E98-4F40-A927-E173E818EA4B}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>host</RootNamespace>
|
||||||
|
<ProjectName>Host.DLL</ProjectName>
|
||||||
|
<TargetName>ConhostV2</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\main.cpp" />
|
<ClCompile Include="..\main.cpp" />
|
||||||
|
|
@ -53,13 +61,6 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="Host.DLL.rc" />
|
<ResourceCompile Include="Host.DLL.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{E437B604-3E98-4F40-A927-E173E818EA4B}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>host</RootNamespace>
|
|
||||||
<ProjectName>Host.DLL</ProjectName>
|
|
||||||
<TargetName>ConhostV2</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<EmbedManifest>
|
<EmbedManifest>
|
||||||
</EmbedManifest>
|
</EmbedManifest>
|
||||||
|
|
@ -76,6 +77,5 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>HostEXE</RootNamespace>
|
||||||
|
<ProjectName>Host.EXE</ProjectName>
|
||||||
|
<TargetName>OpenConsole</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
|
|
@ -65,13 +73,6 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Manifest Include="openconsole.exe.manifest" />
|
<Manifest Include="openconsole.exe.manifest" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>HostEXE</RootNamespace>
|
|
||||||
<ProjectName>Host.EXE</ProjectName>
|
|
||||||
<TargetName>OpenConsole</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<EmbedManifest>
|
<EmbedManifest>
|
||||||
</EmbedManifest>
|
</EmbedManifest>
|
||||||
|
|
@ -86,6 +87,5 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{8CDB8850-7484-4EC7-B45B-181F85B2EE54}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>HostFeatureTests</RootNamespace>
|
||||||
|
<ProjectName>Host.Tests.Feature</ProjectName>
|
||||||
|
<TargetName>ConHost.Feature.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="API_AliasTests.cpp" />
|
<ClCompile Include="API_AliasTests.cpp" />
|
||||||
|
|
@ -44,20 +52,12 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="Host.Tests.Feature.rc" />
|
<ResourceCompile Include="Host.Tests.Feature.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{8CDB8850-7484-4EC7-B45B-181F85B2EE54}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>HostFeatureTests</RootNamespace>
|
|
||||||
<ProjectName>Host.Tests.Feature</ProjectName>
|
|
||||||
<TargetName>ConHost.Feature.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
|
||||||
<!-- DONT ADD NEW FILES HERE, ADD THEM TO host-common.vcxproj -->
|
|
||||||
<Import Project="$(SolutionDir)src\host\host-common.vcxproj" />
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{06EC74CB-9A12-429C-B551-8562EC954746}</ProjectGuid>
|
<ProjectGuid>{06EC74CB-9A12-429C-B551-8562EC954746}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>hostlib</RootNamespace>
|
<RootNamespace>hostlib</RootNamespace>
|
||||||
<ProjectName>Host</ProjectName>
|
<ProjectName>Host</ProjectName>
|
||||||
<TargetName>ConhostV2Lib</TargetName>
|
<TargetName>ConhostV2Lib</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
|
<!-- DONT ADD NEW FILES HERE, ADD THEM TO host-common.vcxitems -->
|
||||||
|
<Import Project="$(SolutionDir)src\host\host-common.vcxitems" />
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{531C23E7-4B76-4C08-8AAD-04164CB628C9}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>HostUnitTests</RootNamespace>
|
||||||
|
<ProjectName>Host.Tests.Unit</ProjectName>
|
||||||
|
<TargetName>Conhost.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="AliasTests.cpp" />
|
<ClCompile Include="AliasTests.cpp" />
|
||||||
|
|
@ -90,20 +98,12 @@
|
||||||
<ClInclude Include="PopupTestHelper.hpp" />
|
<ClInclude Include="PopupTestHelper.hpp" />
|
||||||
<ClInclude Include="UnicodeLiteral.hpp" />
|
<ClInclude Include="UnicodeLiteral.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{531C23E7-4B76-4C08-8AAD-04164CB628C9}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>HostUnitTests</RootNamespace>
|
|
||||||
<ProjectName>Host.Tests.Unit</ProjectName>
|
|
||||||
<TargetName>Conhost.Unit.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,22 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
|
||||||
<!-- DONT ADD NEW FILES HERE, ADD THEM TO host-common.vcxproj -->
|
|
||||||
<Import Project="$(SolutionDir)src\host\host-common.vcxproj" />
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<PreprocessorDefinitions>INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<PropertyGroup Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{06EC74CB-9A12-429C-B551-8562EC954747}</ProjectGuid>
|
<ProjectGuid>{06EC74CB-9A12-429C-B551-8562EC954747}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>hostlib.unittest</RootNamespace>
|
<RootNamespace>hostlib.unittest</RootNamespace>
|
||||||
<ProjectName>Host.unittest</ProjectName>
|
<ProjectName>Host.unittest</ProjectName>
|
||||||
<TargetName>ConhostV2Lib.unittest</TargetName>
|
<TargetName>ConhostV2Lib.unittest</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
|
<!-- DONT ADD NEW FILES HERE, ADD THEM TO host-common.vcxitems -->
|
||||||
|
<Import Project="$(SolutionDir)src\host\host-common.vcxitems" />
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{06EC74CB-9A12-429C-B551-8562EC964846}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>Base</RootNamespace>
|
||||||
|
<ProjectName>InteractivityBase</ProjectName>
|
||||||
|
<TargetName>ConInteractivityBaseLib</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<Link>
|
<Link>
|
||||||
|
|
@ -35,14 +43,6 @@
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
<ClInclude Include="..\..\inc\ServiceLocator.hpp" />
|
<ClInclude Include="..\..\inc\ServiceLocator.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{06EC74CB-9A12-429C-B551-8562EC964846}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>Base</RootNamespace>
|
|
||||||
<ProjectName>InteractivityBase</ProjectName>
|
|
||||||
<TargetName>ConInteractivityBaseLib</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{06EC74CB-9A12-428C-B551-8537EC964726}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>OneCore</RootNamespace>
|
||||||
|
<ProjectName>InteractivityOneCore</ProjectName>
|
||||||
|
<TargetName>ConInteractivityOneCoreLib</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
|
|
@ -30,14 +38,6 @@
|
||||||
<ClInclude Include="..\SystemConfigurationProvider.hpp" />
|
<ClInclude Include="..\SystemConfigurationProvider.hpp" />
|
||||||
<ClInclude Include="..\WindowMetrics.hpp" />
|
<ClInclude Include="..\WindowMetrics.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{06EC74CB-9A12-428C-B551-8537EC964726}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>OneCore</RootNamespace>
|
|
||||||
<ProjectName>InteractivityOneCore</ProjectName>
|
|
||||||
<TargetName>ConInteractivityOneCoreLib</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{06EC74CB-9A12-429C-B551-8532EC964726}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>win32</RootNamespace>
|
||||||
|
<ProjectName>InteractivityWin32</ProjectName>
|
||||||
|
<TargetName>ConInteractivityWin32Lib</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
|
|
@ -54,19 +62,11 @@
|
||||||
<ClInclude Include="..\windowtheme.hpp" />
|
<ClInclude Include="..\windowtheme.hpp" />
|
||||||
<ClInclude Include="..\windowUiaProvider.hpp" />
|
<ClInclude Include="..\windowUiaProvider.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{06EC74CB-9A12-429C-B551-8532EC964726}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>win32</RootNamespace>
|
|
||||||
<ProjectName>InteractivityWin32</ProjectName>
|
|
||||||
<TargetName>ConInteractivityWin32Lib</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{d3b92829-26cb-411a-bda2-7f5da3d25dd4}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>InteractivityWin32UnitTests</RootNamespace>
|
||||||
|
<ProjectName>Interactivity.Win32.Tests.Unit</ProjectName>
|
||||||
|
<TargetName>Conhost.Interactivity.Win32.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="UiaTextRangeTests.cpp" />
|
<ClCompile Include="UiaTextRangeTests.cpp" />
|
||||||
|
|
@ -57,20 +65,12 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{d3b92829-26cb-411a-bda2-7f5da3d25dd4}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>InteractivityWin32UnitTests</RootNamespace>
|
|
||||||
<ProjectName>Interactivity.Win32.Tests.Unit</ProjectName>
|
|
||||||
<TargetName>Conhost.Interactivity.Win32.Unit.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(Solutiondir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(Solutiondir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>internal</RootNamespace>
|
||||||
|
<ProjectName>Internal</ProjectName>
|
||||||
|
<TargetName>ConInt</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="stubs.cpp" />
|
<ClCompile Include="stubs.cpp" />
|
||||||
|
|
@ -11,14 +19,6 @@
|
||||||
<ClInclude Include="..\inc\conint.h" />
|
<ClInclude Include="..\inc\conint.h" />
|
||||||
<ClInclude Include="precomp.h" />
|
<ClInclude Include="precomp.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>internal</RootNamespace>
|
|
||||||
<ProjectName>Internal</ProjectName>
|
|
||||||
<TargetName>ConInt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{5D23E8E1-3C64-4CC1-A8F7-6861677F7239}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>propsheet</RootNamespace>
|
||||||
|
<ProjectName>Propsheet.DLL</ProjectName>
|
||||||
|
<TargetName>console</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="..\common.build.pre.props" />
|
<Import Project="..\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="console.cpp" />
|
<ClCompile Include="console.cpp" />
|
||||||
|
|
@ -49,16 +57,6 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="console.def" />
|
<None Include="console.def" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{5D23E8E1-3C64-4CC1-A8F7-6861677F7239}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>propsheet</RootNamespace>
|
|
||||||
<ProjectName>Propsheet.DLL</ProjectName>
|
|
||||||
<TargetName>console</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<EmbedManifest>
|
<EmbedManifest>
|
||||||
</EmbedManifest>
|
</EmbedManifest>
|
||||||
|
|
@ -81,6 +79,5 @@
|
||||||
<Exec Command="mc.exe /h $(IntermediateOutputPath) /r $(IntermediateOutputPath) @(MessageCompile)" />
|
<Exec Command="mc.exe /h $(IntermediateOutputPath) /r $(IntermediateOutputPath) @(MessageCompile)" />
|
||||||
</Target>
|
</Target>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\common.build.dll.props" />
|
|
||||||
<Import Project="..\common.build.post.props" />
|
<Import Project="..\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{345FD5A4-B32B-4F29-BD1C-B033BD2C35CC}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>propslib</RootNamespace>
|
||||||
|
<ProjectName>PropertiesLibrary</ProjectName>
|
||||||
|
<TargetName>ConProps</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="RegistrySerialization.cpp" />
|
<ClCompile Include="RegistrySerialization.cpp" />
|
||||||
|
|
@ -16,14 +24,6 @@
|
||||||
<ClInclude Include="TrueTypeFontList.hpp" />
|
<ClInclude Include="TrueTypeFontList.hpp" />
|
||||||
<ClInclude Include="precomp.h" />
|
<ClInclude Include="precomp.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{345FD5A4-B32B-4F29-BD1C-B033BD2C35CC}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>propslib</RootNamespace>
|
|
||||||
<ProjectName>PropertiesLibrary</ProjectName>
|
|
||||||
<TargetName>ConProps</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>base</RootNamespace>
|
||||||
|
<ProjectName>RendererBase</ProjectName>
|
||||||
|
<TargetName>ConRenderBase</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\Cluster.cpp" />
|
<ClCompile Include="..\Cluster.cpp" />
|
||||||
|
|
@ -28,14 +36,6 @@
|
||||||
<ClInclude Include="..\renderer.hpp" />
|
<ClInclude Include="..\renderer.hpp" />
|
||||||
<ClInclude Include="..\thread.hpp" />
|
<ClInclude Include="..\thread.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>base</RootNamespace>
|
|
||||||
<ProjectName>RendererBase</ProjectName>
|
|
||||||
<TargetName>ConRenderBase</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{48D21369-3D7B-4431-9967-24E81292CF62}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>dx</RootNamespace>
|
||||||
|
<ProjectName>RendererDx</ProjectName>
|
||||||
|
<TargetName>ConRenderDx</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\CustomTextLayout.cpp" />
|
<ClCompile Include="..\CustomTextLayout.cpp" />
|
||||||
|
|
@ -15,14 +23,6 @@
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
<ClInclude Include="..\DxRenderer.hpp" />
|
<ClInclude Include="..\DxRenderer.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{48D21369-3D7B-4431-9967-24E81292CF62}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>dx</RootNamespace>
|
|
||||||
<ProjectName>RendererDx</ProjectName>
|
|
||||||
<TargetName>ConRenderDx</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{1C959542-BAC2-4E55-9A6D-13251914CBB9}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>gdi</RootNamespace>
|
||||||
|
<ProjectName>RendererGdi</ProjectName>
|
||||||
|
<TargetName>ConRenderGdi</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\invalidate.cpp" />
|
<ClCompile Include="..\invalidate.cpp" />
|
||||||
|
|
@ -14,14 +22,6 @@
|
||||||
<ClInclude Include="..\gdirenderer.hpp" />
|
<ClInclude Include="..\gdirenderer.hpp" />
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{1C959542-BAC2-4E55-9A6D-13251914CBB9}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>gdi</RootNamespace>
|
|
||||||
<ProjectName>RendererGdi</ProjectName>
|
|
||||||
<TargetName>ConRenderGdi</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{48D21369-3D7B-4431-9967-24E81292CF63}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>uia</RootNamespace>
|
||||||
|
<ProjectName>RendererUia</ProjectName>
|
||||||
|
<TargetName>ConRenderUia</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\precomp.cpp">
|
<ClCompile Include="..\precomp.cpp">
|
||||||
|
|
@ -11,14 +19,6 @@
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
<ClInclude Include="..\UiaRenderer.hpp" />
|
<ClInclude Include="..\UiaRenderer.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{48D21369-3D7B-4431-9967-24E81292CF63}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>uia</RootNamespace>
|
|
||||||
<ProjectName>RendererUia</ProjectName>
|
|
||||||
<TargetName>ConRenderUia</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props"/>
|
|
||||||
<!-- DONT ADD NEW FILES HERE, ADD THEM TO vt-renderer-common.vcxproj -->
|
|
||||||
<Import Project="$(SolutionDir)src\renderer\vt\vt-renderer-common.vcxproj" />
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ProjectGuid>{990F2657-8580-4828-943F-5DD657D11842}</ProjectGuid>
|
<ProjectGuid>{990F2657-8580-4828-943F-5DD657D11842}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>vt</RootNamespace>
|
<RootNamespace>vt</RootNamespace>
|
||||||
<ProjectName>RendererVt</ProjectName>
|
<ProjectName>RendererVt</ProjectName>
|
||||||
<TargetName>ConRenderVt</TargetName>
|
<TargetName>ConRenderVt</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="$(SolutionDir)src\common.build.pre.props"/>
|
||||||
|
<!-- DONT ADD NEW FILES HERE, ADD THEM TO vt-renderer-common.vcxitems -->
|
||||||
|
<Import Project="$(SolutionDir)src\renderer\vt\vt-renderer-common.vcxitems" />
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props"/>
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props"/>
|
<Import Project="$(SolutionDir)src\common.build.post.props"/>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,22 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\renderer\vt\vt-renderer-common.vcxproj" />
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<PreprocessorDefinitions>INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<PropertyGroup Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- DONT ADD NEW FILES HERE, ADD THEM TO vt-renderer-common.vcxproj -->
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ProjectGuid>{990F2657-8580-4828-943F-5DD657D11843}</ProjectGuid>
|
<ProjectGuid>{990F2657-8580-4828-943F-5DD657D11843}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>vt.unittest</RootNamespace>
|
<RootNamespace>vt.unittest</RootNamespace>
|
||||||
<ProjectName>RendererVt.unittest</ProjectName>
|
<ProjectName>RendererVt.unittest</ProjectName>
|
||||||
<TargetName>ConRenderVt.unittest</TargetName>
|
<TargetName>ConRenderVt.unittest</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
|
<Import Project="$(SolutionDir)src\renderer\vt\vt-renderer-common.vcxitems" />
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<!-- DONT ADD NEW FILES HERE, ADD THEM TO vt-renderer-common.vcxitems -->
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<!-- <Import Project="$(SolutionDir)src\common.build.tests.props" /> -->
|
<!-- <Import Project="$(SolutionDir)src\common.build.tests.props" /> -->
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{18D09A24-8240-42D6-8CB6-236EEE820262}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>server</RootNamespace>
|
||||||
|
<ProjectName>Server</ProjectName>
|
||||||
|
<TargetName>ConServer</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\ApiDispatchers.cpp" />
|
<ClCompile Include="..\ApiDispatchers.cpp" />
|
||||||
|
|
@ -47,19 +55,6 @@
|
||||||
<ClInclude Include="..\WaitTerminationReason.h" />
|
<ClInclude Include="..\WaitTerminationReason.h" />
|
||||||
<ClInclude Include="..\WinNTControl.h" />
|
<ClInclude Include="..\WinNTControl.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{18D09A24-8240-42D6-8CB6-236EEE820262}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>server</RootNamespace>
|
|
||||||
<ProjectName>Server</ProjectName>
|
|
||||||
<TargetName>ConServer</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)\dep;$(SolutionDir)\dep\Console;$(SolutionDir)\dep\Win32K;$(SolutionDir)\dep\MinCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{DCF55140-EF6A-4736-A403-957E4F7430BB}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>adapter</RootNamespace>
|
||||||
|
<ProjectName>TerminalAdapter</ProjectName>
|
||||||
|
<TargetName>ConTermAdapt</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\adaptDispatch.cpp" />
|
<ClCompile Include="..\adaptDispatch.cpp" />
|
||||||
|
|
@ -38,14 +46,6 @@
|
||||||
<Project>{1CF55140-EF6A-4736-A403-957E4F7430BB}</Project>
|
<Project>{1CF55140-EF6A-4736-A403-957E4F7430BB}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{DCF55140-EF6A-4736-A403-957E4F7430BB}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>adapter</RootNamespace>
|
|
||||||
<ProjectName>TerminalAdapter</ProjectName>
|
|
||||||
<TargetName>ConTermAdapt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{6AF01638-84CF-4B65-9870-484DFFCAC772}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>AdapterUnitTests</RootNamespace>
|
||||||
|
<ProjectName>TerminalAdapter.UnitTests</ProjectName>
|
||||||
|
<TargetName>ConAdapter.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="adapterTest.cpp" />
|
<ClCompile Include="adapterTest.cpp" />
|
||||||
|
|
@ -47,20 +55,12 @@
|
||||||
<Project>{dcf55140-ef6a-4736-a403-957e4f7430bb}</Project>
|
<Project>{dcf55140-ef6a-4736-a403-957e4f7430bb}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{6AF01638-84CF-4B65-9870-484DFFCAC772}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>AdapterUnitTests</RootNamespace>
|
|
||||||
<ProjectName>TerminalAdapter.UnitTests</ProjectName>
|
|
||||||
<TargetName>ConAdapter.Unit.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{1CF55140-EF6A-4736-A403-957E4F7430BB}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>adapter</RootNamespace>
|
||||||
|
<ProjectName>TerminalInput</ProjectName>
|
||||||
|
<TargetName>TerminalInput</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\terminalInput.cpp" />
|
<ClCompile Include="..\terminalInput.cpp" />
|
||||||
|
|
@ -16,14 +24,6 @@
|
||||||
<Project>{18d09a24-8240-42d6-8cb6-236eee820263}</Project>
|
<Project>{18d09a24-8240-42d6-8cb6-236eee820263}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{1CF55140-EF6A-4736-A403-957E4F7430BB}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>adapter</RootNamespace>
|
|
||||||
<ProjectName>TerminalInput</ProjectName>
|
|
||||||
<TargetName>TerminalInput</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{96927B31-D6E8-4ABD-B03E-A5088A30BEBE}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>VTCommandFuzzer</RootNamespace>
|
||||||
|
<ProjectName>TerminalParser.Fuzzer</ProjectName>
|
||||||
|
<TargetName>VTCommandFuzzer</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="stdafx.cpp">
|
<ClCompile Include="stdafx.cpp">
|
||||||
|
|
@ -14,13 +22,6 @@
|
||||||
<ClInclude Include="stdafx.h" />
|
<ClInclude Include="stdafx.h" />
|
||||||
<ClInclude Include="string_helper.h" />
|
<ClInclude Include="string_helper.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{96927B31-D6E8-4ABD-B03E-A5088A30BEBE}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>VTCommandFuzzer</RootNamespace>
|
|
||||||
<ProjectName>TerminalParser.Fuzzer</ProjectName>
|
|
||||||
<TargetName>VTCommandFuzzer</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
|
||||||
|
|
@ -31,7 +32,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.exe.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{F210A4AE-E02A-4BFC-80BB-F50A672FE763}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>FuzzWrapper</RootNamespace>
|
||||||
|
<ProjectName>TerminalParser.FuzzWrapper</ProjectName>
|
||||||
|
<TargetName>ConTerm.Parser.FuzzWrapper</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="precomp.cpp">
|
<ClCompile Include="precomp.cpp">
|
||||||
|
|
@ -17,13 +25,6 @@
|
||||||
<Project>{3ae13314-1939-4dfa-9c14-38ca0834050c}</Project>
|
<Project>{3ae13314-1939-4dfa-9c14-38ca0834050c}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{F210A4AE-E02A-4BFC-80BB-F50A672FE763}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>FuzzWrapper</RootNamespace>
|
|
||||||
<ProjectName>TerminalParser.FuzzWrapper</ProjectName>
|
|
||||||
<TargetName>ConTerm.Parser.FuzzWrapper</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -33,7 +34,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.exe.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,22 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props"/>
|
|
||||||
<!-- ONLY ADD CLOSED-SOURCE FILES HERE, OPEN-SOURCE FILES GO IN parser-common.vcxproj -->
|
|
||||||
<Import Project="$(SolutionDir)src\terminal\parser\lib\parser-common.vcxproj" />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\InputStateMachineEngine.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\InputStateMachineEngine.hpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{3AE13314-1939-4DFA-9C14-38CA0834050C}</ProjectGuid>
|
<ProjectGuid>{3AE13314-1939-4DFA-9C14-38CA0834050C}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>parser</RootNamespace>
|
<RootNamespace>parser</RootNamespace>
|
||||||
<ProjectName>TerminalParser</ProjectName>
|
<ProjectName>TerminalParser</ProjectName>
|
||||||
<TargetName>ConTermParser</TargetName>
|
<TargetName>ConTermParser</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="$(SolutionDir)src\common.build.pre.props"/>
|
||||||
|
<!-- ONLY ADD CLOSED-SOURCE FILES HERE, OPEN-SOURCE FILES GO IN parser-common.vcxitems -->
|
||||||
|
<Import Project="$(SolutionDir)src\terminal\parser\parser-common.vcxitems" />
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\InputStateMachineEngine.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\InputStateMachineEngine.hpp" />
|
||||||
|
</ItemGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props"/>
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props"/>
|
<Import Project="$(SolutionDir)src\common.build.post.props"/>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{12144E07-FE63-4D33-9231-748B8D8C3792}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>ParserUnitTests</RootNamespace>
|
||||||
|
<ProjectName>TerminalParser.UnitTests</ProjectName>
|
||||||
|
<TargetName>ConParser.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -36,16 +44,8 @@
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{12144E07-FE63-4D33-9231-748B8D8C3792}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>ParserUnitTests</RootNamespace>
|
|
||||||
<ProjectName>TerminalParser.UnitTests</ProjectName>
|
|
||||||
<TargetName>ConParser.Unit.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="main.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{ED82003F-FC5D-4E94-8B47-F480018ED064}</ProjectGuid>
|
<ProjectGuid>{ED82003F-FC5D-4E94-8B47-F480018ED064}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>buffersize</RootNamespace>
|
<RootNamespace>buffersize</RootNamespace>
|
||||||
<ProjectName>buffersize</ProjectName>
|
<ProjectName>buffersize</ProjectName>
|
||||||
<TargetName>buffersize</TargetName>
|
<TargetName>buffersize</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -21,7 +22,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
<Import Project="..\..\common.build.tests.props" />
|
<Import Project="..\..\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="closetest.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB}</ProjectGuid>
|
<ProjectGuid>{C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>CloseTest</RootNamespace>
|
<RootNamespace>CloseTest</RootNamespace>
|
||||||
<ProjectName>CloseTest</ProjectName>
|
<ProjectName>CloseTest</ProjectName>
|
||||||
<TargetName>CloseTest</TargetName>
|
<TargetName>CloseTest</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="closetest.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -21,7 +22,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
<Import Project="..\..\common.build.tests.props" />
|
<Import Project="..\..\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="main.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{814CBEEE-894E-4327-A6E1-740504850098}</ProjectGuid>
|
<ProjectGuid>{814CBEEE-894E-4327-A6E1-740504850098}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>ConEchoKey</RootNamespace>
|
<RootNamespace>ConEchoKey</RootNamespace>
|
||||||
<ProjectName>ConEchoKey</ProjectName>
|
<ProjectName>ConEchoKey</ProjectName>
|
||||||
<TargetName>ConEchoKey</TargetName>
|
<TargetName>ConEchoKey</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -21,7 +22,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
<Import Project="..\..\common.build.tests.props" />
|
<Import Project="..\..\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="main.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{919544AC-D39B-463F-8414-3C3C67CF727C}</ProjectGuid>
|
<ProjectGuid>{919544AC-D39B-463F-8414-3C3C67CF727C}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>FontList</RootNamespace>
|
<RootNamespace>FontList</RootNamespace>
|
||||||
<ProjectName>FontList</ProjectName>
|
<ProjectName>FontList</ProjectName>
|
||||||
<TargetName>FontList</TargetName>
|
<TargetName>FontList</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -21,7 +22,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
<Import Project="..\..\common.build.tests.props" />
|
<Import Project="..\..\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="main.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{FC802440-AD6A-4919-8F2C-7701F2B38D79}</ProjectGuid>
|
<ProjectGuid>{FC802440-AD6A-4919-8F2C-7701F2B38D79}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>Nihilist</RootNamespace>
|
<RootNamespace>Nihilist</RootNamespace>
|
||||||
<ProjectName>Nihilist</ProjectName>
|
<ProjectName>Nihilist</ProjectName>
|
||||||
<TargetName>Nihilist</TargetName>
|
<TargetName>Nihilist</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -21,7 +22,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
<Import Project="..\..\common.build.tests.props" />
|
<Import Project="..\..\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="main.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{ED82003F-FC5D-4E94-8B36-F480018ED064}</ProjectGuid>
|
<ProjectGuid>{ED82003F-FC5D-4E94-8B36-F480018ED064}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>Scratch</RootNamespace>
|
<RootNamespace>Scratch</RootNamespace>
|
||||||
<ProjectName>Scratch</ProjectName>
|
<ProjectName>Scratch</ProjectName>
|
||||||
<TargetName>Scratch</TargetName>
|
<TargetName>Scratch</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -21,7 +22,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
<Import Project="..\..\common.build.tests.props" />
|
<Import Project="..\..\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,14 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{814DBDDE-894E-4327-A6E1-740504850098}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>VtPipeTerm</RootNamespace>
|
||||||
|
<ProjectName>VtPipeTerm</ProjectName>
|
||||||
|
<TargetName>VtPipeTerm</TargetName>
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="..\..\common.build.pre.props" />
|
<Import Project="..\..\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="VtConsole.hpp" />
|
<ClInclude Include="VtConsole.hpp" />
|
||||||
|
|
@ -8,14 +17,6 @@
|
||||||
<ClCompile Include="main.cpp" />
|
<ClCompile Include="main.cpp" />
|
||||||
<ClCompile Include="VtConsole.cpp" />
|
<ClCompile Include="VtConsole.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{814DBDDE-894E-4327-A6E1-740504850098}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>VtPipeTerm</RootNamespace>
|
|
||||||
<ProjectName>VtPipeTerm</ProjectName>
|
|
||||||
<TargetName>VtPipeTerm</TargetName>
|
|
||||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
@ -26,7 +27,6 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="..\..\common.build.exe.props" />
|
|
||||||
<Import Project="..\..\common.build.post.props" />
|
<Import Project="..\..\common.build.post.props" />
|
||||||
<Import Project="..\..\common.build.tests.props" />
|
<Import Project="..\..\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{2FD12FBB-1DDB-46D8-B818-1023C624CACA}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>tsf</RootNamespace>
|
||||||
|
<ProjectName>TextServicesFramework</ProjectName>
|
||||||
|
<TargetName>ConTSF</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="ConsoleTSF.cpp" />
|
<ClCompile Include="ConsoleTSF.cpp" />
|
||||||
|
|
@ -24,14 +32,6 @@
|
||||||
<ClInclude Include="TfDispAttr.h" />
|
<ClInclude Include="TfDispAttr.h" />
|
||||||
<ClInclude Include="TfEditses.h" />
|
<ClInclude Include="TfEditses.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{2FD12FBB-1DDB-46D8-B818-1023C624CACA}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>tsf</RootNamespace>
|
|
||||||
<ProjectName>TextServicesFramework</ProjectName>
|
|
||||||
<TargetName>ConTSF</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{18D09A24-8240-42D6-8CB6-236EEE820263}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>types</RootNamespace>
|
||||||
|
<ProjectName>Types</ProjectName>
|
||||||
|
<TargetName>ConTypes</TargetName>
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\CodepointWidthDetector.cpp" />
|
<ClCompile Include="..\CodepointWidthDetector.cpp" />
|
||||||
|
|
@ -43,14 +51,6 @@
|
||||||
<ClInclude Include="..\UiaTextRangeBase.hpp" />
|
<ClInclude Include="..\UiaTextRangeBase.hpp" />
|
||||||
<ClInclude Include="..\WindowUiaProviderBase.hpp" />
|
<ClInclude Include="..\WindowUiaProviderBase.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{18D09A24-8240-42D6-8CB6-236EEE820263}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>types</RootNamespace>
|
|
||||||
<ProjectName>Types</ProjectName>
|
|
||||||
<TargetName>ConTypes</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.lib.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProjectGuid>{34de34d3-1cd6-4ee3-8bd9-a26b5b27ec73}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>TypesUnitTests</RootNamespace>
|
||||||
|
<ProjectName>Types.Unit.Tests</ProjectName>
|
||||||
|
<TargetName>Types.Unit.Tests</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="UTF8OutPipeReaderTests.cpp" />
|
<ClCompile Include="UTF8OutPipeReaderTests.cpp" />
|
||||||
|
|
@ -17,20 +25,12 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\precomp.h" />
|
<ClInclude Include="..\precomp.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{34de34d3-1cd6-4ee3-8bd9-a26b5b27ec73}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>TypesUnitTests</RootNamespace>
|
|
||||||
<ProjectName>Types.Unit.Tests</ProjectName>
|
|
||||||
<TargetName>Types.Unit.Tests</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
<Import Project="$(SolutionDir)src\common.build.tests.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{58a03bb2-df5a-4b66-91a0-7ef3ba01269a}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>winconpty</RootNamespace>
|
||||||
|
<ProjectName>winconpty</ProjectName>
|
||||||
|
<TargetName>conpty</TargetName>
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
<Import Project="$(SolutionDir)src\common.build.pre.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="winconpty.cpp" />
|
<ClCompile Include="winconpty.cpp" />
|
||||||
|
|
@ -15,23 +23,12 @@
|
||||||
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{58a03bb2-df5a-4b66-91a0-7ef3ba01269a}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>winconpty</RootNamespace>
|
|
||||||
<ProjectName>winconpty</ProjectName>
|
|
||||||
<TargetName>conpty</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
|
||||||
<Import Project="$(SolutionDir)src\common.build.dll.props" />
|
|
||||||
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
<Import Project="$(SolutionDir)src\common.build.post.props" />
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<Link>
|
<Link>
|
||||||
<ModuleDefinitionFile>winconpty.def</ModuleDefinitionFile>
|
<ModuleDefinitionFile>winconpty.def</ModuleDefinitionFile>
|
||||||
|
|
||||||
<!-- Force APISet to the beginning of the link line; GH#922 -->
|
|
||||||
<AdditionalDependencies>onecoreuap_apiset.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue