From 803e7594532b1eb918a3f98acc03d0060d2413e4 Mon Sep 17 00:00:00 2001
From: Anairkoen Schno <aaron.cirr.com@gmail.com>
Date: Fri, 26 Mar 2021 20:24:08 -0500
Subject: [PATCH] Pulled out common properties for the projects into common
 project

---
 BSIPA.sln                        |  2 ++
 Common.props                     |  4 ++++
 Common.targets                   | 13 +++++++++++++
 IPA.Injector/IPA.Injector.csproj | 11 ++++++-----
 IPA.Loader/IPA.Loader.csproj     | 11 ++++++-----
 IPA/IPA.csproj                   |  7 ++++---
 6 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 Common.props
 create mode 100644 Common.targets

diff --git a/BSIPA.sln b/BSIPA.sln
index e1df40a9..1a4c85e7 100644
--- a/BSIPA.sln
+++ b/BSIPA.sln
@@ -19,6 +19,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D6639A2-BD39-4F9B-AF7F-8E5F3B88243D}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build.yml = .github\workflows\build.yml
+		Common.props = Common.props
+		Common.targets = Common.targets
 		.github\workflows\docs.yml = .github\workflows\docs.yml
 		README.md = README.md
 		.github\release_draft.yml = .github\release_draft.yml
diff --git a/Common.props b/Common.props
new file mode 100644
index 00000000..07459379
--- /dev/null
+++ b/Common.props
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+</Project>
\ No newline at end of file
diff --git a/Common.targets b/Common.targets
new file mode 100644
index 00000000..152a437c
--- /dev/null
+++ b/Common.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <PropertyGroup>
+    <!--<PathMap>$(SolutionDir)=C:\</PathMap>-->
+    <DebugType>portable</DebugType>
+    <LangVersion>9</LangVersion>
+    <NoWarn>CA1031</NoWarn>
+    <WarningsAsErrors>$(WarningsAsErrors);nullable</WarningsAsErrors>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/IPA.Injector/IPA.Injector.csproj b/IPA.Injector/IPA.Injector.csproj
index 537ac45d..a100bf44 100644
--- a/IPA.Injector/IPA.Injector.csproj
+++ b/IPA.Injector/IPA.Injector.csproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <Import Project="..\Common.props"/>
 
   <PropertyGroup>
     <TargetFrameworks>net461;net35</TargetFrameworks>
     <RootNamespace>IPA.Injector</RootNamespace>
-    <!--<PathMap>$(SolutionDir)=C:\</PathMap>-->
-    <DebugType>portable</DebugType>
-    <LangVersion>8.0</LangVersion>
+    
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>CA1031</NoWarn>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <BuildForBeatSaber Condition=" '$(BuildForBeatSaber)' == '' And '$(TargetFramework)' == 'net461' ">true</BuildForBeatSaber>
@@ -103,4 +102,6 @@
     <RemoveDir Directories="$(OutputPath)Libraries" />
   </Target>
 
+  <Import Project="..\Common.targets"/>
+
 </Project>
diff --git a/IPA.Loader/IPA.Loader.csproj b/IPA.Loader/IPA.Loader.csproj
index 3ef4a9b0..6621dee7 100644
--- a/IPA.Loader/IPA.Loader.csproj
+++ b/IPA.Loader/IPA.Loader.csproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\Common.props"/>
 
   <PropertyGroup>
     <TargetFrameworks>net461;net35</TargetFrameworks>
     <RootNamespace>IPA</RootNamespace>
-    <!--<PathMap>$(SolutionDir)=C:\</PathMap>-->
-    <DebugType>portable</DebugType>
-    <LangVersion>8.0</LangVersion>
+    
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>CA1031</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <BuildForBeatSaber Condition=" '$(BuildForBeatSaber)' == '' And '$(TargetFramework)' == 'net461' ">true</BuildForBeatSaber>
@@ -64,4 +63,6 @@
     <EmbeddedResource Include="Loader\description.md" />
   </ItemGroup>
 
+  <Import Project="..\Common.targets"/>
+
 </Project>
diff --git a/IPA/IPA.csproj b/IPA/IPA.csproj
index a7dda417..0c158f58 100644
--- a/IPA/IPA.csproj
+++ b/IPA/IPA.csproj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\Common.props"/>
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
@@ -7,14 +9,13 @@
     <RootNamespace>IPA</RootNamespace>
     <AssemblyName>IPA</AssemblyName>
     <PathMap>$(SolutionDir)=C:\</PathMap>
-    <DebugType>portable</DebugType>
-    <LangVersion>8.0</LangVersion>
-    <NoWarn>CA1031</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
 
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
+
+  <Import Project="..\Common.targets"/>
   
 </Project>