Skip to content

Commit 96af969

Browse files
EEParkerEEParker
authored
Create a common.props for version number and nuget package info. (#186)
* Create a common.props for version number and nuget package info. * Add back missing prop * Fix for readme file include in nupkg * Filter build script to directories only * Enable all samples
1 parent ae00946 commit 96af969

File tree

7 files changed

+32
-48
lines changed

7 files changed

+32
-48
lines changed

‎Build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Write-Output "build: Revision: $revision"
2626
Write-Output "build: VersionPrefix: $prefix"
2727
Write-Output "build: VersionSuffix: $suffix"
2828

29-
foreach ($src in Get-ChildItem src/*) {
29+
foreach ($src in Get-ChildItem src/* -Directory) {
3030
Push-Location $src
3131

3232
Write-Output "build: Packaging project in $src"

‎sample/Sample/Program.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public static async Task Main(string[] args)
5858
logger.Information("Creating logger {MethodName}.", nameof(ReproduceGitHubIssue183));
5959
ReproduceGitHubIssue183();
6060

61-
return;
62-
6361
logger.Information("Creating logger {MethodName}.", nameof(OverridingSubsecondPrecisionMicroseconds));
6462
OverridingSubsecondPrecisionMicroseconds(eventsToCreate);
6563

‎serilog-sinks-splunk.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{B9B133
1010
.editorconfig = .editorconfig
1111
Build.ps1 = Build.ps1
1212
CHANGES.md = CHANGES.md
13+
src\common.props = src\common.props
14+
global.json = global.json
1315
README.md = README.md
1416
assets\Serilog.snk = assets\Serilog.snk
15-
global.json = global.json
1617
Setup.ps1 = Setup.ps1
1718
EndProjectSection
1819
EndProject

‎src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="../common.props"/>
4+
35
<PropertyGroup>
46
<Description>The Splunk Sink for Serilog</Description>
5-
<VersionPrefix>4.0.1</VersionPrefix>
6-
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net8.0</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<AssemblyName>Serilog.Sinks.Splunk</AssemblyName>
1010
<PackageId>Serilog.Sinks.Splunk</PackageId>
1111
<PackageTags>serilog;splunk;logging;event;collector;hec</PackageTags>
12-
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
13-
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
14-
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
15-
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
16-
<RepositoryType>git</RepositoryType>
1712
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
1813
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1914
<SignAssembly>true</SignAssembly>
20-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2115
<RootNamespace>Serilog</RootNamespace>
22-
<LangVersion>latest</LangVersion>
2316
<IsPackable>true</IsPackable>
24-
<PackageReadmeFile>README.md</PackageReadmeFile>
25-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2618
</PropertyGroup>
2719

28-
<ItemGroup>
29-
<None Include="../../README.md" Pack="true" PackagePath="\"/>
30-
</ItemGroup>
31-
3220
<ItemGroup>
3321
<PackageReference Include="Serilog" Version="3.1.1" />
3422
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="4.0.1" />

‎src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="../common.props"/>
4+
35
<PropertyGroup>
46
<Description>The Splunk TCP Sink for Serilog</Description>
5-
<VersionPrefix>4.0.1</VersionPrefix>
6-
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
8-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
98
<AssemblyName>Serilog.Sinks.Splunk.TCP</AssemblyName>
109
<PackageId>Serilog.Sinks.Splunk.TCP</PackageId>
1110
<PackageTags>serilog;splunk;logging;tcp</PackageTags>
12-
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
13-
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
14-
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
15-
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
16-
<RepositoryType>git</RepositoryType>
1711
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
1812
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1913
<SignAssembly>true</SignAssembly>
2014
<IsPackable>true</IsPackable>
21-
<PackageReadmeFile>README.md</PackageReadmeFile>
22-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2315
</PropertyGroup>
2416

25-
<ItemGroup>
26-
<None Include="../../README.md" Pack="true" PackagePath="\"/>
27-
</ItemGroup>
28-
2917
<ItemGroup>
3018
<PackageReference Include="Serilog.Sinks.Splunk" Version="4.0.0" />
3119
<PackageReference Include="Splunk.Logging.Common.Core" Version="1.0.0" />

‎src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="../common.props" />
4+
35
<PropertyGroup>
46
<Description>The Splunk UDP Sink for Serilog</Description>
5-
<VersionPrefix>4.0.1</VersionPrefix>
6-
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<AssemblyName>Serilog.Sinks.Splunk.UDP</AssemblyName>
1010
<PackageId>Serilog.Sinks.Splunk.UDP</PackageId>
1111
<PackageTags>serilog;splunk;logging;udp</PackageTags>
12-
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
13-
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
14-
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
15-
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
16-
<RepositoryType>git</RepositoryType>
17-
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
1812
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
13+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
1914
<SignAssembly>true</SignAssembly>
2015
<IsPackable>true</IsPackable>
21-
<PackageReadmeFile>README.md</PackageReadmeFile>
22-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2316
</PropertyGroup>
2417

25-
<ItemGroup>
26-
<None Include="../../README.md" Pack="true" PackagePath="\"/>
27-
</ItemGroup>
28-
2918
<ItemGroup>
3019
<PackageReference Include="Serilog.Sinks.Splunk" Version="4.0.0" />
3120
</ItemGroup>

‎src/common.props‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">4.0.2</VersionPrefix>
5+
<VersionSuffix Condition="$(VersionSuffix) == '' and '$(Configuration)' == 'Debug' ">debug</VersionSuffix>
6+
<Authors>Matthew Erbs, Serilog Contributors</Authors>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<icon>http://serilog.net/images/serilog-sink-nuget.png</icon>
9+
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-splunk</PackageProjectUrl>
10+
<license>http://www.apache.org/licenses/LICENSE-2.0</license>
11+
<RepositoryUrl>https://github.com/serilog/serilog-sinks-splunk</RepositoryUrl>
12+
<RepositoryType>git</RepositoryType>
13+
<LangVersion>latest</LangVersion>
14+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
15+
<PackageReadmeFile>README.md</PackageReadmeFile>
16+
</PropertyGroup>
17+
<ItemGroup>
18+
<None Include="../../README.md" Pack="true" PackagePath="\" />
19+
</ItemGroup>
20+
</Project>

0 commit comments

Comments
 (0)