Advance version number and update build script for NUnit 2.6.1rc

2012-07-10 13:38:33 -07:00 · 2012-07-10 13:38:33 -07:00 · c8c949163c
--- a/NUnitTests.nunit
+++ b/NUnitTests.nunit
@ -1,6 +1,6 @@
 <NUnitProject>
  <Settings activeconfig="Release" autoconfig="true" processModel="Default" domainUsage="Default" />
-  <Config name="Debug" binpath="bin/Debug/lib;bin/Debug/tests;bin/Debug/framework" runtimeFramework="v0.0">
+  <Config name="Debug" binpath="bin/Debug/lib;bin/Debug/tests;bin/Debug/framework" configfile="NUnitTests.config">
    <assembly path="bin/Debug/tests/nunit.framework.tests.dll" />
    <assembly path="bin/Debug/tests/nunit.core.tests.dll" />
    <assembly path="bin/Debug/tests/nunit.util.tests.dll" />
@ -22,4 +22,4 @@
    <assembly path="bin/Release/tests/nunit-gui.tests.dll" />
    <assembly path="bin/Release/tests/nunit-editor.tests.dll" />
  </Config>
-</NUnitProject>
+</NUnitProject>
--- a/install/NUnit-net-1.1.wxs
+++ b/install/NUnit-net-1.1.wxs
@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

-  <Product UpgradeCode="EE7297AC-EF4E-4415-8621-0066AA2D57D4" Name="NUnit $(var.NominalVersion) (.NET 1.1 Support)" Id="82C4AF77-5FA7-4132-B464-062F398B2970" Version="$(var.ProductVersion)" Manufacturer="nunit.org" Language="1033">
+  <Product
+    UpgradeCode="EE7297AC-EF4E-4415-8621-0066AA2D57D4"
+    Name="NUnit $(var.NominalVersion) (.NET 1.1 Support)"
+    Id="96C3E083-D61B-4bee-ACA4-2B74E44D8A66"
+    Version="$(var.ProductVersion)"
+    Manufacturer="nunit.org" Language="1033">

    <Package Comments="NUnit $(var.ProductVersion)" Manufacturer="nunit.org" InstallerVersion="200" Platform="x86" Languages="1033" Compressed="yes" SummaryCodepage="1252" />

--- a/install/NUnit.wxs
+++ b/install/NUnit.wxs
@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

-  <Product UpgradeCode="009074FF-2CEC-4b0c-9951-B07186F9ED3A" Name="NUnit $(var.NominalVersion)" Id="321FC471-2945-4d25-8D04-10B6A7AE5F15" Version="$(var.ProductVersion)" Manufacturer="nunit.org" Language="1033">
+  <Product 
+    UpgradeCode="009074FF-2CEC-4b0c-9951-B07186F9ED3A" 
+    Name="NUnit $(var.NominalVersion)"
+    Id="E9FE08DD-DEA8-460c-A5F1-079CF2DCFBFA"
+    Version="$(var.ProductVersion)"
+    Manufacturer="nunit.org"
+    Language="1033">

    <Package Comments="NUnit $(var.ProductVersion)" Manufacturer="nunit.org" InstallerVersion="200" Platform="x86" Languages="1033" Compressed="yes" SummaryCodepage="1252" />

--- a/nunit.sln
+++ b/nunit.sln
@ -4,14 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A65042E1-D8BC-48DD-8DE1-F0991F07EA77}"
 	ProjectSection(SolutionItems) = preProject
 		src\nunit.snk = src\nunit.snk
-		NUnitTests.config = NUnitTests.config
-		NUnitTests.nunit = NUnitTests.nunit
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{A785FC02-6044-4864-BE24-4593CAD23A97}"
 	ProjectSection(SolutionItems) = preProject
 		scripts\nunit.build.targets = scripts\nunit.build.targets
 		scripts\nunit.common.targets = scripts\nunit.common.targets
+		scripts\nunit.package.targets = scripts\nunit.package.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitFramework", "NUnitFramework", "{A2FF9F1B-1854-479A-859C-6ECEBF045E4C}"
--- a/scripts/nunit.build.targets
+++ b/scripts/nunit.build.targets
@ -65,8 +65,8 @@
        <attribute type="AssemblyCopyrightAttribute"
          value="Copyright (C) 2002-2012 Charlie Poole.&#xD;&#xA;Copyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov.&#xD;&#xA;Copyright (C) 2000-2002 Philip Craig.&#xD;&#xA;All Rights Reserved."/>
        <attribute type="AssemblyTrademarkAttribute" value="NUnit is a trademark of NUnit.org"/>
-        <attribute type="AssemblyVersionAttribute" value="${package.version}"/>
-        <attribute type="AssemblyInformationalVersionAttribute" value="${package.version}"/>
+        <attribute type="AssemblyVersionAttribute" value="${internal.version}"/>
+        <attribute type="AssemblyInformationalVersionAttribute" value="${internal.version}"/>
        <attribute type="AssemblyConfigurationAttribute" value="${package.configuration}"/>
      </attributes>
    </asminfo>
--- a/scripts/nunit.common.targets
+++ b/scripts/nunit.common.targets
@ -1,36 +1,45 @@
 <?xml version="1.0"?>
 <project name="NUnit" default="build" basedir=".">

-<!-- ***************************************************************** -->
-<!-- *********           Set Common Properties          ************** -->
-<!-- ***************************************************************** -->
- 
-<target name="set-common-properties">
+  <!-- ***************************************************************** -->
+  <!-- *********           Set Common Properties          ************** -->
+  <!-- ***************************************************************** -->

-  <!-- Project name - used as a prefix for packages -->
-  <property name="project.name" value="NUnit"/>
+  <target name="set-common-properties">

-  <!-- NUnit Base Package Version - First three digits -->
-  <property name="base.package.version" value="2.6.0"/>
- 
-  <!-- Nominal version used for install directory and program
-       files menu. Normally the same as the package version, 
-       but may differ when we are in alpha or beta. -->
-  <property name="nominal.version" value="2.6" />
+  <!-- ***************************************************************** -->
+  <!-- ***        Properties to change for each new release          *** -->
+  <!-- ***************************************************************** -->

-  <!-- Determine todays build number -->
-  <property name="temp.now" value="${datetime::now()}"/>
-  <property name="temp.yr" value="${datetime::get-year(temp.now)-2000}"/>
-  <property name="temp.day" value="${string::pad-left(datetime::get-day-of-year(temp.now),3,'0')}"/>
-  <property name="package.build.number" value="${temp.yr}${temp.day}"/>
+    <!-- The nominal version has three components and is used for the name
+       of the install directory and on the program files menu. -->
+    <property name="nominal.version" value="2.6.1" />

-  <!-- NUnit full package version -->
-  <property name="package.version" value="${base.package.version}.${package.build.number}"/>
+    <!-- The package version may include a prerelease suffix following
+       the three-component nominal version -->
+    <property name="package.version" value="${nominal.version}-rc"/>

-  <!-- Package Configuration (Release, Alpha, Beta, etc.) -->
-  <property name="package.configuration" value=""/>
-  
-  <!-- Base name for packages - add suffix for Alpha, Beta, RC -->
+    <!-- Package Configuration (Release, Alpha, Beta, etc.) -->
+    <property name="package.configuration" value="RC"/>
+
+  <!-- ***************************************************************** -->
+  <!-- ***   End of properties to change for each new release        *** -->
+  <!-- ***************************************************************** -->
+
+    <!-- Project name - used as a prefix for packages -->
+    <property name="project.name" value="NUnit"/>
+
+    <!-- Determine todays build number -->
+    <property name="temp.now" value="${datetime::now()}"/>
+    <property name="temp.yr" value="${datetime::get-year(temp.now)-2000}"/>
+    <property name="temp.day" value="${string::pad-left(datetime::get-day-of-year(temp.now),3,'0')}"/>
+    <property name="package.build.number" value="${temp.yr}${temp.day}"/>
+
+    <!-- The internal version has four components and is used for assemblies and 
+       as the ProductVersion in the msi -->
+    <property name="internal.version" value="${nominal.version}.${package.build.number}"/>
+
+    <!-- Base name for packages - add suffix for Alpha, Beta, RC -->
  <property name="package.base.name" 
      value="${project.name}-${package.version}"/>

--- a/scripts/nunit.package.targets
+++ b/scripts/nunit.package.targets
@ -163,7 +163,7 @@

    <candle out="${work.dir}/" exedir="${wix.dir}">
      <defines>
-        <define name="ProductVersion" value="${package.version}" />
+        <define name="ProductVersion" value="${internal.version}" />
        <define name="NominalVersion" value="${nominal.version}" />
        <define name="TargetRuntime" value="${runtime.version}" />
        <define name="InstallImage" value="packages\NUnit-${package.version}" />
@ -323,7 +323,8 @@
    <echo message="Creating ${nuget.package.name} nuget package"/>

    <copy file="${project.nuget.dir}/${nuget.package.name}.nuspec"
-        tofile="${project.nuget.dir}/_${nuget.package.name}.nuspec">
+        tofile="${project.nuget.dir}/_${nuget.package.name}.nuspec"
+        overwrite="true">
      <filterchain>
        <expandproperties/>
      </filterchain>
--- a/src/CommonAssemblyInfo.cs
+++ b/src/CommonAssemblyInfo.cs
@ -30,5 +30,5 @@ using System.Reflection;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:

-[assembly: AssemblyVersion("2.6.0")]
-[assembly: AssemblyInformationalVersion("2.6.0")]
+[assembly: AssemblyVersion("2.6.1")]
+[assembly: AssemblyInformationalVersion("2.6.1")]