From 39716aa95dd0c20c220029bde04f77ca64adb0ba Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 20 May 2023 20:05:15 -0400
Subject: [PATCH] Common props for Nuget .csproj's

---
 .dockerignore                                 |  1 +
 build/Common.props                            |  1 +
 build/Dockerfile                              |  1 +
 build/NugetCommon.props                       | 23 +++++++++++++++++++
 .../Tgstation.Server.Api.csproj               | 18 ++-------------
 .../Tgstation.Server.Client.csproj            | 18 ++-------------
 .../Tgstation.Server.Common.csproj            | 18 ++-------------
 tgstation-server.sln                          |  1 +
 8 files changed, 33 insertions(+), 48 deletions(-)
 create mode 100644 build/NugetCommon.props

diff --git a/.dockerignore b/.dockerignore
index fc910881e3..0558f70123 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -22,6 +22,7 @@ build/**
 !build/Version.props
 !build/ControlPanelVersion.props
 !build/Common.props
+!build/NugetCommon.props
 docs
 src/DMAPI
 src/Tgstation.Server.Host/ClientApp
diff --git a/build/Common.props b/build/Common.props
index 459cdbd9b6..95ade51555 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <TgsNetVersion>net6.0</TgsNetVersion>
+    <TgsNugetNetVersion>netstandard2.0</TgsNugetNetVersion>
     <LangVersion>latest</LangVersion>
     <DebugType>Full</DebugType>
   </PropertyGroup>
diff --git a/build/Dockerfile b/build/Dockerfile
index ae9e56df30..716790bada 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -26,6 +26,7 @@ RUN npm install -g yarn
 WORKDIR /repo/build
 
 COPY build/Common.props Common.props
+COPY build/NugetCommon.props NugetCommon.props
 COPY build/Version.props Version.props
 COPY build/ControlPanelVersion.props ControlPanelVersion.props
 
diff --git a/build/NugetCommon.props b/build/NugetCommon.props
new file mode 100644
index 0000000000..d844ff4b1a
--- /dev/null
+++ b/build/NugetCommon.props
@@ -0,0 +1,23 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Common.props" />
+
+  <PropertyGroup>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>Cyberboss/Dominion</Authors>
+    <Company>/tg/station 13</Company>
+    <PackageProjectUrl>https://tgstation.github.io/tgstation-server</PackageProjectUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageIcon>tgs.png</PackageIcon>
+    <RepositoryType>Git</RepositoryType>
+    <RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
+    <Copyright>2018-2023</Copyright>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="../../LICENSE" Pack="true" PackagePath="" />
+    <None Include="../../build/tgs.png" Pack="true" PackagePath="" />
+  </ItemGroup>
+</Project>
diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
index 7ec7093552..cb44534a9c 100644
--- a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
+++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
@@ -1,24 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../build/Common.props" />
+  <Import Project="../../build/NugetCommon.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>$(TgsNugetNetVersion)</TargetFramework>
     <Version>$(TgsApiLibraryVersion)</Version>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Authors>Cyberboss/Dominion</Authors>
-    <Company>/tg/station 13</Company>
     <Description>API definitions for tgstation-server.</Description>
-    <PackageProjectUrl>https://tgstation.github.io/tgstation-server</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageIcon>tgs.png</PackageIcon>
-    <RepositoryType>Git</RepositoryType>
-    <RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
-    <Copyright>2018-2023</Copyright>
     <PackageTags>json web api tgstation-server tgstation ss13 byond http</PackageTags>
     <PackageReleaseNotes>Minor documentation correction.</PackageReleaseNotes>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Nullable>enable</Nullable>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <CodeAnalysisRuleSet>../../build/analyzers.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
@@ -59,7 +47,5 @@
 
   <ItemGroup>
     <AdditionalFiles Include="../../build/stylecop.json" />
-    <None Include="../../LICENSE" Pack="true" PackagePath="" />
-    <None Include="../../build/tgs.png" Pack="true" PackagePath="" />
   </ItemGroup>
 </Project>
diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
index 9ef4f87f93..07e99c9dd4 100644
--- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
@@ -1,24 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../build/Common.props" />
+  <Import Project="../../build/NugetCommon.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>$(TgsNugetNetVersion)</TargetFramework>
     <Version>$(TgsClientVersion)</Version>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Authors>Cyberboss/Dominion</Authors>
-    <Company>/tg/station 13</Company>
     <Description>Client library for tgstation-server.</Description>
-    <PackageProjectUrl>https://tgstation.github.io/tgstation-server</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageIcon>tgs.png</PackageIcon>
-    <RepositoryType>Git</RepositoryType>
-    <RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
-    <Copyright>2018-2023</Copyright>
     <PackageTags>json web api tgstation-server tgstation ss13 byond client http</PackageTags>
     <PackageReleaseNotes>Added missing Dispose() call to the StringContents for requests with bodies and added missing ConfigureAwait(false) to async call.</PackageReleaseNotes>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Nullable>enable</Nullable>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <CodeAnalysisRuleSet>../../build/analyzers.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
@@ -44,7 +32,5 @@
 
   <ItemGroup>
     <AdditionalFiles Include="../../build/stylecop.json" />
-    <None Include="../../LICENSE" Pack="true" PackagePath="" />
-    <None Include="../../build/tgs.png" Pack="true" PackagePath="" />
   </ItemGroup>
 </Project>
diff --git a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
index 6b16443795..582e4741cc 100644
--- a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
+++ b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
@@ -1,24 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../build/Common.props" />
+  <Import Project="../../build/NugetCommon.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>$(TgsNugetNetVersion)</TargetFramework>
     <Version>$(TgsCoreVersion)</Version>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Authors>Cyberboss/Dominion</Authors>
-    <Company>/tg/station 13</Company>
     <Description>Common functions for tgstation-server.</Description>
-    <PackageProjectUrl>https://tgstation.github.io/tgstation-server</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageIcon>tgs.png</PackageIcon>
-    <RepositoryType>Git</RepositoryType>
-    <RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
-    <Copyright>2018-2023</Copyright>
     <PackageTags>web tgstation-server tgstation ss13 byond client http</PackageTags>
     <PackageReleaseNotes>Initial release.</PackageReleaseNotes>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Nullable>enable</Nullable>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <CodeAnalysisRuleSet>../../build/analyzers.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
@@ -39,7 +27,5 @@
 
   <ItemGroup>
     <AdditionalFiles Include="../../build/stylecop.json" />
-    <None Include="../../LICENSE" Pack="true" PackagePath="" />
-    <None Include="../../build/tgs.png" Pack="true" PackagePath="" />
   </ItemGroup>
 </Project>
diff --git a/tgstation-server.sln b/tgstation-server.sln
index b31d88bd34..b5b13a723e 100644
--- a/tgstation-server.sln
+++ b/tgstation-server.sln
@@ -30,6 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6
 		build\coverlet.runsettings = build\coverlet.runsettings
 		build\Dockerfile = build\Dockerfile
 		build\GenerateMigrations.sh = build\GenerateMigrations.sh
+		build\NugetCommon.props = build\NugetCommon.props
 		build\OpenApiValidationSettings.json = build\OpenApiValidationSettings.json
 		build\stylecop.json = build\stylecop.json
 		build\tgs.docker.sh = build\tgs.docker.sh