change version variables

philippjenni · Mar 9, 2015 · 4bbb15f · 4bbb15f
1 parent eabdfee
commit 4bbb15f
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 32 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@
 #---------------------------------#
 
 # version format
-version: 1.0.{build}
+version: 1.0.0.{build}
 
 
 #---------------------------------#

diff --git a/src/BuildScripts/common.props b/src/BuildScripts/common.props
@@ -6,46 +6,64 @@
     <SolutionFileName>$(SolutionPath)BugNET.sln</SolutionFileName>
     <OutputPath>$(SolutionPath)\output</OutputPath>
     <MSBuildCommunityTasksPath>$(SolutionPath).build</MSBuildCommunityTasksPath>
-
+
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(BuildConfiguration)' == '' ">
+    <BuildConfiguration>Release</BuildConfiguration>
   </PropertyGroup>
 
   <PropertyGroup>
-
-    <Publish Condition="'$(PUBLISH)' == ''" >true</Publish>
-    <Publish Condition="'$(PUBLISH)' != ''" >$(PUBLISH)</Publish>
-
-    <Archive Condition="'$(ARQUIVE)' == ''">true</Archive>
-    <Archive Condition="'$(ARQUIVE)' != ''">$(ARQUIVE)</Archive>
-
-    <UnitTest Condition="'$(UNIT_TEST)' == ''">false</UnitTest>
-    <UnitTest Condition="'$(UNIT_TEST)' != ''">$(UNIT_TEST)</UnitTest>
-
+
+    <Publish Condition="'$(Publish)' == ''" >true</Publish>
+    <Archive Condition="'$(Arquive)' == ''">true</Archive>
+    <UnitTest Condition="'$(UnitTest)' == ''">false</UnitTest>
+
   </PropertyGroup>
 
   <!-- Version Number -->
-  <PropertyGroup Condition="'$(APPVEYOR)' != '' And '$(APPVEYOR)'">
-    <Version>$(APPVEYOR_BUILD_VERSION)</Version>
-    <FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
-    <InformationalVersion>$(APPVEYOR_BUILD_VERSION)</InformationalVersion>
-  </PropertyGroup>
+  <Choose>
+    <!-- if AppVeyor Buid -->
+    <When Condition="'$(APPVEYOR)' != '' And '$(APPVEYOR)'"> 
+      <PropertyGroup>
+        <Version>$(APPVEYOR_BUILD_VERSION)</Version>
+        <FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
+        <InformationalVersion>$(APPVEYOR_BUILD_VERSION)</InformationalVersion>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <Choose>
+         <!-- if BUILD_VERSION is Set -->
+        <When Condition="'$(BUILD_VERSION)' != ''">
+          <PropertyGroup>
+            <Version>$(BUILD_VERSION)</Version>
+            <FileVersion>$(BUILD_VERSION)</FileVersion>
+            <InformationalVersion>$(BUILD_VERSION)</InformationalVersion>
+          </PropertyGroup>
+        </When>
+        <Otherwise>
+          <PropertyGroup>
+            <Version>1.0.0.0</Version>
+            <FileVersion>1.0.0.0</FileVersion>
+            <InformationalVersion>1.0.0.0</InformationalVersion>
+          </PropertyGroup>
+        </Otherwise>
+      </Choose>
+
+    </Otherwise>
+
+  </Choose>
+
+
+
+
+
+
+
+
 
-  <PropertyGroup Condition="('$(APPVEYOR)' == '' Or !'$(APPVEYOR)') And '$(BUILD_VERSION)' != '' ">
-    <Version>$(BUILD_VERSION)</Version>
-    <FileVersion>$(BUILD_VERSION)</FileVersion>
-    <InformationalVersion>$(BUILD_VERSION)</InformationalVersion>
-  </PropertyGroup>
 
-  <PropertyGroup Condition="('$(APPVEYOR)' == '' Or !'$(APPVEYOR)') And  '$(BUILD_VERSION)' == '' ">
-    <Version>1.0.0.0</Version>
-    <FileVersion>1.0.0.0</FileVersion>
-    <InformationalVersion>1.0.0.0</InformationalVersion>
-  </PropertyGroup>
-
 
-  <PropertyGroup Condition=" '$(BuildConfiguration)' == '' ">
-    <BuildConfiguration>Release</BuildConfiguration>
-  </PropertyGroup>
 
-
 
 </Project>