ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganise *.props

This commit is contained in:
YoshiRulz 2020-02-23 06:17:35 +10:00
parent ef36c92bd2
commit 2b8c0edcc2
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
15 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>

2
BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>

2
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>

2
BizHawk.Common/BizHawk.Common.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)CommonNullable.props" /> <Import Project="$(SolutionDir)CommonNullable.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

2
BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>

2
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>

2
BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>

2
Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Common.props" /> <Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>

6
Common.props
View File

@ -1,11 +1,8 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<CodeAnalysisRuleSet>$(SolutionDir)Common.ruleset</CodeAnalysisRuleSet>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>8.0</LangVersion> <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> <PlatformTarget>AnyCPU</PlatformTarget>
<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild> <RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
@ -22,7 +19,4 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<AdditionalFiles Include="$(SolutionDir).stylecop.json" />
</ItemGroup>
</Project> </Project>

2
ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(ProjectDir)../Common.props" /> <Import Project="$(ProjectDir)../ExtToolCommon.props" />
<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" /> <Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
<ItemGroup> <ItemGroup>
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />

29
ExternalToolProjects/Common.props
View File

@ -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>

2
ExternalToolProjects/DBMan/DBMan.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(ProjectDir)../Common.props" /> <Import Project="$(ProjectDir)../ExtToolCommon.props" />
<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" /> <Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
<PropertyGroup> <PropertyGroup>
<GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture> <GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture>

12
ExternalToolProjects/ExtToolCommon.props Normal file
View File

@ -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>

2
ExternalToolProjects/HelloWorld/HelloWorld.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(ProjectDir)../Common.props" /> <Import Project="$(ProjectDir)../ExtToolCommon.props" />
<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" /> <Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="icon_Hello.ico" /> <EmbeddedResource Include="icon_Hello.ico" />

11
MainSlnCommon.props Normal file
View File

@ -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>