allow for nuget packages to build prereleases

chucknorris · Feb 18, 2013 · 7eea148 · 7eea148
1 parent 847341d
commit 7eea148
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 6 deletions.
diff --git a/assemblies/build/nugetPrepare.step b/assemblies/build/nugetPrepare.step
@@ -37,7 +37,12 @@
   <property name="version.revision" value="0" overwrite="false" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.patch}.0"  if="${version.use_semanticversioning}" />
+  <property name="version.nuget.prerelease" value="" overwrite="false" />
+  <property name="version.use.build_date" value="false" overwrite="false" />
+  <property name="pkg.build.date" value="20100801" overwrite="false" />
   <property name="file.nuget.version" value="${dirs.drop.nuget}${path.separator}version.xml" />
+	<property name="nuget.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
+	<property name="nuget.version" value="${version.major}.${version.minor}.${version.patch}"  if="${version.use_semanticversioning}" />
 
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
@@ -56,7 +61,7 @@
   </target>
 
   <target name="run_normal_tasks"
-          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, set_file_attributes_to_normal, update_nuspecs_with_version"
+          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, set_file_attributes_to_normal, update_build_date, update_version, update_nuspecs_with_version"
           description="Packaging nuget." />
 
   <target name="prepare">
@@ -122,6 +127,25 @@
       </fileset>
     </attrib>
   </target>  
+
+  <target name="update_build_date">
+    <property name="pkg.current.date" value="${datetime::now()}" />
+    <property name="pkg.current.date.year" value="${datetime::get-year(pkg.current.date)}" />
+    <property name="pkg.current.date.month" value="${datetime::get-month(pkg.current.date)}" />
+    <property name="pkg.current.date.month" value="${'0' + pkg.current.date.month}" if="${string::get-length(pkg.current.date.month) == 1}" />
+    <property name="pkg.current.date.month" value="${'0' + pkg.current.date.month}" if="${string::get-length(pkg.current.date.month) == 1}" />
+    <property name="pkg.current.date.day" value="${datetime::get-day(pkg.current.date)}" />
+    <property name="pkg.current.date.day" value="${'0' + pkg.current.date.day}" if="${string::get-length(pkg.current.date.day) == 1}" />
+    <property name="pkg.build.date" value="${'' + pkg.current.date.year + pkg.current.date.month + pkg.current.date.day}" />
+  </target>
+
+  <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 != ''}" />
+    <!-- version.use.build_date -->
+    <echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
+  </target>
 
   <target name="update_nuspecs_with_version">
     <echo level="Warning" message="Finding and updating version in all nuspec files in ${dirs.drop.nuget}."/>
@@ -136,7 +160,7 @@
         <xmlpoke
           file="${spec.file}"
           xpath="/package/metadata/version"
-          value="${assembly.version.full}" />
+          value="${nuget.version}" />
       </do>
     </foreach>
   </target>

diff --git a/build/nugetPrepare.step b/build/nugetPrepare.step
@@ -37,7 +37,12 @@
   <property name="version.revision" value="0" overwrite="false" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.patch}.0"  if="${version.use_semanticversioning}" />
+  <property name="version.nuget.prerelease" value="" overwrite="false" />
+  <property name="version.use.build_date" value="false" overwrite="false" />
+  <property name="pkg.build.date" value="20100801" overwrite="false" />
   <property name="file.nuget.version" value="${dirs.drop.nuget}${path.separator}version.xml" />
+	<property name="nuget.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
+	<property name="nuget.version" value="${version.major}.${version.minor}.${version.patch}"  if="${version.use_semanticversioning}" />
 
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
@@ -56,7 +61,7 @@
   </target>
 
   <target name="run_normal_tasks"
-          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, set_file_attributes_to_normal, update_nuspecs_with_version"
+          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, set_file_attributes_to_normal, update_build_date, update_version, update_nuspecs_with_version"
           description="Packaging nuget." />
 
   <target name="prepare">
@@ -122,6 +127,25 @@
       </fileset>
     </attrib>
   </target>  
+
+  <target name="update_build_date">
+    <property name="pkg.current.date" value="${datetime::now()}" />
+    <property name="pkg.current.date.year" value="${datetime::get-year(pkg.current.date)}" />
+    <property name="pkg.current.date.month" value="${datetime::get-month(pkg.current.date)}" />
+    <property name="pkg.current.date.month" value="${'0' + pkg.current.date.month}" if="${string::get-length(pkg.current.date.month) == 1}" />
+    <property name="pkg.current.date.month" value="${'0' + pkg.current.date.month}" if="${string::get-length(pkg.current.date.month) == 1}" />
+    <property name="pkg.current.date.day" value="${datetime::get-day(pkg.current.date)}" />
+    <property name="pkg.current.date.day" value="${'0' + pkg.current.date.day}" if="${string::get-length(pkg.current.date.day) == 1}" />
+    <property name="pkg.build.date" value="${'' + pkg.current.date.year + pkg.current.date.month + pkg.current.date.day}" />
+  </target>
+
+  <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 != ''}" />
+    <!-- version.use.build_date -->
+    <echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
+  </target>
 
   <target name="update_nuspecs_with_version">
     <echo level="Warning" message="Finding and updating version in all nuspec files in ${dirs.drop.nuget}."/>
@@ -136,7 +160,7 @@
         <xmlpoke
           file="${spec.file}"
           xpath="/package/metadata/version"
-          value="${assembly.version.full}" />
+          value="${nuget.version}" />
       </do>
     </foreach>
   </target>

diff --git a/product/uppercut.build/build/nugetPrepare.step b/product/uppercut.build/build/nugetPrepare.step
@@ -37,7 +37,12 @@
   <property name="version.revision" value="0" overwrite="false" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.patch}.0"  if="${version.use_semanticversioning}" />
+  <property name="version.nuget.prerelease" value="" overwrite="false" />
+  <property name="version.use.build_date" value="false" overwrite="false" />
+  <property name="pkg.build.date" value="20100801" overwrite="false" />
   <property name="file.nuget.version" value="${dirs.drop.nuget}${path.separator}version.xml" />
+	<property name="nuget.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
+	<property name="nuget.version" value="${version.major}.${version.minor}.${version.patch}"  if="${version.use_semanticversioning}" />
 
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
@@ -56,7 +61,7 @@
   </target>
 
   <target name="run_normal_tasks"
-          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, set_file_attributes_to_normal, update_nuspecs_with_version"
+          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, set_file_attributes_to_normal, update_build_date, update_version, update_nuspecs_with_version"
           description="Packaging nuget." />
 
   <target name="prepare">
@@ -122,6 +127,25 @@
       </fileset>
     </attrib>
   </target>  
+
+  <target name="update_build_date">
+    <property name="pkg.current.date" value="${datetime::now()}" />
+    <property name="pkg.current.date.year" value="${datetime::get-year(pkg.current.date)}" />
+    <property name="pkg.current.date.month" value="${datetime::get-month(pkg.current.date)}" />
+    <property name="pkg.current.date.month" value="${'0' + pkg.current.date.month}" if="${string::get-length(pkg.current.date.month) == 1}" />
+    <property name="pkg.current.date.month" value="${'0' + pkg.current.date.month}" if="${string::get-length(pkg.current.date.month) == 1}" />
+    <property name="pkg.current.date.day" value="${datetime::get-day(pkg.current.date)}" />
+    <property name="pkg.current.date.day" value="${'0' + pkg.current.date.day}" if="${string::get-length(pkg.current.date.day) == 1}" />
+    <property name="pkg.build.date" value="${'' + pkg.current.date.year + pkg.current.date.month + pkg.current.date.day}" />
+  </target>
+
+  <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 != ''}" />
+    <!-- version.use.build_date -->
+    <echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
+  </target>
 
   <target name="update_nuspecs_with_version">
     <echo level="Warning" message="Finding and updating version in all nuspec files in ${dirs.drop.nuget}."/>
@@ -136,7 +160,7 @@
         <xmlpoke
           file="${spec.file}"
           xpath="/package/metadata/version"
-          value="${assembly.version.full}" />
+          value="${nuget.version}" />
       </do>
     </foreach>
   </target>

diff --git a/product/uppercut.build/settings/UppercuT.config b/product/uppercut.build/settings/UppercuT.config
@@ -46,6 +46,8 @@
   <property name="version.patch" value="0" overwrite="false" />
   <property name="version.gem.suffix" value="" overwrite="false" />
   <property name="use.gem.build_date" value="false" overwrite="false" />
+  <property name="version.nuget.prerelease" value="" overwrite="false" />
+  <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - ${repository.path}." overwrite="false" />
   <property name="assembly.clscompliant" value="false" overwrite="false" />
   <!-- partially trusted callers doesn't set correctly with assembly generator - Leave false for now-->