ci:another attempt at fixing auto versioning

ekonbenefits · Apr 5, 2018 · e759089 · e759089
1 parent d7286a3
commit e759089
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -16,13 +16,13 @@ before_deploy:
 environment:
   is_prerelease: true
   githubdeploy: false
-  VersionSuffix: "-alpha$(APPVEYOR_BUILD_NUMBER)"
+  VSuffix: "-alpha$(APPVEYOR_BUILD_NUMBER)"
 
 before_build:
-  - cmd: msbuild /t:restore /p:Configuration=%configuration% /p:VersionSuffix="%VersionSuffix%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - cmd: msbuild /t:restore /p:Configuration=%configuration% /p:Version="%VersionPrefix%%VersionSuffix%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 build_script:
-  - cmd: msbuild /p:Configuration=%configuration% /p:VersionSuffix="%VersionSuffix%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - cmd: msbuild /p:Configuration=%configuration% /p:Version="%VersionPrefix%%VersionSuffix%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 test:
   categories:
@@ -68,14 +68,14 @@ for:
         only:
           - /deploy-v.*-beta.*/
     environment:
-      VersionSuffix: "-beta$(APPVEYOR_BUILD_NUMBER)"
+      VSuffix: "-beta$(APPVEYOR_BUILD_NUMBER)"
       is_prerelease: true
       githubdeploy: true
   - branches:
         only:
           - /deploy-v[\d,.]*/
     configuration: Release
     environment:
-      VersionSuffix: ".$(APPVEYOR_BUILD_NUMBER)"
+      VSuffix: ".$(APPVEYOR_BUILD_NUMBER)"
       is_prerelease: false
       githubdeploy: true
diff --git a/Version.props b/Version.props
@@ -1,6 +1,5 @@
 <Project>
     <PropertyGroup>
         <VersionPrefix>7.0.1</VersionPrefix>
-        <Version>$(VersionPrefix)$(VersionSuffix)</Version>
     </PropertyGroup>
 </Project>