Update Package.props

ektrah · May 8, 2018 · 307f1b9 · 307f1b9
1 parent c7c26c7
commit 307f1b9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/build/Package.props b/build/Package.props
@@ -16,18 +16,18 @@
     <GitPullRequest>$(CIRCLE_PR_NUMBER)</GitPullRequest>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Version Condition="'$(Version)' == ''">$([System.DateTime]::UtcNow.ToString(y.M.0))-preview3</Version>
-  </PropertyGroup>
-
   <PropertyGroup>
     <BuildNumberMajor>$([MSBuild]::Add($([MSBuild]::Multiply(100, $([MSBuild]::Add($([MSBuild]::Multiply(12, $([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 1996)))), $([MSBuild]::Subtract($([System.DateTime]::UtcNow.Month), 4)))))), $([System.DateTime]::UtcNow.Day)).ToString('00000'))</BuildNumberMajor>
     <BuildNumberMinor>$([MSBuild]::Divide($([MSBuild]::Add($([MSBuild]::Multiply(60, $([System.DateTime]::UtcNow.Hour))), $([System.DateTime]::UtcNow.Minute))), 15).ToString('00'))</BuildNumberMinor>
-    <Version Condition="$(Version.Contains('-preview'))">$(Version)-$(BuildNumberMajor)-$(BuildNumberMinor)</Version>
     <IsPackable Condition="'$(GitBranch)' != '' and '$(GitBranch)' != 'master'">false</IsPackable>
     <IsPackable Condition="'$(GitPullRequest)' != ''">false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Version Condition="'$(Version)' == ''">18.5.0-preview3</Version>
+    <Version Condition="'$(Version)' == ''">$([System.DateTime]::UtcNow.ToString(y.M.0))-preview3-$(BuildNumberMajor)-$(BuildNumberMinor)</Version>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Authors>Klaus Hartke</Authors>
     <Copyright>&#169; $([System.DateTime]::UtcNow.ToString(yyyy)) Klaus Hartke</Copyright>