Reorganise *.props

2020-02-23 06:17:35 +10:00 · 2020-02-23 06:17:35 +10:00 · 2b8c0edcc2
parent ef36c92bd2
commit 2b8c0edcc2
15 changed files with 34 additions and 46 deletions
--- a/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
+++ b/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFramework>net48</TargetFramework>
--- a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
+++ b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
 	</PropertyGroup>
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFramework>net48</TargetFramework>
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<Import Project="$(SolutionDir)CommonNullable.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
--- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
+++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
--- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFramework>netstandard2.0</TargetFramework>
--- a/Common.props
+++ b/Common.props
@ -1,11 +1,8 @@
 <Project>
 	<PropertyGroup>
-		<CodeAnalysisRuleSet>$(SolutionDir)Common.ruleset</CodeAnalysisRuleSet>
 		<ErrorReport>prompt</ErrorReport>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<LangVersion>8.0</LangVersion>
-		<NoWarn>NU1701</NoWarn><!-- can't use .ruleset, and NU1702 can't be silenced at all (see https://github.com/NuGet/Home/issues/8797) -->
-		<OutputPath>$(SolutionDir)output/dll</OutputPath>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 		<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
 		<RunCodeAnalysis>false</RunCodeAnalysis>
@ -22,7 +19,4 @@
 		<DefineConstants>TRACE</DefineConstants>
 		<Optimize>true</Optimize>
 	</PropertyGroup>
-	<ItemGroup>
-		<AdditionalFiles Include="$(SolutionDir).stylecop.json" />
-	</ItemGroup>
 </Project>
--- a/ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj
+++ b/ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(ProjectDir)../Common.props" />
+	<Import Project="$(ProjectDir)../ExtToolCommon.props" />
 	<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
 	<ItemGroup>
 		<Reference Include="System.ComponentModel.DataAnnotations" />
--- a/ExternalToolProjects/Common.props
+++ b/ExternalToolProjects/Common.props
@ -1,29 +0,0 @@
-<Project>
-	<PropertyGroup>
-		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
-		<ErrorReport>prompt</ErrorReport>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<LangVersion>8.0</LangVersion>
-		<Nullable>enable</Nullable>
-		<OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath>
-		<PlatformTarget>AnyCPU</PlatformTarget>
-		<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
-		<RunCodeAnalysis>false</RunCodeAnalysis>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-		<DebugSymbols>true</DebugSymbols>
-		<DebugType>full</DebugType>
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-		<Optimize>false</Optimize>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<DebugSymbols>false</DebugSymbols>
-		<DebugType>pdbonly</DebugType>
-		<DefineConstants>TRACE</DefineConstants>
-		<Optimize>true</Optimize>
-	</PropertyGroup>
-	<ItemGroup>
-		<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
-		<None Remove="*.sh" />
-	</ItemGroup>
-</Project>
--- a/ExternalToolProjects/DBMan/DBMan.csproj
+++ b/ExternalToolProjects/DBMan/DBMan.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(ProjectDir)../Common.props" />
+	<Import Project="$(ProjectDir)../ExtToolCommon.props" />
 	<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
 	<PropertyGroup>
 		<GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture>
--- a/ExternalToolProjects/ExtToolCommon.props
+++ b/ExternalToolProjects/ExtToolCommon.props
@ -0,0 +1,12 @@
+<Project>
+	<Import Project="$(ProjectDir)../../Common.props" />
+	<Import Project="$(ProjectDir)../../CommonNullable.props" />
+	<PropertyGroup>
+		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
+		<OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath>
+	</PropertyGroup>
+	<ItemGroup>
+		<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
+		<None Remove="*.sh" />
+	</ItemGroup>
+</Project>
--- a/ExternalToolProjects/HelloWorld/HelloWorld.csproj
+++ b/ExternalToolProjects/HelloWorld/HelloWorld.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(ProjectDir)../Common.props" />
+	<Import Project="$(ProjectDir)../ExtToolCommon.props" />
 	<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
 	<ItemGroup>
 		<EmbeddedResource Include="icon_Hello.ico" />
--- a/MainSlnCommon.props
+++ b/MainSlnCommon.props
@ -0,0 +1,11 @@
+<Project>
+	<Import Project="$(SolutionDir)Common.props" />
+	<PropertyGroup>
+		<CodeAnalysisRuleSet>$(SolutionDir)Common.ruleset</CodeAnalysisRuleSet>
+		<NoWarn>NU1701</NoWarn><!-- can't use .ruleset, and NU1702 can't be silenced at all (see https://github.com/NuGet/Home/issues/8797) -->
+		<OutputPath>$(SolutionDir)output/dll</OutputPath>
+	</PropertyGroup>
+	<ItemGroup>
+		<AdditionalFiles Include="$(SolutionDir).stylecop.json" />
+	</ItemGroup>
+</Project>