Create a common.props for version number and nuget package info.

serilog-contrib · Apr 5, 2024 · c32bcb9 · c32bcb9
1 parent ae00946
commit c32bcb9
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 35 deletions.
diff --git a/serilog-sinks-splunk.sln b/serilog-sinks-splunk.sln
@@ -10,9 +10,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{B9B133
 		.editorconfig = .editorconfig
 		Build.ps1 = Build.ps1
 		CHANGES.md = CHANGES.md
+		src\common.props = src\common.props
+		global.json = global.json
 		README.md = README.md
 		assets\Serilog.snk = assets\Serilog.snk
-		global.json = global.json
 		Setup.ps1 = Setup.ps1
 	EndProjectSection
 EndProject

diff --git a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj
@@ -1,28 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../common.props"/>
+
   <PropertyGroup>
     <Description>The Splunk Sink for Serilog</Description>
-    <VersionPrefix>4.0.1</VersionPrefix>
-    <Authors>Matthew Erbs, Serilog Contributors</Authors>
     <TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Sinks.Splunk</AssemblyName>
     <PackageId>Serilog.Sinks.Splunk</PackageId>
     <PackageTags>serilog;splunk;logging;event;collector;hec</PackageTags>
-    <icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
-    <PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
-    <license>http://www.apache.org/licenses/LICENSE-2.0</license>
-    <RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <SignAssembly>true</SignAssembly>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>Serilog</RootNamespace>
-	  <LangVersion>latest</LangVersion>
     <IsPackable>true</IsPackable>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj b/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj
@@ -1,25 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../common.props"/>
+
   <PropertyGroup>
     <Description>The Splunk TCP Sink for Serilog</Description>
-    <VersionPrefix>4.0.1</VersionPrefix>
-    <Authors>Matthew Erbs, Serilog Contributors</Authors>
     <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Sinks.Splunk.TCP</AssemblyName>
     <PackageId>Serilog.Sinks.Splunk.TCP</PackageId>
     <PackageTags>serilog;splunk;logging;tcp</PackageTags>
-    <icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
-    <PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
-    <license>http://www.apache.org/licenses/LICENSE-2.0</license>
-    <RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <SignAssembly>true</SignAssembly>
     <IsPackable>true</IsPackable>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj b/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj
@@ -1,31 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../common.props" />
+
   <PropertyGroup>
     <Description>The Splunk UDP Sink for Serilog</Description>
-    <VersionPrefix>4.0.1</VersionPrefix>
-    <Authors>Matthew Erbs, Serilog Contributors</Authors>
     <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Sinks.Splunk.UDP</AssemblyName>
     <PackageId>Serilog.Sinks.Splunk.UDP</PackageId>
     <PackageTags>serilog;splunk;logging;udp</PackageTags>
-    <icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
-    <PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
-    <license>http://www.apache.org/licenses/LICENSE-2.0</license>
-    <RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <SignAssembly>true</SignAssembly>
     <IsPackable>true</IsPackable>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
   </PropertyGroup>
 
-  <ItemGroup>
-      <None Include="../../README.md" Pack="true" PackagePath="\"/>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.Splunk" Version="4.0.0" />
   </ItemGroup>

diff --git a/src/common.props b/src/common.props
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">4.0.2</VersionPrefix>
+    <VersionSuffix Condition="$(VersionSuffix) == '' and '$(Configuration)' == 'Debug' ">debug</VersionSuffix>
+    <Authors>Matthew Erbs, Serilog Contributors</Authors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
+    <PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
+    <license>http://www.apache.org/licenses/LICENSE-2.0</license>
+    <RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <LangVersion>latest</LangVersion>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="../../README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+</Project>