Fixes #50 Set version once as full verison string

Kieranties · Feb 8, 2019 · af1d471 · af1d471
1 parent 590ad9d
commit af1d471
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,6 @@
   <PropertyGroup Label="Local build version">
     <Version Condition="'$(Version)' == ''">1.0.0</Version>
     <PackageVersion>$(Version)</PackageVersion>
-    <PackageVersion Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="All package targets">

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -44,10 +44,7 @@ jobs:
       Write-Output $result
       $fullVersion = ($result | ConvertFrom-Json).Formats.Semver2
       Write-Output "##vso[build.updatebuildnumber]$fullVersion"
-      if($fullVersion -match '(?<version>\d+\.\d+\.\d+(?:\.\d+)?)-?(?<suffix>.*)') {
-        Write-Output "##vso[task.setvariable variable=Version;]$($Matches.version)"
-        Write-Output "##vso[task.setvariable variable=VersionSuffix;]$($Matches.suffix)"
-      }
+      Write-Output "##vso[task.setvariable variable=Version;]$fullVersion"
     displayName: 'Prepare: Set version information'
 
   # Build/Pack the assets