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

Proposed by Manuel de la Peña
Status: Merged
Approved by: Rodrigo Moya
Approved revision: 23
Merged at revision: 48
Proposed branch: lp:~mandel/ubuntuone-windows-installer/version_autoincrease
Merge into: lp:ubuntuone-windows-installer/beta
Diff against target: 392 lines (+70/-112)
21 files modified
build.number (+1/-0)
main.build (+27/-2)
src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj (+3/-0)
src/Canonical.UbuntuOne.Client.Test/Properties/AssemblyInfo.cs (+0/-13)
src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj (+3/-0)
src/Canonical.UbuntuOne.Client.Views/Properties/AssemblyInfo.cs (+0/-12)
src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj (+3/-0)
src/Canonical.UbuntuOne.Client/Properties/AssemblyInfo.cs (+0/-12)
src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj (+3/-0)
src/Canonical.UbuntuOne.Common.Tests/Properties/AssemblyInfo.cs (+0/-13)
src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj (+3/-0)
src/Canonical.UbuntuOne.Common/Properties/AssemblyInfo.cs (+0/-13)
src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj (+3/-0)
src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Properties/AssemblyInfo.cs (+0/-13)
src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj (+3/-0)
src/Canonical.UbuntuOne.ProcessDispatcher/Properties/AssemblyInfo.cs (+0/-8)
src/ServiceTestApp/Properties/AssemblyInfo.cs (+0/-13)
src/ServiceTestApp/ServiceTestApp.csproj (+3/-0)
src/UbuntuOneClient/Properties/AssemblyInfo.cs (+0/-13)
src/UbuntuOneClient/UbuntuOneClient.csproj (+3/-0)
src/Version.cs (+15/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/version_autoincrease
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
John Lenton (community) Approve
Review via email: mp+31359@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

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
21. By Manuel de la Peña

Remove double *

Revision history for this message
John Lenton (chipaca) wrote :

also, note the branch now conflicts

22. By Manuel de la Peña

Fix typos.

23. By Manuel de la Peña

Merge with trunk.

Revision history for this message
Manuel de la Peña (mandel) wrote :

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.

Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
11.0.0.0
0\ No newline at end of file2\ No newline at end of file
13
=== 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 @@
22
3 <!-- the enviroment property allows to select which enviroment we are compiling to -->3 <!-- the enviroment property allows to select which enviroment we are compiling to -->
4 <property name="enviroment" value="debug" />4 <property name="enviroment" value="debug" />
5 <!-- property that allows to pass where to place the build results -->
5 <property name="build_results" value="install/build_results" />6 <property name="build_results" value="install/build_results" />
6 7 <!-- property that allows to pass the number for the current build. -->
8 <property name="build" value="0" />
7 <target name="clean" 9 <target name="clean"
8 description="Removes all the different results of the last comilation if they exist">10 description="Removes all the different results of the last comilation if they exist">
9 <!-- delete all the different results from the previous build -->11 <!-- delete all the different results from the previous build -->
@@ -105,9 +107,32 @@
105 107
106 </target>108 </target>
107 109
110 <target name="generate-versionnumber"
111 description="Generates a new version number according to the number of builds done in the continuous integration" >
112 <attrib readonly="false">
113 <fileset>
114 <include name="build.number" />
115 <include name="src/Version.cs" />
116 </fileset>
117 </attrib>
118 <version buildtype="MonthDay" revisiontype="Automatic" startdate="2010-04-21"/>
119 <asminfo output="src/Version.cs"
120 language="CSharp">
121 <imports>
122 <import namespace="System.Reflection" />
123 </imports>
124 <attributes>
125 <attribute type="AssemblyVersionAttribute"
126 value="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" />
127 <attribute type="AssemblyFileVersionAttribute"
128 value="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" />
129 </attributes>
130 </asminfo>
131 </target>
132
108 <target name="build" 133 <target name="build"
109 description="Compiles all the different projects that form part of the solution." 134 description="Compiles all the different projects that form part of the solution."
110 depends="clean, generate_protos">135 depends="clean, generate_protos, generate-versionnumber">
111 <!-- use the msbuild action to compile the solution -->136 <!-- use the msbuild action to compile the solution -->
112 <msbuild project="src/UbuntuOne.sln"> 137 <msbuild project="src/UbuntuOne.sln">
113 <property name="Configuration" value="${enviroment}" /> 138 <property name="Configuration" value="${enviroment}" />
114139
=== 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 @@
49 <Reference Include="System.Xml" />49 <Reference Include="System.Xml" />
50 </ItemGroup>50 </ItemGroup>
51 <ItemGroup>51 <ItemGroup>
52 <Compile Include="..\Version.cs">
53 <Link>Properties\Version.cs</Link>
54 </Compile>
52 <Compile Include="Notification\NotificationEventArgsFixture.cs" />55 <Compile Include="Notification\NotificationEventArgsFixture.cs" />
53 <Compile Include="Notification\OperationCompletenessEventArgsFixture.cs" />56 <Compile Include="Notification\OperationCompletenessEventArgsFixture.cs" />
54 <Compile Include="Notification\RecentlyModifiedEventArgsFixture.cs" />57 <Compile Include="Notification\RecentlyModifiedEventArgsFixture.cs" />
5558
=== 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 @@
2121
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("993407a9-fb9c-4678-bd7c-5c2fdf60eb51")]23[assembly: Guid("993407a9-fb9c-4678-bd7c-5c2fdf60eb51")]
24
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")]
3724
=== 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 @@
109 </Compile>109 </Compile>
110 </ItemGroup>110 </ItemGroup>
111 <ItemGroup>111 <ItemGroup>
112 <Compile Include="..\Version.cs">
113 <Link>Properties\Version.cs</Link>
114 </Compile>
112 <Compile Include="PreferencesDialog.xaml.cs">115 <Compile Include="PreferencesDialog.xaml.cs">
113 <DependentUpon>PreferencesDialog.xaml</DependentUpon>116 <DependentUpon>PreferencesDialog.xaml</DependentUpon>
114 </Compile>117 </Compile>
115118
=== 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 @@
41)]41)]
4242
4343
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: NeutralResourcesLanguageAttribute("")]44[assembly: NeutralResourcesLanguageAttribute("")]
5745
=== 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 @@
32 <ConsolePause>false</ConsolePause>32 <ConsolePause>false</ConsolePause>
33 </PropertyGroup>33 </PropertyGroup>
34 <ItemGroup>34 <ItemGroup>
35 <Compile Include="..\Version.cs">
36 <Link>Properties\Version.cs</Link>
37 </Compile>
35 <Compile Include="Notification\INotificationIconView.cs" />38 <Compile Include="Notification\INotificationIconView.cs" />
36 <Compile Include="Notification\NotificationIconPresenter.cs" />39 <Compile Include="Notification\NotificationIconPresenter.cs" />
37 <Compile Include="Notification\OperationCompletenessEventArgs.cs" />40 <Compile Include="Notification\OperationCompletenessEventArgs.cs" />
3841
=== 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 @@
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("3c7586a6-40ca-463b-b12c-b0aed0f4cb92")]23[assembly: Guid("3c7586a6-40ca-463b-b12c-b0aed0f4cb92")]
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.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 @@
32 <ConsolePause>false</ConsolePause>32 <ConsolePause>false</ConsolePause>
33 </PropertyGroup>33 </PropertyGroup>
34 <ItemGroup>34 <ItemGroup>
35 <Compile Include="..\Version.cs">
36 <Link>Properties\Version.cs</Link>
37 </Compile>
35 <Compile Include="Aop\DebugLogAfterCallInterceptorFixture.cs" />38 <Compile Include="Aop\DebugLogAfterCallInterceptorFixture.cs" />
36 <Compile Include="Aop\DebugLogAfterThrowInterceptorFixture.cs" />39 <Compile Include="Aop\DebugLogAfterThrowInterceptorFixture.cs" />
37 <Compile Include="Container\DictionaryContainerFixture.cs" />40 <Compile Include="Container\DictionaryContainerFixture.cs" />
3841
=== 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 @@
2121
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("15e0f5ae-077e-4598-8762-f4e56c5ed643")]23[assembly: Guid("15e0f5ae-077e-4598-8762-f4e56c5ed643")]
24
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")]
3724
=== 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 @@
32 <ConsolePause>false</ConsolePause>32 <ConsolePause>false</ConsolePause>
33 </PropertyGroup>33 </PropertyGroup>
34 <ItemGroup>34 <ItemGroup>
35 <Compile Include="..\Version.cs">
36 <Link>Properties\Version.cs</Link>
37 </Compile>
35 <Compile Include="Aop\AopResources.Designer.cs">38 <Compile Include="Aop\AopResources.Designer.cs">
36 <AutoGen>True</AutoGen>39 <AutoGen>True</AutoGen>
37 <DesignTime>True</DesignTime>40 <DesignTime>True</DesignTime>
3841
=== 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 @@
2121
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("8e0c62a4-085d-417a-b9d0-20b6ca8face1")]23[assembly: Guid("8e0c62a4-085d-417a-b9d0-20b6ca8face1")]
24
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")]
37[assembly: InternalsVisibleTo("Canonical.UbuntuOne.Common.Tests")]24[assembly: InternalsVisibleTo("Canonical.UbuntuOne.Common.Tests")]
38// add the internals to be visible to the Rhino mocks code25// add the internals to be visible to the Rhino mocks code
39[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]26[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
40\ No newline at end of file27\ No newline at end of file
4128
=== 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 @@
52 <ConsolePause>false</ConsolePause>52 <ConsolePause>false</ConsolePause>
53 </PropertyGroup>53 </PropertyGroup>
54 <ItemGroup>54 <ItemGroup>
55 <Compile Include="..\Version.cs">
56 <Link>Properties\Version.cs</Link>
57 </Compile>
55 <Compile Include="Properties\AssemblyInfo.cs" />58 <Compile Include="Properties\AssemblyInfo.cs" />
56 <Compile Include="Protobuf\ConvertFixture.cs" />59 <Compile Include="Protobuf\ConvertFixture.cs" />
57 <Compile Include="Protobuf\SyncConfigurationMessageFactoryFixture.cs" />60 <Compile Include="Protobuf\SyncConfigurationMessageFactoryFixture.cs" />
5861
=== 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 @@
2121
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("7cd55b5d-85c4-44c9-8379-b23650ef40c8")]23[assembly: Guid("7cd55b5d-85c4-44c9-8379-b23650ef40c8")]
24
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")]
3724
=== 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 @@
67 </None>67 </None>
68 </ItemGroup>68 </ItemGroup>
69 <ItemGroup>69 <ItemGroup>
70 <Compile Include="..\Version.cs">
71 <Link>Properties\Version.cs</Link>
72 </Compile>
70 <Compile Include="Program.cs" />73 <Compile Include="Program.cs" />
71 <Compile Include="ProjectInstaller.cs">74 <Compile Include="ProjectInstaller.cs">
72 <SubType>Component</SubType>75 <SubType>Component</SubType>
7376
=== 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 @@
22// This sets the default COM visibility of types in the assembly to invisible.22// This sets the default COM visibility of types in the assembly to invisible.
23// If you need to expose a type to COM, use [ComVisible(true)] on that type.23// If you need to expose a type to COM, use [ComVisible(true)] on that type.
24[assembly: ComVisible(false)]24[assembly: ComVisible(false)]
25
26// The assembly version has following format :
27//
28// Major.Minor.Build.Revision
29//
30// You can specify all the values or you can use the default the Revision and
31// Build Numbers by using the '*' as shown below:
32[assembly: AssemblyVersion("1.0.*")]
33[assembly: InternalsVisibleTo("Canonical.UbuntuOne.ProcessDispatcher.Tests")]25[assembly: InternalsVisibleTo("Canonical.UbuntuOne.ProcessDispatcher.Tests")]
3426
=== 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 @@
2121
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("be6f3304-10ed-4a11-88ed-cf93531fb577")]23[assembly: Guid("be6f3304-10ed-4a11-88ed-cf93531fb577")]
24
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")]
3724
=== 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 @@
58 <Reference Include="System.Xml" />58 <Reference Include="System.Xml" />
59 </ItemGroup>59 </ItemGroup>
60 <ItemGroup>60 <ItemGroup>
61 <Compile Include="..\Version.cs">
62 <Link>Properties\Version.cs</Link>
63 </Compile>
61 <Compile Include="Program.cs" />64 <Compile Include="Program.cs" />
62 <Compile Include="Properties\AssemblyInfo.cs" />65 <Compile Include="Properties\AssemblyInfo.cs" />
63 </ItemGroup>66 </ItemGroup>
6467
=== 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 @@
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// allow the test assembly to access the internals43// allow the test assembly to access the internals
57[assembly: InternalsVisibleTo("UbuntuOneClient.Tests")]44[assembly: InternalsVisibleTo("UbuntuOneClient.Tests")]
5845
=== 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 @@
62 <Reference Include="PresentationFramework" />62 <Reference Include="PresentationFramework" />
63 </ItemGroup>63 </ItemGroup>
64 <ItemGroup>64 <ItemGroup>
65 <Compile Include="..\Version.cs">
66 <Link>Version.cs</Link>
67 </Compile>
65 <Compile Include="ApplicationWrapper.cs" />68 <Compile Include="ApplicationWrapper.cs" />
66 <Compile Include="IApplication.cs" />69 <Compile Include="IApplication.cs" />
67 <Compile Include="Program.cs" />70 <Compile Include="Program.cs" />
6871
=== 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 @@
1using System.Reflection;
2
3//------------------------------------------------------------------------------
4// <auto-generated>
5// This code was generated by a tool.
6// Runtime Version:2.0.50727.4927
7//
8// Changes to this file may cause incorrect behavior and will be lost if
9// the code is regenerated.
10// </auto-generated>
11//------------------------------------------------------------------------------
12
13[assembly: AssemblyVersionAttribute("1.0.0.0")]
14[assembly: AssemblyFileVersionAttribute("1.0.0.0")]
15

Subscribers

People subscribed via source and target branches

to all changes: