mirror of https://github.com/AMT-Cheif/Stylet.git
Turns out it is possible to have a single csproj targetting both core and framework
<EnableDefaultItems>false</EnableDefaultItems> along with <Compile Include="**\*.cs" Exclude="obj\**" /> and <None Remove="**\*.cs" /> is needed, though.
This commit is contained in:
Antony Male
parent
5184df214d
commit
3c7639bdc8
|
|
@ -1,36 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Library</OutputType>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<RootNamespace>Stylet</RootNamespace>
|
||||
<AssemblyName>Stylet</AssemblyName>
|
||||
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<CodeAnalysisRuleSet />
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<CodeAnalysisRuleSet />
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\Stylet\**\*.cs" />
|
||||
<None Include="..\Stylet\Settings.StyleCop" Link="Settings.StyleCop" />
|
||||
<None Include="..\Stylet\Stylet.ruleset" Link="Stylet.ruleset" />
|
||||
|
||||
<Page Include="..\Stylet\MessageBoxView.xaml" Link="MessageBoxView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="..\Stylet\Xaml\StyletResourceDictionary.xaml" Link="Xaml\StyletResourceDictionary.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Library</OutputType>
|
||||
<TargetFramework>net45</TargetFramework>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<RootNamespace>Stylet</RootNamespace>
|
||||
<AssemblyName>Stylet</AssemblyName>
|
||||
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<CodeAnalysisRuleSet />
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<CodeAnalysisRuleSet />
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\Stylet\**\*.cs" />
|
||||
<None Include="..\Stylet\Settings.StyleCop" Link="Settings.StyleCop" />
|
||||
<None Include="..\Stylet\Stylet.ruleset" Link="Stylet.ruleset" />
|
||||
|
||||
<Page Include="..\Stylet\MessageBoxView.xaml" Link="MessageBoxView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="..\Stylet\Xaml\StyletResourceDictionary.xaml" Link="Xaml\StyletResourceDictionary.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
34
Stylet.sln
34
Stylet.sln
|
|
@ -3,15 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29021.104
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StyletUnitTests", "StyletUnitTests\StyletUnitTests.csproj", "{13AFA20D-CCEA-4A58-920E-4D8816C7296B}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StyletUnitTests", "StyletUnitTests\StyletUnitTests.csproj", "{13AFA20D-CCEA-4A58-920E-4D8816C7296B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stylet.Core", "Stylet.Core\Stylet.Core.csproj", "{AB6ABA6E-AD39-4148-9C38-8B27874976A1}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stylet", "Stylet\Stylet.csproj", "{895A0541-84CF-4D3D-9539-58F1FC286336}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stylet.Framework", "Stylet.Framework\Stylet.Framework.csproj", "{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StyletIntegrationTests.Core", "StyletIntegrationTests.Core\StyletIntegrationTests.Core.csproj", "{35959185-53C3-4F50-82C9-6CBD1EF7C4D2}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StyletIntegrationTests.Framework", "StyletIntegrationTests.Framework\StyletIntegrationTests.Framework.csproj", "{C6021258-7CAE-4BC2-A08E-8433019405B7}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StyletIntegrationTests", "StyletIntegrationTests\StyletIntegrationTests.csproj", "{4122F924-6B71-4DDA-995E-FAF78242E20C}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
@ -23,22 +19,14 @@ Global
|
|||
{13AFA20D-CCEA-4A58-920E-4D8816C7296B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{13AFA20D-CCEA-4A58-920E-4D8816C7296B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{13AFA20D-CCEA-4A58-920E-4D8816C7296B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AB6ABA6E-AD39-4148-9C38-8B27874976A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AB6ABA6E-AD39-4148-9C38-8B27874976A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AB6ABA6E-AD39-4148-9C38-8B27874976A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AB6ABA6E-AD39-4148-9C38-8B27874976A1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{35959185-53C3-4F50-82C9-6CBD1EF7C4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{35959185-53C3-4F50-82C9-6CBD1EF7C4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{35959185-53C3-4F50-82C9-6CBD1EF7C4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{35959185-53C3-4F50-82C9-6CBD1EF7C4D2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C6021258-7CAE-4BC2-A08E-8433019405B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C6021258-7CAE-4BC2-A08E-8433019405B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C6021258-7CAE-4BC2-A08E-8433019405B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C6021258-7CAE-4BC2-A08E-8433019405B7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{895A0541-84CF-4D3D-9539-58F1FC286336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{895A0541-84CF-4D3D-9539-58F1FC286336}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{895A0541-84CF-4D3D-9539-58F1FC286336}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{895A0541-84CF-4D3D-9539-58F1FC286336}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4122F924-6B71-4DDA-995E-FAF78242E20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4122F924-6B71-4DDA-995E-FAF78242E20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4122F924-6B71-4DDA-995E-FAF78242E20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4122F924-6B71-4DDA-995E-FAF78242E20C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Library</OutputType>
|
||||
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<RootNamespace>Stylet</RootNamespace>
|
||||
<AssemblyName>Stylet</AssemblyName>
|
||||
<CodeAnalysisRuleSet />
|
||||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="**\*.cs" Exclude="obj\**" />
|
||||
<None Remove="**\*.cs" />
|
||||
|
||||
<None Include="Settings.StyleCop" Link="Settings.StyleCop" />
|
||||
<None Include="Stylet.ruleset" Link="Stylet.ruleset" />
|
||||
|
||||
<Page Include="MessageBoxView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Xaml\StyletResourceDictionary.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net45</TargetFramework>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<RootNamespace>StyletIntegrationTests</RootNamespace>
|
||||
<AssemblyName>StyletIntegrationTests</AssemblyName>
|
||||
<CodeAnalysisRuleSet/>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Stylet.Framework\Stylet.Framework.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ApplicationDefinition Include="..\StyletIntegrationTests\App.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</ApplicationDefinition>
|
||||
|
||||
<Compile Include="..\StyletIntegrationTests\**\*.cs" />
|
||||
|
||||
<Page Include="..\StyletIntegrationTests\ShellView.xaml" Link="ShellView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="..\StyletIntegrationTests\ShowDialogAndDialogResult\DialogView.xaml" Link="ShowDialogAndDialogResult\DialogView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="..\StyletIntegrationTests\WindowLifecycle\WindowView.xaml" Link="WindowLifecycle\WindowView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,39 +1,41 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<RootNamespace>StyletIntegrationTests</RootNamespace>
|
||||
<AssemblyName>StyletIntegrationTests</AssemblyName>
|
||||
<CodeAnalysisRuleSet/>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Stylet.Core\Stylet.Core.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ApplicationDefinition Include="..\StyletIntegrationTests\App.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</ApplicationDefinition>
|
||||
|
||||
<Compile Include="..\StyletIntegrationTests\**\*.cs" />
|
||||
|
||||
<Page Include="..\StyletIntegrationTests\ShellView.xaml" Link="ShellView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="..\StyletIntegrationTests\ShowDialogAndDialogResult\DialogView.xaml" Link="ShowDialogAndDialogResult\DialogView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="..\StyletIntegrationTests\WindowLifecycle\WindowView.xaml" Link="WindowLifecycle\WindowView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<RootNamespace>StyletIntegrationTests</RootNamespace>
|
||||
<AssemblyName>StyletIntegrationTests</AssemblyName>
|
||||
<CodeAnalysisRuleSet />
|
||||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Stylet\Stylet.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="**\*.cs" Exclude="obj\**" />
|
||||
<None Remove="**\*.cs" />
|
||||
|
||||
<ApplicationDefinition Include="App.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</ApplicationDefinition>
|
||||
|
||||
<Page Include="ShellView.xaml" Link="ShellView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ShowDialogAndDialogResult\DialogView.xaml" Link="ShowDialogAndDialogResult\DialogView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="WindowLifecycle\WindowView.xaml" Link="WindowLifecycle\WindowView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
|
||||
|
|
@ -13,13 +13,6 @@
|
|||
<PackageReference Include="nunit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
|
||||
<ProjectReference Include="..\Stylet\Stylet.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
|
||||
<ProjectReference Include="..\Stylet.Framework\Stylet.Framework.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||
<ProjectReference Include="..\Stylet.Core\Stylet.Core.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue