From ba53f4a7bc1824da5bccd666edc8d8bef1a70a17 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 15 Oct 2022 17:09:54 -0700
Subject: [PATCH] Extract common csproj properties

---
 Directory.Build.props                         | 12 ++++
 PKHeX.Core/PKHeX.Core.csproj                  |  9 ---
 PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj  | 62 +++++++++----------
 .../PKHeX.Drawing.PokeSprite.csproj           | 52 ++++++++--------
 PKHeX.Drawing/PKHeX.Drawing.csproj            |  6 +-
 PKHeX.WinForms/PKHeX.WinForms.csproj          |  8 +--
 6 files changed, 71 insertions(+), 78 deletions(-)
 create mode 100644 Directory.Build.props

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 000000000..dfeafe037
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <Version>22.09.13</Version>
+    <LangVersion>10</LangVersion>
+    <Nullable>enable</Nullable>
+    <NeutralLanguage>en</NeutralLanguage>
+    <Product>PKHeX</Product>
+    <Company>Project Pokémon</Company>
+    <Authors>Kaphotics</Authors>
+    <Copyright>Kaphotics</Copyright>
+  </PropertyGroup>
+</Project>
diff --git a/PKHeX.Core/PKHeX.Core.csproj b/PKHeX.Core/PKHeX.Core.csproj
index dc82e4621..f8461ebe5 100644
--- a/PKHeX.Core/PKHeX.Core.csproj
+++ b/PKHeX.Core/PKHeX.Core.csproj
@@ -2,17 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
-    <LangVersion>10</LangVersion>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <Description>Pokémon C# Class Library</Description>
     <RootNamespace>PKHeX.Core</RootNamespace>
-    <NeutralLanguage>en</NeutralLanguage>
-    <Company>Project Pokémon</Company>
-    <Copyright>Kaphotics</Copyright>
-    <Version>22.09.13</Version>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj
index 69beca84a..0c00eee5f 100644
--- a/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj
+++ b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj
@@ -1,40 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFrameworks>net6.0;net46</TargetFrameworks>
-		<NeutralLanguage>en</NeutralLanguage>
-		<LangVersion>10</LangVersion>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net46</TargetFrameworks>
+    <RootNamespace>PKHeX.Drawing.Misc</RootNamespace>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\PKHeX.Core\PKHeX.Core.csproj" />
-		<ProjectReference Include="..\PKHeX.Drawing\PKHeX.Drawing.csproj" />
-		<ProjectReference Include="..\PKHeX.Drawing.PokeSprite\PKHeX.Drawing.PokeSprite.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PKHeX.Core\PKHeX.Core.csproj" />
+    <ProjectReference Include="..\PKHeX.Drawing\PKHeX.Drawing.csproj" />
+    <ProjectReference Include="..\PKHeX.Drawing.PokeSprite\PKHeX.Drawing.PokeSprite.csproj" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="QRCoder" Version="1.4.1" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="QRCoder" Version="1.4.1" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<Compile Update="Properties\Resources.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Resources.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
-	<ItemGroup>
-		<EmbeddedResource Update="Properties\Resources.resx">
-			<Generator>PublicResXFileCodeGenerator</Generator>
-			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
-		<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
-		<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
-	</ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
+    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
+  </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj b/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj
index 3e54f8400..577ca847b 100644
--- a/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj
+++ b/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj
@@ -1,35 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFrameworks>net6.0;net46</TargetFrameworks>
-		<NeutralLanguage>en</NeutralLanguage>
-		<LangVersion>10</LangVersion>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net46</TargetFrameworks>
+    <RootNamespace>PKHeX.Drawing.PokeSprite</RootNamespace>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\PKHeX.Core\PKHeX.Core.csproj" />
-		<ProjectReference Include="..\PKHeX.Drawing\PKHeX.Drawing.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PKHeX.Core\PKHeX.Core.csproj" />
+    <ProjectReference Include="..\PKHeX.Drawing\PKHeX.Drawing.csproj" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<Compile Update="Properties\Resources.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Resources.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
-	<ItemGroup>
-		<EmbeddedResource Update="Properties\Resources.resx">
-			<Generator>PublicResXFileCodeGenerator</Generator>
-			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
-		<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
-		<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
-	</ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
+    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
+  </ItemGroup>
 
 </Project>
diff --git a/PKHeX.Drawing/PKHeX.Drawing.csproj b/PKHeX.Drawing/PKHeX.Drawing.csproj
index 1bc7298e1..9f00b6edd 100644
--- a/PKHeX.Drawing/PKHeX.Drawing.csproj
+++ b/PKHeX.Drawing/PKHeX.Drawing.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net46</TargetFrameworks>
-    <LangVersion>10</LangVersion>
-    <Nullable>enable</Nullable>
+    <RootNamespace>PKHeX.Drawing</RootNamespace>
   </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\PKHeX.Core\PKHeX.Core.csproj" />
   </ItemGroup>
diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj
index 6508953e9..3376a179a 100644
--- a/PKHeX.WinForms/PKHeX.WinForms.csproj
+++ b/PKHeX.WinForms/PKHeX.WinForms.csproj
@@ -4,18 +4,12 @@
     <OutputType>WinExe</OutputType>
     <TargetFrameworks>net46;net6.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
-	<NeutralLanguage>en</NeutralLanguage>
     <PackageId>PKHeX</PackageId>
-    <Company>Project Pokémon</Company>
-    <Authors>Kaphotics</Authors>
-    <Product>PKHeX</Product>
     <Description>Pokémon Save Editor</Description>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
     <StartupObject>PKHeX.WinForms.Program</StartupObject>
+    <RootNamespace>PKHeX.WinForms</RootNamespace>
     <AssemblyName>PKHeX</AssemblyName>
-    <Version>22.09.13</Version>
-    <LangVersion>10</LangVersion>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) AND '$(Configuration)' == 'Release'">