From 49a5651cb8a31673035503d2e30449b4d65c568b Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Sat, 20 May 2017 15:13:32 +1000 Subject: [PATCH 1/3] Specific target of Sample and exit on error --- Build.ps1 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Build.ps1 b/Build.ps1 index 1a93b9d..0398317 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -1,3 +1,4 @@ +$ErrorActionPreference = "Stop" echo "build: Build started" Push-Location $PSScriptRoot @@ -41,15 +42,6 @@ foreach ($test in ls test/*.Tests) { Pop-Location } -foreach ($test in ls sample/Sample) { - Push-Location $test - - echo "build: Building performance test project in $test" - - & dotnet build -c Release - if($LASTEXITCODE -ne 0) { exit 2 } - - Pop-Location -} +dotnet build -c Release .\sample\Sample\Sample.csproj Pop-Location From 6518de7ab2bb5336d0ae9d49fbb44f05cad9edb9 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Sat, 20 May 2017 15:36:36 +1000 Subject: [PATCH 2/3] Added version suffix to csproj --- 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 547174d..3af454a 100644 --- a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj +++ b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj @@ -13,7 +13,7 @@ https://github.com/serilog/serilog-sinks-splunk http://www.apache.org/licenses/LICENSE-2.0 false - 2.2.0 + 2.2.0$(VersionSuffix) From ef2eb431d94c2140c55a7cbca15118ce884f84bb Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Sun, 21 May 2017 07:52:02 +1000 Subject: [PATCH 3/3] Added hypen for local and dev build --- Build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build.ps1 b/Build.ps1 index 0398317..18f09c5 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 ""]