From 47a7a4bcf1a6a8a5c3eb4b8d73fae200b8520cee Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Thu, 1 Feb 2018 20:15:31 -0500 Subject: [PATCH] Auto versioning with NB.GV --- Ben.Demystifier.sln | 10 +++++++++- build.ps1 | 7 +------ src/Ben.Demystifier/Ben.Demystifier.csproj | 5 +++-- version.json | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 version.json diff --git a/Ben.Demystifier.sln b/Ben.Demystifier.sln index dbecaf3..2cf7ecd 100644 --- a/Ben.Demystifier.sln +++ b/Ben.Demystifier.sln @@ -13,7 +13,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ben.Demystifier.Test", "tes EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{455921D3-DD54-4355-85CF-F4009DF2AB70}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackTrace", "sample\StackTrace\StackTrace.csproj", "{E161FC12-53C2-47CD-A5FC-3684B86723A9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackTrace", "sample\StackTrace\StackTrace.csproj", "{E161FC12-53C2-47CD-A5FC-3684B86723A9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5937ACDF-0059-488E-9604-D84689C72933}" + ProjectSection(SolutionItems) = preProject + appveyor.yml = appveyor.yml + build.ps1 = build.ps1 + directory.build.props = directory.build.props + version.json = version.json + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build.ps1 b/build.ps1 index d0bacc3..7b5ffcc 100644 --- a/build.ps1 +++ b/build.ps1 @@ -22,11 +22,6 @@ function Exec if(Test-Path .\artifacts) { Remove-Item .\artifacts -Force -Recurse } -exec { & dotnet restore } - -$revision = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL]; -$revision = "{0:D4}" -f [convert]::ToInt32($revision, 10) - exec { & dotnet test .\test\Ben.Demystifier.Test -c Release } -exec { & dotnet pack .\src\Ben.Demystifier -c Release -o .\artifacts --version-suffix=$revision } \ No newline at end of file +exec { & dotnet pack .\src\Ben.Demystifier -c Release -o .\artifacts } diff --git a/src/Ben.Demystifier/Ben.Demystifier.csproj b/src/Ben.Demystifier/Ben.Demystifier.csproj index 641ce7c..9ab49a6 100644 --- a/src/Ben.Demystifier/Ben.Demystifier.csproj +++ b/src/Ben.Demystifier/Ben.Demystifier.csproj @@ -9,9 +9,8 @@ https://github.com/benaadams/Ben.Demystifier https://github.com/benaadams/Ben.Demystifier/blob/master/LICENSE git - true true - 0.0.7 + embedded @@ -19,6 +18,8 @@ + + 1.5.0 diff --git a/version.json b/version.json new file mode 100644 index 0000000..86532f5 --- /dev/null +++ b/version.json @@ -0,0 +1,17 @@ +{ + "version": "0.0", + "publicReleaseRefSpec": [ + "^refs/heads/master$", // we release out of master + "^refs/heads/dev$", // we release out of develop + "^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N + ], + "nugetPackageVersion":{ + "semVer": 2 + }, + "cloudBuild": { + "buildNumber": { + "enabled": true, + "setVersionVariables": true + } + } +}