Merge pull request #104 from ManticSic/feature/99/nightly

Fix an issue with versioning

.github/workflows/nightly.yml

@@ -29,22 +29,27 @@ jobs:
         if: success()
         run: .\build\precondition.ps1
 
+      - name: Setup MSBuild
+        uses: warrenbuckley/Setup-MSBuild@v1
+
+      - name: Setup Nuget
+        uses: warrenbuckley/Setup-Nuget@v1
+
+      - name: Setup SemVer
+        run: |
+          nuget install semver -Version 2.0.6
+        
       - name: Setup Environment Variables
         run: |
-          $CurrentVersion = .\build\get-version.ps1
-          $NupkgFileName = "${env:PACKAGE_ID}.${CurrentVersion}.nupkg"
+          Add-Type -Path .\Semver.2.0.6\lib\netstandard1.1\Semver.dll
+          $Version = .\build\get-version.ps1
+          $NupkgFileName = "${env:PACKAGE_ID}.${Version}.nupkg"
           $NupkgFile = ".\build\packages\${NupkgFileName}"
-          $TagName = "v${CurrentVersion}_nightly"
-          echo "::set-env name=VERSION::$CurrentVersion"
+          $TagName = "v${Version}"
+          echo "::set-env name=VERSION::$Version"
           echo "::set-env name=NUPKG_FILE_NAME::$NupkgFileName"
           echo "::set-env name=NUPKG_FILE::$NupkgFile"
           echo "::set-env name=TAG_NAME::$TagName"
-        
-      - name: Setup MSBuild
-        uses: warrenbuckley/Setup-MSBuild@v1
-
-      - name: Setup Nuget
-        uses: warrenbuckley/Setup-Nuget@v1
       
       - name: Build
         if: success()
@@ -54,7 +59,7 @@ jobs:
 
       - name: Pack
         if: success()
-        run: nuget pack .\build\ExceptionalDevs.Exceptional.nuspec -OutputDirectory .\build\packages -properties "PackageId=${env:PACKAGE_ID};PackageTitle=${env:PACKAGE_TITLE}"
+        run: nuget pack .\build\ExceptionalDevs.Exceptional.nuspec -OutputDirectory .\build\packages -properties "PackageId=${env:PACKAGE_ID};PackageTitle=${env:PACKAGE_TITLE}" -Version ${env:VERSION}
 
       - name: Release
         id: create_release
@@ -81,10 +86,6 @@ jobs:
       - name: Update nightly.rev
         if: success()
         run: .\build\update-nightly-rev.ps1
-
-      - name: Increment Version
-        if: success()
-        run: .\build\increment-version.ps1 0.0.0.1
 
       - name: Add & Commit
         if: success()

build/ExceptionalDevs.Exceptional.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>$PackageId$</id>
-    <version>0.22.0.0</version>
+    <version>0.22.0</version>
     <title>$PackageTitle$</title>
     <description>Analyzes thrown and documented C# exceptions and suggests improvements. </description>
     <authors>ExceptionalDevs</authors>

build/get-version.ps1

@@ -2,6 +2,14 @@ $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
 $NuspecFile = Join-Path -Path $ScriptDir -ChildPath ExceptionalDevs.Exceptional.nuspec
 
 $Xml = [xml](Get-Content $NuspecFile)
-$Version = New-Object -TypeName Version -ArgumentList $Xml.package.metadata.version
+$Version = [Semver.SemVersion]::Parse($Xml.package.metadata.version)
+
+$DateString = Get-Date -Format "yyyyMMddhhmm"
+$PrereleaseVersion = "nightly"
+
+$Version = $Version.Change($null, $null, $null, $PrereleaseVersion, $DateString)
+
+# nuget does only support semver 1.0.0, not semver 2.0.0
+$Version = ([string]$Version.ToString()).Replace("+", ".")
 
 return $Version

build/install-semver.ps1

@@ -0,0 +1,2 @@
+nuget install semver
+Add-Type -Path C:\Users\Darius\.nuget\packages\semver\2.0.6\lib\netstandard1.1\Semver.dll

build/nightly.rev

@@ -1 +0,0 @@
-6dc4e5f6f26cd605b8a7cff0788ca6b8b8489136