fixing nuget prepare versioning to not double the prerelease field. u…

…pdating assemblies
chucknorris · Feb 18, 2013 · 4ba148a · 4ba148a
1 parent 0590676
commit 4ba148a
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 3 deletions.
diff --git a/assemblies/build/nugetPrepare.step b/assemblies/build/nugetPrepare.step
@@ -142,7 +142,7 @@
   <target name="update_version">
     <property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease}" if="${version.nuget.prerelease != ''}" />
     <property name="nuget.version" value="${nuget.version + '.' + pkg.build.date}" if="${version.use.build_date and version.use_semanticversioning and version.nuget.prerelease == ''}" />
-    <property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
+    <property name="nuget.version" value="${nuget.version + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
     <!-- version.use.build_date -->
     <echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
   </target>

diff --git a/assemblies/build/uc.exe b/assemblies/build/uc.exe
diff --git a/assemblies/build/uppercut.dll b/assemblies/build/uppercut.dll
diff --git a/assemblies/build/uppercut.tasks.dll b/assemblies/build/uppercut.tasks.dll
diff --git a/build/nugetPrepare.step b/build/nugetPrepare.step
@@ -142,7 +142,7 @@
   <target name="update_version">
     <property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease}" if="${version.nuget.prerelease != ''}" />
     <property name="nuget.version" value="${nuget.version + '.' + pkg.build.date}" if="${version.use.build_date and version.use_semanticversioning and version.nuget.prerelease == ''}" />
-    <property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
+    <property name="nuget.version" value="${nuget.version + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
     <!-- version.use.build_date -->
     <echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
   </target>

diff --git a/build/uc.exe b/build/uc.exe
diff --git a/build/uppercut.dll b/build/uppercut.dll
diff --git a/build/uppercut.tasks.dll b/build/uppercut.tasks.dll
diff --git a/product/uppercut.build/build/nugetPrepare.step b/product/uppercut.build/build/nugetPrepare.step
@@ -142,7 +142,7 @@
   <target name="update_version">
     <property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease}" if="${version.nuget.prerelease != ''}" />
     <property name="nuget.version" value="${nuget.version + '.' + pkg.build.date}" if="${version.use.build_date and version.use_semanticversioning and version.nuget.prerelease == ''}" />
-    <property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
+    <property name="nuget.version" value="${nuget.version + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
     <!-- version.use.build_date -->
     <echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
   </target>