Ubuntu One Windows Installer

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

  1. use_correct_version
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Vincenzo Di Somma
Approved revision: 162
Merged at revision: 125
Proposed branch: lp:~mandel/ubuntuone-windows-installer/use_correct_version
Merge into: lp:ubuntuone-windows-installer/beta
Diff against target: 173 lines (+15/-61)
10 files modified
src/Canonical.Ubuntu.SSO.Tests/Canonical.Ubuntu.SSO.Tests.csproj (+3/-0)
src/Canonical.Ubuntu.SSO.Tests/Properties/AssemblyInfo.cs (+0/-12)
src/Canonical.Ubuntu.SSO.Views.Tests/Canonical.Ubuntu.SSO.Views.Tests.csproj (+3/-0)
src/Canonical.Ubuntu.SSO.Views.Tests/Properties/AssemblyInfo.cs (+0/-12)
src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj (+3/-0)
src/Canonical.Ubuntu.SSO.Views/Properties/AssemblyInfo.cs (+0/-13)
src/Canonical.UbuntuOne.Client.Views.Tests/Canonical.UbuntuOne.Client.Views.Tests.csproj (+3/-0)
src/Canonical.UbuntuOne.Client.Views.Tests/Properties/AssemblyInfo.cs (+0/-12)
src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs (+0/-12)
src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj (+3/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/use_correct_version
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
John Lenton (community) Approve
Review via email: mp+39904@code.launchpad.net

Description of the change

Ensures that the dlls use the correct version.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
72 <Reference Include="System.Xml" />72 <Reference Include="System.Xml" />
73 </ItemGroup>73 </ItemGroup>
74 <ItemGroup>74 <ItemGroup>
75 <Compile Include="..\Version.cs">
76 <Link>Properties\Version.cs</Link>
77 </Compile>
75 <Compile Include="ColonSeparatedSSOCredentialsEncoderFixture.cs" />78 <Compile Include="ColonSeparatedSSOCredentialsEncoderFixture.cs" />
76 <Compile Include="CredentialsDeniedEventArgsFixture.cs" />79 <Compile Include="CredentialsDeniedEventArgsFixture.cs" />
77 <Compile Include="CredentialsErrorEventArgsFixture.cs" />80 <Compile Include="CredentialsErrorEventArgsFixture.cs" />
7881
=== 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 @@
22// The following GUID is for the ID of the typelib if this project is exposed to COM22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("055a2726-2682-4018-8c48-e1795da59ab2")]23[assembly: Guid("055a2726-2682-4018-8c48-e1795da59ab2")]
2424
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32// You can specify all the values or you can default the Build and Revision Numbers
33// by using the '*' as shown below:
34// [assembly: AssemblyVersion("1.0.*")]
35[assembly: AssemblyVersion("1.0.0.0")]
36[assembly: AssemblyFileVersion("1.0.0.0")]
3725
=== 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 @@
48 <Reference Include="WindowsBase" />48 <Reference Include="WindowsBase" />
49 </ItemGroup>49 </ItemGroup>
50 <ItemGroup>50 <ItemGroup>
51 <Compile Include="..\Version.cs">
52 <Link>Properties\Version.cs</Link>
53 </Compile>
51 <Compile Include="LoginDialogFixture.cs" />54 <Compile Include="LoginDialogFixture.cs" />
52 <Compile Include="Properties\AssemblyInfo.cs" />55 <Compile Include="Properties\AssemblyInfo.cs" />
53 </ItemGroup>56 </ItemGroup>
5457
=== 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 @@
22// The following GUID is for the ID of the typelib if this project is exposed to COM22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("0baf1d16-e127-43a0-8aa6-f5cada885f06")]23[assembly: Guid("0baf1d16-e127-43a0-8aa6-f5cada885f06")]
2424
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32// You can specify all the values or you can default the Build and Revision Numbers
33// by using the '*' as shown below:
34// [assembly: AssemblyVersion("1.0.*")]
35[assembly: AssemblyVersion("1.0.0.0")]
36[assembly: AssemblyFileVersion("1.0.0.0")]
3725
=== 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 @@
79 </Page>79 </Page>
80 </ItemGroup>80 </ItemGroup>
81 <ItemGroup>81 <ItemGroup>
82 <Compile Include="..\Version.cs">
83 <Link>Properties\Version.cs</Link>
84 </Compile>
82 <Compile Include="LoginDialog.xaml.cs">85 <Compile Include="LoginDialog.xaml.cs">
83 <DependentUpon>LoginDialog.xaml</DependentUpon>86 <DependentUpon>LoginDialog.xaml</DependentUpon>
84 </Compile>87 </Compile>
8588
=== 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 @@
40 // app, or any theme specific resource dictionaries)40 // app, or any theme specific resource dictionaries)
41)]41)]
4242
43
44// Version information for an assembly consists of the following four values:
45//
46// Major Version
47// Minor Version
48// Build Number
49// Revision
50//
51// You can specify all the values or you can default the Build and Revision Numbers
52// by using the '*' as shown below:
53// [assembly: AssemblyVersion("1.0.*")]
54[assembly: AssemblyVersion("1.0.0.0")]
55[assembly: AssemblyFileVersion("1.0.0.0")]
56[assembly: InternalsVisibleTo("Canonical.Ubuntu.SSO.Views.Tests")]43[assembly: InternalsVisibleTo("Canonical.Ubuntu.SSO.Views.Tests")]
5744
=== 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 @@
52 <Reference Include="WindowsBase" />52 <Reference Include="WindowsBase" />
53 </ItemGroup>53 </ItemGroup>
54 <ItemGroup>54 <ItemGroup>
55 <Compile Include="..\Version.cs">
56 <Link>Properties\Version.cs</Link>
57 </Compile>
55 <Compile Include="AccountViewFixture.cs" />58 <Compile Include="AccountViewFixture.cs" />
56 <Compile Include="DevicesViewFixture.cs" />59 <Compile Include="DevicesViewFixture.cs" />
57 <Compile Include="NotifyIconFixture.cs" />60 <Compile Include="NotifyIconFixture.cs" />
5861
=== 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 @@
22// The following GUID is for the ID of the typelib if this project is exposed to COM22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("3a74a2fd-eed2-4f99-ae6a-7f75b71d0dfc")]23[assembly: Guid("3a74a2fd-eed2-4f99-ae6a-7f75b71d0dfc")]
2424
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32// You can specify all the values or you can default the Build and Revision Numbers
33// by using the '*' as shown below:
34// [assembly: AssemblyVersion("1.0.*")]
35[assembly: AssemblyVersion("1.0.0.0")]
36[assembly: AssemblyFileVersion("1.0.0.0")]
3725
=== 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 @@
23// The following GUID is for the ID of the typelib if this project is exposed to COM23// The following GUID is for the ID of the typelib if this project is exposed to COM
24[assembly: Guid("007ab11d-53f0-4edd-8044-f6aaba73ac6c")]24[assembly: Guid("007ab11d-53f0-4edd-8044-f6aaba73ac6c")]
2525
26// Version information for an assembly consists of the following four values:
27//
28// Major Version
29// Minor Version
30// Build Number
31// Revision
32//
33// You can specify all the values or you can default the Build and Revision Numbers
34// by using the '*' as shown below:
35// [assembly: AssemblyVersion("1.0.*")]
36[assembly: AssemblyVersion("1.0.0.0")]
37[assembly: AssemblyFileVersion("1.0.0.0")]
38// Tell NUNi to run tests in STA26// Tell NUNi to run tests in STA
39[assembly: RequiresSTA]27[assembly: RequiresSTA]
4028
=== 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 @@
91 </Reference>91 </Reference>
92 </ItemGroup>92 </ItemGroup>
93 <ItemGroup>93 <ItemGroup>
94 <Compile Include="..\Version.cs">
95 <Link>Properties\Version.cs</Link>
96 </Compile>
94 <Compile Include="ConfigurationFixture.cs" />97 <Compile Include="ConfigurationFixture.cs" />
95 <Compile Include="ProgramFixture.cs" />98 <Compile Include="ProgramFixture.cs" />
96 <Compile Include="Properties\AssemblyInfo.cs" />99 <Compile Include="Properties\AssemblyInfo.cs" />

Subscribers

People subscribed via source and target branches

to all changes: