From c45d59268b54cc11be5b2ff7bdf064e6cbbc0f47 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Wed, 13 Sep 2017 10:12:10 +1000 Subject: [PATCH 1/4] Minor Doco updates [Skip CI] --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 9434222..a25a89d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,5 @@ ## 2.4.0 -- [#62](https://github.com/serilog/serilog-sinks-splunk/issues/62) Default fields added by serilog to splunk +- [#62](https://github.com/serilog/serilog-sinks-splunk/issues/62) Default fields added by Serilog to splunk - [#63](https://github.com/serilog/serilog-sinks-splunk/issues/63) Possible thread leak when ILogger instances are disposed ## 2.3.0 From 94098bfc918224255f7185bc67949ffe162f31d5 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Wed, 13 Sep 2017 10:44:20 +1000 Subject: [PATCH 2/4] Corrected order of build badges for AppVeyor --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5f3aa74..396d90f 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ More information is available on the [wiki](https://github.com/serilog/serilog-s Branch | AppVeyor | Travis ------------- | ------------- |------------- -master | [![Build status](https://ci.appveyor.com/api/projects/status/yt40wg34t8oj61al/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-splunk/branch/dev) | ![](https://travis-ci.org/serilog/serilog-sinks-splunk.svg?branch=master) -dev | [![Build status](https://ci.appveyor.com/api/projects/status/yt40wg34t8oj61al/branch/dev?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-splunk/branch/master) | ![](https://travis-ci.org/serilog/serilog-sinks-splunk.svg?branch=dev) +master | [![Build status](https://ci.appveyor.com/api/projects/status/yt40wg34t8oj61al/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-splunk/branch/master) | ![](https://travis-ci.org/serilog/serilog-sinks-splunk.svg?branch=master) +dev | [![Build status](https://ci.appveyor.com/api/projects/status/yt40wg34t8oj61al/branch/dev?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-splunk/branch/dev) | ![](https://travis-ci.org/serilog/serilog-sinks-splunk.svg?branch=dev) -_Serilog is copyright © 2013-2016 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html). Needle and thread logo a derivative of work by [Kenneth Appiah](http://www.kensets.com/)._ \ No newline at end of file +_Serilog is copyright © 2013-2016 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html). Needle and thread logo a derivative of work by [Kenneth Appiah](http://www.kensets.com/)._ From 466999c964a05da88ab0fe07828bee992d6a1646 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Wed, 13 Sep 2017 12:39:31 +1000 Subject: [PATCH 3/4] Bump version 2.4.0 due to binary changes. --- src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj index 322d1c9..f18aaa6 100644 --- a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj +++ b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj @@ -2,7 +2,7 @@ The Splunk Sink for Serilog - 2.3.1 + 2.4.0 Matthew Erbs, Serilog Contributors net45;netstandard1.1;netstandard1.3 true From c3090fcde5f0c777e67cf5f62ef134566776d770 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Wed, 13 Sep 2017 13:33:52 +1000 Subject: [PATCH 4/4] Ignore suffix when packaging master. --- Build.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Build.ps1 b/Build.ps1 index 0398317..5909a97 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -25,7 +25,11 @@ foreach ($src in ls src/*) { echo "build: Packaging project in $src" & dotnet build -c Release --version-suffix=$buildSuffix - & dotnet pack -c Release --include-symbols -o ..\..\artifacts --version-suffix=$suffix --no-build + if ($suffix) { + & dotnet pack -c Release --include-symbols -o ..\..\artifacts --version-suffix=$suffix --no-build + } else { + & dotnet pack -c Release --include-symbols -o ..\..\artifacts --no-build + } if($LASTEXITCODE -ne 0) { exit 1 } Pop-Location