Skip to content

Commit

Permalink
wpf: Add .NET Core target to WPF control (#3470)
Browse files Browse the repository at this point in the history
  • Loading branch information
huoyaoyuan authored and DHowett committed Nov 8, 2019
1 parent 58b52ef commit db79758
Showing 1 changed file with 3 additions and 23 deletions.
26 changes: 3 additions & 23 deletions src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
<PropertyGroup>

<TargetFrameworks>net472</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>
<RootNamespace>Microsoft.Terminal.Wpf</RootNamespace>
<AssemblyName>Microsoft.Terminal.Wpf</AssemblyName>
<UseWpf>true</UseWpf>

<RepoBinPath>$(MSBuildThisFileDirectory)..\..\..\bin\</RepoBinPath>
<IntermediateOutputPath>$(RepoBinPath)..\obj\$(Platform)\$(Configuration)\$(MSBuildProjectName)</IntermediateOutputPath>
Expand All @@ -29,17 +28,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Page Include="**\*.xaml" Exclude="App.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>

<Target Name="CollectNativePackContents">
<ItemGroup>
Expand All @@ -54,12 +42,4 @@
</ItemGroup>
</Target>

<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>

<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
</Project>

0 comments on commit db79758

Please sign in to comment.