From e6d3ed0ca6a53587a7c3f1ee75d07180ef401fcb Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Sun, 21 May 2017 08:12:16 +1000 Subject: [PATCH 1/2] Changed to VS2017 AppVeyor image. --- appveyor.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d860077..467d351 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,7 @@ version: '{build}' skip_tags: true -image: Visual Studio 2015 +image: Visual Studio 2017 configuration: Release -install: - - ps: mkdir -Force ".\build\" | Out-Null - - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1" - - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli" - - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.1' - - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" build_script: - ps: ./Build.ps1 test: off From 40eade0b28819ae4df12a42f356473d68e4d106c Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Sun, 21 May 2017 08:43:15 +1000 Subject: [PATCH 2/2] Reverted build change to use VersionPrefix * Inconisent approaches in the Sinks. Appears that version prefix and build script is best approach. --- Build.ps1 | 2 +- src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Build.ps1 b/Build.ps1 index 18f09c5..0398317 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -12,7 +12,7 @@ if(Test-Path .\artifacts) { $branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL]; $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL]; -$suffix = @{ $true = ""; $false = "-$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"] +$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"] $commitHash = $(git rev-parse --short HEAD) $buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""] diff --git a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj index 3af454a..9bd4f46 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.1.3 + 2.2.0 Matthew Erbs, Serilog Contributors net45;netstandard1.1 true @@ -13,7 +13,6 @@ https://github.com/serilog/serilog-sinks-splunk http://www.apache.org/licenses/LICENSE-2.0 false - 2.2.0$(VersionSuffix)