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

[Manuel de la Peña]

Ensures that the dlls use the correct version.

[John Lenton (chipaca)]

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

=== modified file 'src/Canonical.Ubuntu.SSO.Tests/Canonical.Ubuntu.SSO.Tests.csproj'
--- src/Canonical.Ubuntu.SSO.Tests/Canonical.Ubuntu.SSO.Tests.csproj	2010-10-12 13:07:02 +0000
+++ src/Canonical.Ubuntu.SSO.Tests/Canonical.Ubuntu.SSO.Tests.csproj	2010-11-02 22:21:06 +0000
@@ -72,6 +72,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="ColonSeparatedSSOCredentialsEncoderFixture.cs" />
     <Compile Include="CredentialsDeniedEventArgsFixture.cs" />
     <Compile Include="CredentialsErrorEventArgsFixture.cs" />

=== modified file 'src/Canonical.Ubuntu.SSO.Tests/Properties/AssemblyInfo.cs'
--- src/Canonical.Ubuntu.SSO.Tests/Properties/AssemblyInfo.cs	2010-09-13 12:20:56 +0000
+++ src/Canonical.Ubuntu.SSO.Tests/Properties/AssemblyInfo.cs	2010-11-02 22:21:06 +0000
@@ -22,15 +22,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("055a2726-2682-4018-8c48-e1795da59ab2")]
 
-// 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.Ubuntu.SSO.Views.Tests/Canonical.Ubuntu.SSO.Views.Tests.csproj'
--- src/Canonical.Ubuntu.SSO.Views.Tests/Canonical.Ubuntu.SSO.Views.Tests.csproj	2010-10-20 23:09:36 +0000
+++ src/Canonical.Ubuntu.SSO.Views.Tests/Canonical.Ubuntu.SSO.Views.Tests.csproj	2010-11-02 22:21:06 +0000
@@ -48,6 +48,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="LoginDialogFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

=== modified file 'src/Canonical.Ubuntu.SSO.Views.Tests/Properties/AssemblyInfo.cs'
--- src/Canonical.Ubuntu.SSO.Views.Tests/Properties/AssemblyInfo.cs	2010-10-20 23:09:36 +0000
+++ src/Canonical.Ubuntu.SSO.Views.Tests/Properties/AssemblyInfo.cs	2010-11-02 22:21:06 +0000
@@ -22,15 +22,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("0baf1d16-e127-43a0-8aa6-f5cada885f06")]
 
-// 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.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj'
--- src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-10-20 11:18:55 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-11-02 22:21:06 +0000
@@ -79,6 +79,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="LoginDialog.xaml.cs">
       <DependentUpon>LoginDialog.xaml</DependentUpon>
     </Compile>

=== modified file 'src/Canonical.Ubuntu.SSO.Views/Properties/AssemblyInfo.cs'
--- src/Canonical.Ubuntu.SSO.Views/Properties/AssemblyInfo.cs	2010-10-20 23:09:36 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Properties/AssemblyInfo.cs	2010-11-02 22:21:06 +0000
@@ -40,17 +40,4 @@
     // 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")]
 [assembly: InternalsVisibleTo("Canonical.Ubuntu.SSO.Views.Tests")]

=== modified file 'src/Canonical.UbuntuOne.Client.Views.Tests/Canonical.UbuntuOne.Client.Views.Tests.csproj'
--- src/Canonical.UbuntuOne.Client.Views.Tests/Canonical.UbuntuOne.Client.Views.Tests.csproj	2010-10-20 23:09:36 +0000
+++ src/Canonical.UbuntuOne.Client.Views.Tests/Canonical.UbuntuOne.Client.Views.Tests.csproj	2010-11-02 22:21:06 +0000
@@ -52,6 +52,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="AccountViewFixture.cs" />
     <Compile Include="DevicesViewFixture.cs" />
     <Compile Include="NotifyIconFixture.cs" />

=== modified file 'src/Canonical.UbuntuOne.Client.Views.Tests/Properties/AssemblyInfo.cs'
--- src/Canonical.UbuntuOne.Client.Views.Tests/Properties/AssemblyInfo.cs	2010-10-20 23:09:36 +0000
+++ src/Canonical.UbuntuOne.Client.Views.Tests/Properties/AssemblyInfo.cs	2010-11-02 22:21:06 +0000
@@ -22,15 +22,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("3a74a2fd-eed2-4f99-ae6a-7f75b71d0dfc")]
 
-// 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/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs'
--- src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs	2010-07-30 16:32:54 +0000
+++ src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs	2010-11-02 22:21:06 +0000
@@ -23,17 +23,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("007ab11d-53f0-4edd-8044-f6aaba73ac6c")]
 
-// 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")]
 // Tell NUNi to run tests in STA
 [assembly: RequiresSTA]

=== modified file 'src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj'
--- src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	2010-10-18 11:32:45 +0000
+++ src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	2010-11-02 22:21:06 +0000
@@ -91,6 +91,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Version.cs">
+      <Link>Properties\Version.cs</Link>
+    </Compile>
     <Compile Include="ConfigurationFixture.cs" />
     <Compile Include="ProgramFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />