From c32bcb90f0478627e3fa02d30a56683d2652c9a6 Mon Sep 17 00:00:00 2001 From: EEParker Date: Fri, 5 Apr 2024 14:04:17 -0500 Subject: [PATCH 1/5] Create a common.props for version number and nuget package info. --- serilog-sinks-splunk.sln | 3 ++- .../Serilog.Sinks.Splunk.csproj | 15 ++++---------- .../Serilog.Sinks.Splunk.TCP.csproj | 11 ++-------- .../Serilog.Sinks.Splunk.UDP.csproj | 16 ++------------- src/common.props | 20 +++++++++++++++++++ 5 files changed, 30 insertions(+), 35 deletions(-) create mode 100644 src/common.props diff --git a/serilog-sinks-splunk.sln b/serilog-sinks-splunk.sln index 360a961..b1c91dd 100644 --- 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 index c8a6dfb..709902a 100644 --- a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj +++ b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj @@ -1,28 +1,21 @@ - + + + The Splunk Sink for Serilog - 4.0.1 - Matthew Erbs, Serilog Contributors netstandard2.1;netstandard2.0;net6.0;net8.0 true Serilog.Sinks.Splunk Serilog.Sinks.Splunk serilog;splunk;logging;event;collector;hec - http://serilog.net/images/serilog-sink-nuget.png - https://github.com/serilog/serilog-sinks-splunk - http://www.apache.org/licenses/LICENSE-2.0 - https://github.com/serilog/serilog-sinks-splunk - git ../../assets/Serilog.snk true true - true Serilog - latest true README.md - Apache-2.0 + true diff --git a/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj b/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj index fb9b609..07db1ab 100644 --- a/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj +++ b/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj @@ -1,25 +1,18 @@  + + The Splunk TCP Sink for Serilog - 4.0.1 - Matthew Erbs, Serilog Contributors netstandard2.1;netstandard2.0 - true Serilog.Sinks.Splunk.TCP Serilog.Sinks.Splunk.TCP serilog;splunk;logging;tcp - http://serilog.net/images/serilog-sink-nuget.png - https://github.com/serilog/serilog-sinks-splunk - http://www.apache.org/licenses/LICENSE-2.0 - https://github.com/serilog/serilog-sinks-splunk - git ../../assets/Serilog.snk true true true README.md - Apache-2.0 diff --git a/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj b/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj index 5640310..570b879 100644 --- a/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj +++ b/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj @@ -1,31 +1,19 @@  + + The Splunk UDP Sink for Serilog - 4.0.1 - Matthew Erbs, Serilog Contributors netstandard2.1;netstandard2.0 true Serilog.Sinks.Splunk.UDP Serilog.Sinks.Splunk.UDP serilog;splunk;logging;udp - http://serilog.net/images/serilog-sink-nuget.png - https://github.com/serilog/serilog-sinks-splunk - http://www.apache.org/licenses/LICENSE-2.0 - https://github.com/serilog/serilog-sinks-splunk - git - ../../assets/Serilog.snk true true true - README.md - Apache-2.0 - - - - diff --git a/src/common.props b/src/common.props new file mode 100644 index 0000000..2f8ef9a --- /dev/null +++ b/src/common.props @@ -0,0 +1,20 @@ + + + + 4.0.2 + debug + Matthew Erbs, Serilog Contributors + true + http://serilog.net/images/serilog-sink-nuget.png + https://github.com/serilog/serilog-sinks-splunk + http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/serilog/serilog-sinks-splunk + git + latest + Apache-2.0 + README.md + + + + + \ No newline at end of file From 7adaca6d6f31caf6c14e66a27a34c533fd1eaef9 Mon Sep 17 00:00:00 2001 From: EEParker Date: Fri, 5 Apr 2024 14:08:55 -0500 Subject: [PATCH 2/5] Add back missing prop --- src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj b/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj index 570b879..9e4dc60 100644 --- a/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj +++ b/src/Serilog.Sinks.UDP/Serilog.Sinks.Splunk.UDP.csproj @@ -10,6 +10,7 @@ Serilog.Sinks.Splunk.UDP serilog;splunk;logging;udp true + ../../assets/Serilog.snk true true From 72b0996e9d679567225f88cf8563b2fdc80dd51f Mon Sep 17 00:00:00 2001 From: EEParker Date: Fri, 5 Apr 2024 14:10:47 -0500 Subject: [PATCH 3/5] Fix for readme file include in nupkg --- src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj | 5 ----- src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj index 709902a..b6905c0 100644 --- a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj +++ b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj @@ -14,14 +14,9 @@ true Serilog true - README.md true - - - - diff --git a/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj b/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj index 07db1ab..7b35ce3 100644 --- a/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj +++ b/src/Serilog.Sinks.TCP/Serilog.Sinks.Splunk.TCP.csproj @@ -12,13 +12,8 @@ true true true - README.md - - - - From 3aa620b1f340eaba5e4e850a9ecf1b42d4332a61 Mon Sep 17 00:00:00 2001 From: EEParker Date: Fri, 5 Apr 2024 14:16:20 -0500 Subject: [PATCH 4/5] Filter build script to directories only --- Build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build.ps1 b/Build.ps1 index 9428942..0ca7d80 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -26,7 +26,7 @@ Write-Output "build: Revision: $revision" Write-Output "build: VersionPrefix: $prefix" Write-Output "build: VersionSuffix: $suffix" -foreach ($src in Get-ChildItem src/*) { +foreach ($src in Get-ChildItem src/* -Directory) { Push-Location $src Write-Output "build: Packaging project in $src" From 84f72723dd336ed77e892c56f1de08a7d7c2a857 Mon Sep 17 00:00:00 2001 From: EEParker Date: Fri, 5 Apr 2024 14:19:01 -0500 Subject: [PATCH 5/5] Enable all samples --- sample/Sample/Program.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/sample/Sample/Program.cs b/sample/Sample/Program.cs index 2038e5b..81cf284 100644 --- a/sample/Sample/Program.cs +++ b/sample/Sample/Program.cs @@ -58,8 +58,6 @@ public static async Task Main(string[] args) logger.Information("Creating logger {MethodName}.", nameof(ReproduceGitHubIssue183)); ReproduceGitHubIssue183(); - return; - logger.Information("Creating logger {MethodName}.", nameof(OverridingSubsecondPrecisionMicroseconds)); OverridingSubsecondPrecisionMicroseconds(eventsToCreate);