-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3c19372
commit d7712cb
Showing
9 changed files
with
167 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...alSettingsModel/TerminalSettingsModel.def → ...dll/Microsoft.Terminal.Settings.Model.def
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| EXPORTS | ||
| EXPORTS | ||
| DllCanUnloadNow = WINRT_CanUnloadNow PRIVATE | ||
| DllGetActivationFactory = WINRT_GetActivationFactory PRIVATE |
108 changes: 108 additions & 0 deletions
108
src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{CA5CAD1A-082C-4476-9F33-94B339494076}</ProjectGuid> | ||
| <ProjectName>Microsoft.Terminal.Settings.Model</ProjectName> | ||
| <RootNamespace>Microsoft.Terminal.Settings.Model</RootNamespace> | ||
| <!-- cppwinrt.build.pre.props depends on these settings: --> | ||
| <!-- build a dll, not exe (Application) --> | ||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| <SubSystem>Console</SubSystem> | ||
| <!-- sets a bunch of Windows Universal properties --> | ||
| <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp> | ||
| <!-- | ||
| 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="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" /> | ||
| <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" /> | ||
| <!-- ========================= XAML files ======================== --> | ||
| <ItemGroup> | ||
| <!-- DON'T PUT XAML FILES HERE! Put them in TerminalAppLib.vcxproj --> | ||
| </ItemGroup> | ||
| <!-- ========================= Headers ======================== --> | ||
| <ItemGroup> | ||
| <!-- Only put headers for winrt types in here. Don't put other header files | ||
| in here - put them in the lib's vcxproj instead! --> | ||
| <ClInclude Include="pch.h" /> | ||
| <ClInclude Include="../ActionArgs.h" /> | ||
| <ClInclude Include="../CascadiaSettings.h" /> | ||
| <ClInclude Include="../ColorScheme.h" /> | ||
| <ClInclude Include="../Command.h" /> | ||
| <ClInclude Include="../GlobalAppSettings.h" /> | ||
| <ClInclude Include="../KeyChordSerialization.h" /> | ||
| <ClInclude Include="../KeyMapping.h" /> | ||
| <ClInclude Include="../Profile.h" /> | ||
| <ClInclude Include="../TerminalWarnings.h" /> | ||
| </ItemGroup> | ||
| <!-- ========================= Cpp Files ======================== --> | ||
| <ItemGroup> | ||
| <!-- Don't put source files in here - put them in the lib's vcxproj instead! --> | ||
| <ClCompile Include="pch.cpp"> | ||
| <PrecompiledHeader>Create</PrecompiledHeader> | ||
| </ClCompile> | ||
| </ItemGroup> | ||
| <!-- ========================= idl Files ======================== --> | ||
| <ItemGroup> | ||
| <!-- DON'T PUT IDL FILES HERE! Put them in the lib's vcxproj --> | ||
| </ItemGroup> | ||
| <!-- ========================= Misc Files ======================== --> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| <None Include="Microsoft.Terminal.Settings.Model.def" /> | ||
| </ItemGroup> | ||
| <!-- ========================= Project References ======================== --> | ||
| <ItemGroup> | ||
| <!-- | ||
| the packaging project won't recurse through our dependencies, you have to | ||
| make sure that if you add a cppwinrt dependency to any of these projects, | ||
| you also update all the consumers | ||
| --> | ||
| <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj"> | ||
| <Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project> | ||
| </ProjectReference> | ||
| <!-- The midl compiler however, _will_ aggregate our winmd dependencies | ||
| somehow. So make sure to only include top-level dependencies here (don't | ||
| include Settings and Connection, since Control will include them for us) --> | ||
| <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj"> | ||
| <Private>false</Private> | ||
| </ProjectReference> | ||
| <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj"> | ||
| <Private>false</Private> | ||
| </ProjectReference> | ||
| <!-- Reference Microsoft.Terminal.Settings.ModelLib here, so we can use it's winmd as | ||
| our winmd. This didn't work correctly in VS2017, you'd need to | ||
| manually reference the lib --> | ||
| <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj"> | ||
| <Private>true</Private> | ||
| <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" /> | ||
| <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| <PropertyGroup> | ||
| <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | ||
| </PropertyGroup> | ||
| <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets'))" /> | ||
| </Target> | ||
|
|
||
| <ItemDefinitionGroup> | ||
| <ClCompile> | ||
| <AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories> | ||
| </ClCompile> | ||
| <Link> | ||
| <AdditionalDependencies>User32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| <!-- TSM Lib contains a DllMain that we need to force the use of. --> | ||
| <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12</AdditionalOptions> | ||
| <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions> | ||
| </Link> | ||
| <Reference> | ||
| <Private>false</Private> | ||
| </Reference> | ||
| </ItemDefinitionGroup> | ||
| <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT license. | ||
|
|
||
| #include "pch.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT license. | ||
| // | ||
| // pch.h | ||
| // Header for platform projection include files | ||
| // | ||
|
|
||
| #pragma once | ||
|
|
||
| // This file can be empty - the pch.h in TerminalSettingsModel/lib does the heavy lifting | ||
| // of including all the headers we need. As this project is just a dll wrapper, | ||
| // we don't actually need anything in here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters