Merge lp:~mandel/ubuntuone-windows-installer/version_autoincrease into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Provides an update in the build script that will generate the version by using the number of months since start of project * 100 + current day in month as build number.

The start of the project is the date this lp project was created.

[John Lenton (chipaca)]

Some silly typos:
«pass the number fo the current build»
«Generatesa a new version»
the /**/ in include is wrong (but you've just fixed it, right?)

So approve... with the above nits.

review: Approve

[lp:~mandel/ubuntuone-windows-installer/version_autoincrease]

21. By Manuel de la Peña on 2010-08-02

Remove double *

[John Lenton (chipaca)]

also, note the branch now conflicts

[lp:~mandel/ubuntuone-windows-installer/version_autoincrease]

22. By Manuel de la Peña on 2010-08-02

Fix typos.

23. By Manuel de la Peña on 2010-08-02

Merge with trunk.

[Manuel de la Peña (mandel)]

In case any one does find surprising the fact that Version.cs is present in the bzr tree. This is done to ensure that developers will have no issues and compilation errors with IDEs that use the MSBuild project files.

IDEs (VS2008, VS2010 and Mono) will load the project and if Version.cs is not present will fail the compilation, but Version.cs has to be inthe MsBuild project file because it is the one use by nant to perform the compilation.

[Rodrigo Moya (rodrigo-moya)]

Looks good

review: Approve

=== added file 'build.number'
--- build.number	1970-01-01 00:00:00 +0000
+++ build.number	2010-08-02 18:01:01 +0000
@@ -0,0 +1,1 @@
+1.0.0.0
\ No newline at end of file

=== modified file 'main.build'
--- main.build	2010-07-30 09:44:09 +0000
+++ main.build	2010-08-02 18:01:01 +0000
@@ -2,8 +2,10 @@
 
 	<!-- the enviroment property allows to select which enviroment we are compiling to -->
 	<property name="enviroment" value="debug" />
+	<!-- property that allows to pass where to place the build results -->
 	<property name="build_results" value="install/build_results" />
-	
+	<!-- property that allows to pass the number for the current build. -->
+	<property name="build" value="0" />
 	<target name="clean" 
 	        description="Removes all the different results of the last comilation if they exist">
 		<!-- delete all the different results from the previous build -->
@@ -105,9 +107,32 @@
 		
 	</target>
 	
+	<target name="generate-versionnumber"
+			description="Generates a new version number according to the number of builds done in the continuous  integration" >
+		<attrib readonly="false">
+			<fileset>
+				<include name="build.number" />
+				<include name="src/Version.cs" />
+			</fileset>
+		</attrib>
+		<version buildtype="MonthDay" revisiontype="Automatic" startdate="2010-04-21"/>
+		<asminfo output="src/Version.cs"
+				 language="CSharp">
+			<imports>
+				<import namespace="System.Reflection" />
+			</imports>
+			<attributes>
+				<attribute type="AssemblyVersionAttribute"
+						   value="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" />
+				<attribute type="AssemblyFileVersionAttribute"
+						   value="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" />
+			</attributes>
+		</asminfo>
+	</target>
+	
 	<target name="build" 
 	        description="Compiles all the different projects that form part of the solution." 
-			depends="clean, generate_protos">
+			depends="clean, generate_protos, generate-versionnumber">
 		<!-- use the msbuild action to compile the solution -->
 		<msbuild project="src/UbuntuOne.sln"> 
 			<property name="Configuration" value="${enviroment}" /> 

=== modified file 'src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj'
--- src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj	2010-07-27 11:57:29 +0000
+++ src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj	2010-08-02 18:01:01 +0000
@@ -49,6 +49,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="Notification\NotificationEventArgsFixture.cs" />
     <Compile Include="Notification\OperationCompletenessEventArgsFixture.cs" />
     <Compile Include="Notification\RecentlyModifiedEventArgsFixture.cs" />

=== modified file 'src/Canonical.UbuntuOne.Client.Test/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.Client.Test/Properties/AssemblyInfo.cs	2010-07-27 11:57:29 +0000
+++ src/Canonical.UbuntuOne.Client.Test/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("993407a9-fb9c-4678-bd7c-5c2fdf60eb51")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-07-28 11:06:07 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-08-02 18:01:01 +0000
@@ -109,6 +109,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="PreferencesDialog.xaml.cs">
       <DependentUpon>PreferencesDialog.xaml</DependentUpon>
     </Compile>

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.Client.Views/Properties/AssemblyInfo.cs	2010-07-27 15:35:34 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -41,16 +41,4 @@
 )]
 
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("")]

=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-07-28 11:06:07 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-08-02 18:01:01 +0000
@@ -32,6 +32,9 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="Notification\INotificationIconView.cs" />
     <Compile Include="Notification\NotificationIconPresenter.cs" />
     <Compile Include="Notification\OperationCompletenessEventArgs.cs" />

=== modified file 'src/Canonical.UbuntuOne.Client/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.Client/Properties/AssemblyInfo.cs	2010-07-04 11:53:55 +0000
+++ src/Canonical.UbuntuOne.Client/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -22,15 +22,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("3c7586a6-40ca-463b-b12c-b0aed0f4cb92")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj'
--- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj	2010-07-23 15:51:36 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj	2010-08-02 18:01:01 +0000
@@ -32,6 +32,9 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="Aop\DebugLogAfterCallInterceptorFixture.cs" />
     <Compile Include="Aop\DebugLogAfterThrowInterceptorFixture.cs" />
     <Compile Include="Container\DictionaryContainerFixture.cs" />

=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Properties/AssemblyInfo.cs	2010-07-05 17:17:01 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("15e0f5ae-077e-4598-8762-f4e56c5ed643")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-07-23 15:51:36 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-08-02 18:01:01 +0000
@@ -32,6 +32,9 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="Aop\AopResources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

=== modified file 'src/Canonical.UbuntuOne.Common/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.Common/Properties/AssemblyInfo.cs	2010-07-21 10:06:45 +0000
+++ src/Canonical.UbuntuOne.Common/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -21,19 +21,6 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("8e0c62a4-085d-417a-b9d0-20b6ca8face1")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: InternalsVisibleTo("Canonical.UbuntuOne.Common.Tests")]
 // add the internals to be visible to the Rhino mocks code
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj	2010-07-13 09:12:00 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj	2010-08-02 18:01:01 +0000
@@ -52,6 +52,9 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Protobuf\ConvertFixture.cs" />
     <Compile Include="Protobuf\SyncConfigurationMessageFactoryFixture.cs" />

=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Properties/AssemblyInfo.cs	2010-07-04 18:47:44 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("7cd55b5d-85c4-44c9-8379-b23650ef40c8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-07-28 12:55:29 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-08-02 18:01:01 +0000
@@ -67,6 +67,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="ProjectInstaller.cs">
       <SubType>Component</SubType>

=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Properties/AssemblyInfo.cs	2010-07-04 18:47:44 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -22,12 +22,4 @@
 // This sets the default COM visibility of types in the assembly to invisible.
 // If you need to expose a type to COM, use [ComVisible(true)] on that type.
 [assembly: ComVisible(false)]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all the values or you can use the default the Revision and 
-// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.*")]
 [assembly: InternalsVisibleTo("Canonical.UbuntuOne.ProcessDispatcher.Tests")]

=== modified file 'src/ServiceTestApp/Properties/AssemblyInfo.cs'
--- src/ServiceTestApp/Properties/AssemblyInfo.cs	2010-07-26 16:01:09 +0000
+++ src/ServiceTestApp/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("be6f3304-10ed-4a11-88ed-cf93531fb577")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

=== modified file 'src/ServiceTestApp/ServiceTestApp.csproj'
--- src/ServiceTestApp/ServiceTestApp.csproj	2010-07-26 16:01:09 +0000
+++ src/ServiceTestApp/ServiceTestApp.csproj	2010-08-02 18:01:01 +0000
@@ -58,6 +58,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

=== modified file 'src/UbuntuOneClient/Properties/AssemblyInfo.cs'
--- src/UbuntuOneClient/Properties/AssemblyInfo.cs	2010-07-28 11:03:35 +0000
+++ src/UbuntuOneClient/Properties/AssemblyInfo.cs	2010-08-02 18:01:01 +0000
@@ -40,18 +40,5 @@
     // app, or any theme specific resource dictionaries)
 )]
 
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
 // allow the test assembly to access the internals
 [assembly: InternalsVisibleTo("UbuntuOneClient.Tests")]

=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
--- src/UbuntuOneClient/UbuntuOneClient.csproj	2010-07-28 11:03:35 +0000
+++ src/UbuntuOneClient/UbuntuOneClient.csproj	2010-08-02 18:01:01 +0000
@@ -62,6 +62,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Version.cs</Link>
+    </Compile>
     <Compile Include="ApplicationWrapper.cs" />
     <Compile Include="IApplication.cs" />
     <Compile Include="Program.cs" />

=== added file 'src/Version.cs'
--- src/Version.cs	1970-01-01 00:00:00 +0000
+++ src/Version.cs	2010-08-02 18:01:01 +0000
@@ -0,0 +1,15 @@
+using System.Reflection;
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: AssemblyVersionAttribute("1.0.0.0")]
+[assembly: AssemblyFileVersionAttribute("1.0.0.0")]
+