Skip to content

Commit 0437723

Browse files
committed
Fix an issue with versioning
- use semver 1.0.0
1 parent ac02d24 commit 0437723

6 files changed

+28
-37
lines changed

.github/workflows/nightly.yml

+16-15
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,27 @@ jobs:
2929
if: success()
3030
run: .\build\precondition.ps1
3131

32+
- name: Setup MSBuild
33+
uses: warrenbuckley/Setup-MSBuild@v1
34+
35+
- name: Setup Nuget
36+
uses: warrenbuckley/Setup-Nuget@v1
37+
38+
- name: Setup SemVer
39+
run: |
40+
nuget install semver -Version 2.0.6
41+
3242
- name: Setup Environment Variables
3343
run: |
34-
$CurrentVersion = .\build\get-version.ps1
35-
$NupkgFileName = "${env:PACKAGE_ID}.${CurrentVersion}.nupkg"
44+
Add-Type -Path .\Semver.2.0.6\lib\netstandard1.1\Semver.dll
45+
$Version = .\build\get-version.ps1
46+
$NupkgFileName = "${env:PACKAGE_ID}.${Version}.nupkg"
3647
$NupkgFile = ".\build\packages\${NupkgFileName}"
37-
$TagName = "v${CurrentVersion}_nightly"
38-
echo "::set-env name=VERSION::$CurrentVersion"
48+
$TagName = "v${Version}"
49+
echo "::set-env name=VERSION::$Version"
3950
echo "::set-env name=NUPKG_FILE_NAME::$NupkgFileName"
4051
echo "::set-env name=NUPKG_FILE::$NupkgFile"
4152
echo "::set-env name=TAG_NAME::$TagName"
42-
43-
- name: Setup MSBuild
44-
uses: warrenbuckley/Setup-MSBuild@v1
45-
46-
- name: Setup Nuget
47-
uses: warrenbuckley/Setup-Nuget@v1
4853
4954
- name: Build
5055
if: success()
@@ -54,7 +59,7 @@ jobs:
5459
5560
- name: Pack
5661
if: success()
57-
run: nuget pack .\build\ExceptionalDevs.Exceptional.nuspec -OutputDirectory .\build\packages -properties "PackageId=${env:PACKAGE_ID};PackageTitle=${env:PACKAGE_TITLE}"
62+
run: nuget pack .\build\ExceptionalDevs.Exceptional.nuspec -OutputDirectory .\build\packages -properties "PackageId=${env:PACKAGE_ID};PackageTitle=${env:PACKAGE_TITLE}" -Version ${env:VERSION}
5863

5964
- name: Release
6065
id: create_release
@@ -81,10 +86,6 @@ jobs:
8186
- name: Update nightly.rev
8287
if: success()
8388
run: .\build\update-nightly-rev.ps1
84-
85-
- name: Increment Version
86-
if: success()
87-
run: .\build\increment-version.ps1 0.0.0.1
8889

8990
- name: Add & Commit
9091
if: success()

build/ExceptionalDevs.Exceptional.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>$PackageId$</id>
5-
<version>0.22.0.0</version>
5+
<version>0.22.0</version>
66
<title>$PackageTitle$</title>
77
<description>Analyzes thrown and documented C# exceptions and suggests improvements. </description>
88
<authors>ExceptionalDevs</authors>

build/get-version.ps1

+9-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
22
$NuspecFile = Join-Path -Path $ScriptDir -ChildPath ExceptionalDevs.Exceptional.nuspec
33

44
$Xml = [xml](Get-Content $NuspecFile)
5-
$Version = New-Object -TypeName Version -ArgumentList $Xml.package.metadata.version
5+
$Version = [Semver.SemVersion]::Parse($Xml.package.metadata.version)
6+
7+
$DateString = Get-Date -Format "yyyyMMddhhmm"
8+
$PrereleaseVersion = "nightly"
9+
10+
$Version = $Version.Change($null, $null, $null, $PrereleaseVersion, $DateString)
11+
12+
# nuget does only support semver 1.0.0, not semver 2.0.0
13+
$Version = ([string]$Version.ToString()).Replace("+", ".")
614

715
return $Version

build/increment-version.ps1

-19
This file was deleted.

build/install-semver.ps1

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

build/nightly.rev

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
6dc4e5f6f26cd605b8a7cff0788ca6b8b8489136

0 commit comments

Comments
 (0)