chore: use shared Build.props for all projects

oliverbooth · Aug 22, 2023 · e8a331f · e8a331f
1 parent a14fe4c
commit e8a331f
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 240 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,67 @@
+<Project>
+    <PropertyGroup>
+        <LangVersion>11.0</LangVersion>
+        <Optimize>true</Optimize>
+        <ImplicitUsings>true</ImplicitUsings>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <EnableNETAnalyzers>true</EnableNETAnalyzers>
+        <DebugType>pdbonly</DebugType>
+        <DebugSymbols>true</DebugSymbols>
+        <VersionPrefix>4.0.0</VersionPrefix>
+        <Authors>Oliver Booth</Authors>
+        <Nullable>enable</Nullable>
+        <NeutralLanguage>en</NeutralLanguage>
+        <RepositoryUrl>https://github.com/oliverbooth/X10D</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <Description>Extension methods on crack.</Description>
+        <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+        <PackageIcon>branding_Icon.png</PackageIcon>
+        <PackageIconUrl/>
+        <PackageTags>dotnet extension-methods</PackageTags>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(SolutionDir)/CHANGELOG.md"))</PackageReleaseNotes>
+        <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
+        <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
+        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
+        <FileVersion>$(VersionPrefix).0</FileVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
+        <Version>$(VersionPrefix)-$(VersionSuffix).$(BuildNumber)</Version>
+        <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
+        <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(VersionSuffix)' == ''">
+        <Version>$(VersionPrefix)</Version>
+        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
+        <FileVersion>$(VersionPrefix).0</FileVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="..\branding_Icon.png">
+            <Pack>True</Pack>
+            <PackagePath/>
+        </None>
+        <None Include="..\LICENSE.md">
+            <Pack>True</Pack>
+            <PackagePath/>
+        </None>
+        <None Include="..\README.md">
+            <Pack>True</Pack>
+            <PackagePath/>
+        </None>
+        <None Include="..\CHANGELOG.md">
+            <Pack>True</Pack>
+            <PackagePath/>
+        </None>
+    </ItemGroup>
+</Project>
diff --git a/X10D.DSharpPlus/X10D.DSharpPlus.csproj b/X10D.DSharpPlus/X10D.DSharpPlus.csproj
@@ -2,69 +2,11 @@
 
     <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
-        <LangVersion>11.0</LangVersion>
-        <Optimize>true</Optimize>
-        <ImplicitUsings>true</ImplicitUsings>
-        <Authors>Oliver Booth</Authors>
-        <NeutralLanguage>en</NeutralLanguage>
-        <RepositoryUrl>https://github.com/oliverbooth/X10D</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <Description>Extension methods on crack.</Description>
-        <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-        <PackageIcon>branding_Icon.png</PackageIcon>
-        <PackageIconUrl/>
-        <PackageTags>dotnet extension-methods</PackageTags>
-        <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
-        <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>4.0.0</VersionPrefix>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <ExcludeFromCodeCoverage>true</ExcludeFromCodeCoverage>
-        <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <DebugType>pdbonly</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix).$(BuildNumber)</Version>
-        <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' == ''">
-        <Version>$(VersionPrefix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="DSharpPlus" Version="4.3.0" PrivateAssets="All"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Include="..\branding_Icon.png">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\LICENSE.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\CHANGELOG.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-    </ItemGroup>
-
 </Project>
diff --git a/X10D.Hosting/X10D.Hosting.csproj b/X10D.Hosting/X10D.Hosting.csproj
@@ -2,68 +2,10 @@
 
     <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
-        <LangVersion>11.0</LangVersion>
-        <Optimize>true</Optimize>
-        <ImplicitUsings>true</ImplicitUsings>
-        <Authors>Oliver Booth</Authors>
-        <NeutralLanguage>en</NeutralLanguage>
-        <RepositoryUrl>https://github.com/oliverbooth/X10D</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <Description>Extension methods on crack.</Description>
-        <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-        <PackageIcon>branding_Icon.png</PackageIcon>
-        <PackageIconUrl/>
-        <PackageTags>dotnet extension-methods</PackageTags>
-        <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
-        <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>4.0.0</VersionPrefix>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <DebugType>pdbonly</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix).$(BuildNumber)</Version>
-        <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' == ''">
-        <Version>$(VersionPrefix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Include="..\branding_Icon.png">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\LICENSE.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\CHANGELOG.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-    </ItemGroup>
-
 </Project>
diff --git a/X10D.Tests/X10D.Tests.csproj b/X10D.Tests/X10D.Tests.csproj
@@ -2,12 +2,11 @@
 
     <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
-        <LangVersion>11.0</LangVersion>
         <IsPackable>false</IsPackable>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>true</ImplicitUsings>
         <CoverletOutputFormat>json,cobertura</CoverletOutputFormat>
         <CollectCoverage>true</CollectCoverage>
+        <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
+        <NoWarn>$(NoWarn);1591</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">

diff --git a/X10D.Unity/X10D.Unity.csproj b/X10D.Unity/X10D.Unity.csproj
@@ -2,49 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <LangVersion>11.0</LangVersion>
-        <Optimize>true</Optimize>
-        <ImplicitUsings>true</ImplicitUsings>
-        <Authors>Oliver Booth</Authors>
-        <NeutralLanguage>en</NeutralLanguage>
-        <RepositoryUrl>https://github.com/oliverbooth/X10D</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <Description>Extension methods on crack.</Description>
-        <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-        <PackageIcon>branding_Icon.png</PackageIcon>
-        <PackageIconUrl/>
-        <PackageTags>dotnet extension-methods</PackageTags>
-        <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
-        <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>4.0.0</VersionPrefix>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <DebugType>pdbonly</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix).$(BuildNumber)</Version>
-        <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' == ''">
-        <Version>$(VersionPrefix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -55,21 +12,6 @@
         <ProjectReference Include="..\X10D\X10D.csproj"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Include="..\branding_Icon.png">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\LICENSE.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\CHANGELOG.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-    </ItemGroup>
-
     <ItemGroup>
         <EmbeddedResource Update="src\ExceptionMessages.resx">
             <Generator>ResXFileCodeGenerator</Generator>

diff --git a/X10D.sln b/X10D.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		branding_Icon.png = branding_Icon.png
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceValidator", "tools\SourceValidator\SourceValidator.csproj", "{84750149-9068-4780-AFDE-CDA1AC57007D}"

diff --git a/X10D/X10D.csproj b/X10D/X10D.csproj
@@ -2,71 +2,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
-        <LangVersion>11.0</LangVersion>
-        <Optimize>true</Optimize>
-        <ImplicitUsings>true</ImplicitUsings>
-        <Authors>Oliver Booth</Authors>
-        <NeutralLanguage>en</NeutralLanguage>
-        <RepositoryUrl>https://github.com/oliverbooth/X10D</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <Description>Extension methods on crack.</Description>
-        <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-        <PackageIcon>branding_Icon.png</PackageIcon>
-        <PackageIconUrl/>
-        <PackageTags>dotnet extension-methods</PackageTags>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-        <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
-        <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>4.0.0</VersionPrefix>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <DebugType>pdbonly</DebugType>
-        <DebugSymbols>true</DebugSymbols>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
-        <Version>$(VersionPrefix)-$(VersionSuffix).$(BuildNumber)</Version>
-        <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VersionSuffix)' == ''">
-        <Version>$(VersionPrefix)</Version>
-        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-        <FileVersion>$(VersionPrefix).0</FileVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="..\branding_Icon.png">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\LICENSE.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\README.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-        <None Include="..\CHANGELOG.md">
-            <Pack>True</Pack>
-            <PackagePath/>
-        </None>
-    </ItemGroup>
-
     <ItemGroup>
         <Compile Update="src\ExceptionMessages.Designer.cs">
             <DesignTime>True</DesignTime>