Merge lp:~mandel/ubuntuone-windows-installer/version_autoincrease into lp:ubuntuone-windows-installer/beta
- version_autoincrease
- Merge into beta
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Rodrigo Moya (community) | Approve | ||
John Lenton (community) | Approve | ||
Review via email:
|
Commit message
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.
- 21. By Manuel de la Peña
-
Remove double *
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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.
Preview Diff
1 | === added file 'build.number' | |||
2 | --- build.number 1970-01-01 00:00:00 +0000 | |||
3 | +++ build.number 2010-08-02 18:01:01 +0000 | |||
4 | @@ -0,0 +1,1 @@ | |||
5 | 1 | 1.0.0.0 | ||
6 | 0 | \ No newline at end of file | 2 | \ No newline at end of file |
7 | 1 | 3 | ||
8 | === modified file 'main.build' | |||
9 | --- main.build 2010-07-30 09:44:09 +0000 | |||
10 | +++ main.build 2010-08-02 18:01:01 +0000 | |||
11 | @@ -2,8 +2,10 @@ | |||
12 | 2 | 2 | ||
13 | 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 --> |
14 | 4 | <property name="enviroment" value="debug" /> | 4 | <property name="enviroment" value="debug" /> |
15 | 5 | <!-- property that allows to pass where to place the build results --> | ||
16 | 5 | <property name="build_results" value="install/build_results" /> | 6 | <property name="build_results" value="install/build_results" /> |
18 | 6 | 7 | <!-- property that allows to pass the number for the current build. --> | |
19 | 8 | <property name="build" value="0" /> | ||
20 | 7 | <target name="clean" | 9 | <target name="clean" |
21 | 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"> |
22 | 9 | <!-- delete all the different results from the previous build --> | 11 | <!-- delete all the different results from the previous build --> |
23 | @@ -105,9 +107,32 @@ | |||
24 | 105 | 107 | ||
25 | 106 | </target> | 108 | </target> |
26 | 107 | 109 | ||
27 | 110 | <target name="generate-versionnumber" | ||
28 | 111 | description="Generates a new version number according to the number of builds done in the continuous integration" > | ||
29 | 112 | <attrib readonly="false"> | ||
30 | 113 | <fileset> | ||
31 | 114 | <include name="build.number" /> | ||
32 | 115 | <include name="src/Version.cs" /> | ||
33 | 116 | </fileset> | ||
34 | 117 | </attrib> | ||
35 | 118 | <version buildtype="MonthDay" revisiontype="Automatic" startdate="2010-04-21"/> | ||
36 | 119 | <asminfo output="src/Version.cs" | ||
37 | 120 | language="CSharp"> | ||
38 | 121 | <imports> | ||
39 | 122 | <import namespace="System.Reflection" /> | ||
40 | 123 | </imports> | ||
41 | 124 | <attributes> | ||
42 | 125 | <attribute type="AssemblyVersionAttribute" | ||
43 | 126 | value="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" /> | ||
44 | 127 | <attribute type="AssemblyFileVersionAttribute" | ||
45 | 128 | value="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" /> | ||
46 | 129 | </attributes> | ||
47 | 130 | </asminfo> | ||
48 | 131 | </target> | ||
49 | 132 | |||
50 | 108 | <target name="build" | 133 | <target name="build" |
51 | 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." |
53 | 110 | depends="clean, generate_protos"> | 135 | depends="clean, generate_protos, generate-versionnumber"> |
54 | 111 | <!-- use the msbuild action to compile the solution --> | 136 | <!-- use the msbuild action to compile the solution --> |
55 | 112 | <msbuild project="src/UbuntuOne.sln"> | 137 | <msbuild project="src/UbuntuOne.sln"> |
56 | 113 | <property name="Configuration" value="${enviroment}" /> | 138 | <property name="Configuration" value="${enviroment}" /> |
57 | 114 | 139 | ||
58 | === modified file 'src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj' | |||
59 | --- src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj 2010-07-27 11:57:29 +0000 | |||
60 | +++ src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj 2010-08-02 18:01:01 +0000 | |||
61 | @@ -49,6 +49,9 @@ | |||
62 | 49 | <Reference Include="System.Xml" /> | 49 | <Reference Include="System.Xml" /> |
63 | 50 | </ItemGroup> | 50 | </ItemGroup> |
64 | 51 | <ItemGroup> | 51 | <ItemGroup> |
65 | 52 | <Compile Include="..\Version.cs"> | ||
66 | 53 | <Link>Properties\Version.cs</Link> | ||
67 | 54 | </Compile> | ||
68 | 52 | <Compile Include="Notification\NotificationEventArgsFixture.cs" /> | 55 | <Compile Include="Notification\NotificationEventArgsFixture.cs" /> |
69 | 53 | <Compile Include="Notification\OperationCompletenessEventArgsFixture.cs" /> | 56 | <Compile Include="Notification\OperationCompletenessEventArgsFixture.cs" /> |
70 | 54 | <Compile Include="Notification\RecentlyModifiedEventArgsFixture.cs" /> | 57 | <Compile Include="Notification\RecentlyModifiedEventArgsFixture.cs" /> |
71 | 55 | 58 | ||
72 | === modified file 'src/Canonical.UbuntuOne.Client.Test/Properties/AssemblyInfo.cs' | |||
73 | --- src/Canonical.UbuntuOne.Client.Test/Properties/AssemblyInfo.cs 2010-07-27 11:57:29 +0000 | |||
74 | +++ src/Canonical.UbuntuOne.Client.Test/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
75 | @@ -21,16 +21,3 @@ | |||
76 | 21 | 21 | ||
77 | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
78 | 23 | [assembly: Guid("993407a9-fb9c-4678-bd7c-5c2fdf60eb51")] | 23 | [assembly: Guid("993407a9-fb9c-4678-bd7c-5c2fdf60eb51")] |
79 | 24 | |||
80 | 25 | // Version information for an assembly consists of the following four values: | ||
81 | 26 | // | ||
82 | 27 | // Major Version | ||
83 | 28 | // Minor Version | ||
84 | 29 | // Build Number | ||
85 | 30 | // Revision | ||
86 | 31 | // | ||
87 | 32 | // You can specify all the values or you can default the Build and Revision Numbers | ||
88 | 33 | // by using the '*' as shown below: | ||
89 | 34 | // [assembly: AssemblyVersion("1.0.*")] | ||
90 | 35 | [assembly: AssemblyVersion("1.0.0.0")] | ||
91 | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
92 | 37 | 24 | ||
93 | === modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj' | |||
94 | --- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-07-28 11:06:07 +0000 | |||
95 | +++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-08-02 18:01:01 +0000 | |||
96 | @@ -109,6 +109,9 @@ | |||
97 | 109 | </Compile> | 109 | </Compile> |
98 | 110 | </ItemGroup> | 110 | </ItemGroup> |
99 | 111 | <ItemGroup> | 111 | <ItemGroup> |
100 | 112 | <Compile Include="..\Version.cs"> | ||
101 | 113 | <Link>Properties\Version.cs</Link> | ||
102 | 114 | </Compile> | ||
103 | 112 | <Compile Include="PreferencesDialog.xaml.cs"> | 115 | <Compile Include="PreferencesDialog.xaml.cs"> |
104 | 113 | <DependentUpon>PreferencesDialog.xaml</DependentUpon> | 116 | <DependentUpon>PreferencesDialog.xaml</DependentUpon> |
105 | 114 | </Compile> | 117 | </Compile> |
106 | 115 | 118 | ||
107 | === modified file 'src/Canonical.UbuntuOne.Client.Views/Properties/AssemblyInfo.cs' | |||
108 | --- src/Canonical.UbuntuOne.Client.Views/Properties/AssemblyInfo.cs 2010-07-27 15:35:34 +0000 | |||
109 | +++ src/Canonical.UbuntuOne.Client.Views/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
110 | @@ -41,16 +41,4 @@ | |||
111 | 41 | )] | 41 | )] |
112 | 42 | 42 | ||
113 | 43 | 43 | ||
114 | 44 | // Version information for an assembly consists of the following four values: | ||
115 | 45 | // | ||
116 | 46 | // Major Version | ||
117 | 47 | // Minor Version | ||
118 | 48 | // Build Number | ||
119 | 49 | // Revision | ||
120 | 50 | // | ||
121 | 51 | // You can specify all the values or you can default the Build and Revision Numbers | ||
122 | 52 | // by using the '*' as shown below: | ||
123 | 53 | // [assembly: AssemblyVersion("1.0.*")] | ||
124 | 54 | [assembly: AssemblyVersion("1.0.0.0")] | ||
125 | 55 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
126 | 56 | [assembly: NeutralResourcesLanguageAttribute("")] | 44 | [assembly: NeutralResourcesLanguageAttribute("")] |
127 | 57 | 45 | ||
128 | === modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj' | |||
129 | --- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-07-28 11:06:07 +0000 | |||
130 | +++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-08-02 18:01:01 +0000 | |||
131 | @@ -32,6 +32,9 @@ | |||
132 | 32 | <ConsolePause>false</ConsolePause> | 32 | <ConsolePause>false</ConsolePause> |
133 | 33 | </PropertyGroup> | 33 | </PropertyGroup> |
134 | 34 | <ItemGroup> | 34 | <ItemGroup> |
135 | 35 | <Compile Include="..\Version.cs"> | ||
136 | 36 | <Link>Properties\Version.cs</Link> | ||
137 | 37 | </Compile> | ||
138 | 35 | <Compile Include="Notification\INotificationIconView.cs" /> | 38 | <Compile Include="Notification\INotificationIconView.cs" /> |
139 | 36 | <Compile Include="Notification\NotificationIconPresenter.cs" /> | 39 | <Compile Include="Notification\NotificationIconPresenter.cs" /> |
140 | 37 | <Compile Include="Notification\OperationCompletenessEventArgs.cs" /> | 40 | <Compile Include="Notification\OperationCompletenessEventArgs.cs" /> |
141 | 38 | 41 | ||
142 | === modified file 'src/Canonical.UbuntuOne.Client/Properties/AssemblyInfo.cs' | |||
143 | --- src/Canonical.UbuntuOne.Client/Properties/AssemblyInfo.cs 2010-07-04 11:53:55 +0000 | |||
144 | +++ src/Canonical.UbuntuOne.Client/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
145 | @@ -22,15 +22,3 @@ | |||
146 | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
147 | 23 | [assembly: Guid("3c7586a6-40ca-463b-b12c-b0aed0f4cb92")] | 23 | [assembly: Guid("3c7586a6-40ca-463b-b12c-b0aed0f4cb92")] |
148 | 24 | 24 | ||
149 | 25 | // Version information for an assembly consists of the following four values: | ||
150 | 26 | // | ||
151 | 27 | // Major Version | ||
152 | 28 | // Minor Version | ||
153 | 29 | // Build Number | ||
154 | 30 | // Revision | ||
155 | 31 | // | ||
156 | 32 | // You can specify all the values or you can default the Build and Revision Numbers | ||
157 | 33 | // by using the '*' as shown below: | ||
158 | 34 | // [assembly: AssemblyVersion("1.0.*")] | ||
159 | 35 | [assembly: AssemblyVersion("1.0.0.0")] | ||
160 | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
161 | 37 | 25 | ||
162 | === modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj' | |||
163 | --- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-07-23 15:51:36 +0000 | |||
164 | +++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-08-02 18:01:01 +0000 | |||
165 | @@ -32,6 +32,9 @@ | |||
166 | 32 | <ConsolePause>false</ConsolePause> | 32 | <ConsolePause>false</ConsolePause> |
167 | 33 | </PropertyGroup> | 33 | </PropertyGroup> |
168 | 34 | <ItemGroup> | 34 | <ItemGroup> |
169 | 35 | <Compile Include="..\Version.cs"> | ||
170 | 36 | <Link>Properties\Version.cs</Link> | ||
171 | 37 | </Compile> | ||
172 | 35 | <Compile Include="Aop\DebugLogAfterCallInterceptorFixture.cs" /> | 38 | <Compile Include="Aop\DebugLogAfterCallInterceptorFixture.cs" /> |
173 | 36 | <Compile Include="Aop\DebugLogAfterThrowInterceptorFixture.cs" /> | 39 | <Compile Include="Aop\DebugLogAfterThrowInterceptorFixture.cs" /> |
174 | 37 | <Compile Include="Container\DictionaryContainerFixture.cs" /> | 40 | <Compile Include="Container\DictionaryContainerFixture.cs" /> |
175 | 38 | 41 | ||
176 | === modified file 'src/Canonical.UbuntuOne.Common.Tests/Properties/AssemblyInfo.cs' | |||
177 | --- src/Canonical.UbuntuOne.Common.Tests/Properties/AssemblyInfo.cs 2010-07-05 17:17:01 +0000 | |||
178 | +++ src/Canonical.UbuntuOne.Common.Tests/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
179 | @@ -21,16 +21,3 @@ | |||
180 | 21 | 21 | ||
181 | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
182 | 23 | [assembly: Guid("15e0f5ae-077e-4598-8762-f4e56c5ed643")] | 23 | [assembly: Guid("15e0f5ae-077e-4598-8762-f4e56c5ed643")] |
183 | 24 | |||
184 | 25 | // Version information for an assembly consists of the following four values: | ||
185 | 26 | // | ||
186 | 27 | // Major Version | ||
187 | 28 | // Minor Version | ||
188 | 29 | // Build Number | ||
189 | 30 | // Revision | ||
190 | 31 | // | ||
191 | 32 | // You can specify all the values or you can default the Build and Revision Numbers | ||
192 | 33 | // by using the '*' as shown below: | ||
193 | 34 | // [assembly: AssemblyVersion("1.0.*")] | ||
194 | 35 | [assembly: AssemblyVersion("1.0.0.0")] | ||
195 | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
196 | 37 | 24 | ||
197 | === modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj' | |||
198 | --- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-07-23 15:51:36 +0000 | |||
199 | +++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-08-02 18:01:01 +0000 | |||
200 | @@ -32,6 +32,9 @@ | |||
201 | 32 | <ConsolePause>false</ConsolePause> | 32 | <ConsolePause>false</ConsolePause> |
202 | 33 | </PropertyGroup> | 33 | </PropertyGroup> |
203 | 34 | <ItemGroup> | 34 | <ItemGroup> |
204 | 35 | <Compile Include="..\Version.cs"> | ||
205 | 36 | <Link>Properties\Version.cs</Link> | ||
206 | 37 | </Compile> | ||
207 | 35 | <Compile Include="Aop\AopResources.Designer.cs"> | 38 | <Compile Include="Aop\AopResources.Designer.cs"> |
208 | 36 | <AutoGen>True</AutoGen> | 39 | <AutoGen>True</AutoGen> |
209 | 37 | <DesignTime>True</DesignTime> | 40 | <DesignTime>True</DesignTime> |
210 | 38 | 41 | ||
211 | === modified file 'src/Canonical.UbuntuOne.Common/Properties/AssemblyInfo.cs' | |||
212 | --- src/Canonical.UbuntuOne.Common/Properties/AssemblyInfo.cs 2010-07-21 10:06:45 +0000 | |||
213 | +++ src/Canonical.UbuntuOne.Common/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
214 | @@ -21,19 +21,6 @@ | |||
215 | 21 | 21 | ||
216 | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
217 | 23 | [assembly: Guid("8e0c62a4-085d-417a-b9d0-20b6ca8face1")] | 23 | [assembly: Guid("8e0c62a4-085d-417a-b9d0-20b6ca8face1")] |
218 | 24 | |||
219 | 25 | // Version information for an assembly consists of the following four values: | ||
220 | 26 | // | ||
221 | 27 | // Major Version | ||
222 | 28 | // Minor Version | ||
223 | 29 | // Build Number | ||
224 | 30 | // Revision | ||
225 | 31 | // | ||
226 | 32 | // You can specify all the values or you can default the Build and Revision Numbers | ||
227 | 33 | // by using the '*' as shown below: | ||
228 | 34 | // [assembly: AssemblyVersion("1.0.*")] | ||
229 | 35 | [assembly: AssemblyVersion("1.0.0.0")] | ||
230 | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
231 | 37 | [assembly: InternalsVisibleTo("Canonical.UbuntuOne.Common.Tests")] | 24 | [assembly: InternalsVisibleTo("Canonical.UbuntuOne.Common.Tests")] |
232 | 38 | // add the internals to be visible to the Rhino mocks code | 25 | // add the internals to be visible to the Rhino mocks code |
233 | 39 | [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] | 26 | [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] |
234 | 40 | \ No newline at end of file | 27 | \ No newline at end of file |
235 | 41 | 28 | ||
236 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj' | |||
237 | --- src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj 2010-07-13 09:12:00 +0000 | |||
238 | +++ src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj 2010-08-02 18:01:01 +0000 | |||
239 | @@ -52,6 +52,9 @@ | |||
240 | 52 | <ConsolePause>false</ConsolePause> | 52 | <ConsolePause>false</ConsolePause> |
241 | 53 | </PropertyGroup> | 53 | </PropertyGroup> |
242 | 54 | <ItemGroup> | 54 | <ItemGroup> |
243 | 55 | <Compile Include="..\Version.cs"> | ||
244 | 56 | <Link>Properties\Version.cs</Link> | ||
245 | 57 | </Compile> | ||
246 | 55 | <Compile Include="Properties\AssemblyInfo.cs" /> | 58 | <Compile Include="Properties\AssemblyInfo.cs" /> |
247 | 56 | <Compile Include="Protobuf\ConvertFixture.cs" /> | 59 | <Compile Include="Protobuf\ConvertFixture.cs" /> |
248 | 57 | <Compile Include="Protobuf\SyncConfigurationMessageFactoryFixture.cs" /> | 60 | <Compile Include="Protobuf\SyncConfigurationMessageFactoryFixture.cs" /> |
249 | 58 | 61 | ||
250 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Properties/AssemblyInfo.cs' | |||
251 | --- src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Properties/AssemblyInfo.cs 2010-07-04 18:47:44 +0000 | |||
252 | +++ src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
253 | @@ -21,16 +21,3 @@ | |||
254 | 21 | 21 | ||
255 | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
256 | 23 | [assembly: Guid("7cd55b5d-85c4-44c9-8379-b23650ef40c8")] | 23 | [assembly: Guid("7cd55b5d-85c4-44c9-8379-b23650ef40c8")] |
257 | 24 | |||
258 | 25 | // Version information for an assembly consists of the following four values: | ||
259 | 26 | // | ||
260 | 27 | // Major Version | ||
261 | 28 | // Minor Version | ||
262 | 29 | // Build Number | ||
263 | 30 | // Revision | ||
264 | 31 | // | ||
265 | 32 | // You can specify all the values or you can default the Build and Revision Numbers | ||
266 | 33 | // by using the '*' as shown below: | ||
267 | 34 | // [assembly: AssemblyVersion("1.0.*")] | ||
268 | 35 | [assembly: AssemblyVersion("1.0.0.0")] | ||
269 | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
270 | 37 | 24 | ||
271 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj' | |||
272 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-07-28 12:55:29 +0000 | |||
273 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-08-02 18:01:01 +0000 | |||
274 | @@ -67,6 +67,9 @@ | |||
275 | 67 | </None> | 67 | </None> |
276 | 68 | </ItemGroup> | 68 | </ItemGroup> |
277 | 69 | <ItemGroup> | 69 | <ItemGroup> |
278 | 70 | <Compile Include="..\Version.cs"> | ||
279 | 71 | <Link>Properties\Version.cs</Link> | ||
280 | 72 | </Compile> | ||
281 | 70 | <Compile Include="Program.cs" /> | 73 | <Compile Include="Program.cs" /> |
282 | 71 | <Compile Include="ProjectInstaller.cs"> | 74 | <Compile Include="ProjectInstaller.cs"> |
283 | 72 | <SubType>Component</SubType> | 75 | <SubType>Component</SubType> |
284 | 73 | 76 | ||
285 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Properties/AssemblyInfo.cs' | |||
286 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Properties/AssemblyInfo.cs 2010-07-04 18:47:44 +0000 | |||
287 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
288 | @@ -22,12 +22,4 @@ | |||
289 | 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. |
290 | 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. |
291 | 24 | [assembly: ComVisible(false)] | 24 | [assembly: ComVisible(false)] |
292 | 25 | |||
293 | 26 | // The assembly version has following format : | ||
294 | 27 | // | ||
295 | 28 | // Major.Minor.Build.Revision | ||
296 | 29 | // | ||
297 | 30 | // You can specify all the values or you can use the default the Revision and | ||
298 | 31 | // Build Numbers by using the '*' as shown below: | ||
299 | 32 | [assembly: AssemblyVersion("1.0.*")] | ||
300 | 33 | [assembly: InternalsVisibleTo("Canonical.UbuntuOne.ProcessDispatcher.Tests")] | 25 | [assembly: InternalsVisibleTo("Canonical.UbuntuOne.ProcessDispatcher.Tests")] |
301 | 34 | 26 | ||
302 | === modified file 'src/ServiceTestApp/Properties/AssemblyInfo.cs' | |||
303 | --- src/ServiceTestApp/Properties/AssemblyInfo.cs 2010-07-26 16:01:09 +0000 | |||
304 | +++ src/ServiceTestApp/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
305 | @@ -21,16 +21,3 @@ | |||
306 | 21 | 21 | ||
307 | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
308 | 23 | [assembly: Guid("be6f3304-10ed-4a11-88ed-cf93531fb577")] | 23 | [assembly: Guid("be6f3304-10ed-4a11-88ed-cf93531fb577")] |
309 | 24 | |||
310 | 25 | // Version information for an assembly consists of the following four values: | ||
311 | 26 | // | ||
312 | 27 | // Major Version | ||
313 | 28 | // Minor Version | ||
314 | 29 | // Build Number | ||
315 | 30 | // Revision | ||
316 | 31 | // | ||
317 | 32 | // You can specify all the values or you can default the Build and Revision Numbers | ||
318 | 33 | // by using the '*' as shown below: | ||
319 | 34 | // [assembly: AssemblyVersion("1.0.*")] | ||
320 | 35 | [assembly: AssemblyVersion("1.0.0.0")] | ||
321 | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
322 | 37 | 24 | ||
323 | === modified file 'src/ServiceTestApp/ServiceTestApp.csproj' | |||
324 | --- src/ServiceTestApp/ServiceTestApp.csproj 2010-07-26 16:01:09 +0000 | |||
325 | +++ src/ServiceTestApp/ServiceTestApp.csproj 2010-08-02 18:01:01 +0000 | |||
326 | @@ -58,6 +58,9 @@ | |||
327 | 58 | <Reference Include="System.Xml" /> | 58 | <Reference Include="System.Xml" /> |
328 | 59 | </ItemGroup> | 59 | </ItemGroup> |
329 | 60 | <ItemGroup> | 60 | <ItemGroup> |
330 | 61 | <Compile Include="..\Version.cs"> | ||
331 | 62 | <Link>Properties\Version.cs</Link> | ||
332 | 63 | </Compile> | ||
333 | 61 | <Compile Include="Program.cs" /> | 64 | <Compile Include="Program.cs" /> |
334 | 62 | <Compile Include="Properties\AssemblyInfo.cs" /> | 65 | <Compile Include="Properties\AssemblyInfo.cs" /> |
335 | 63 | </ItemGroup> | 66 | </ItemGroup> |
336 | 64 | 67 | ||
337 | === modified file 'src/UbuntuOneClient/Properties/AssemblyInfo.cs' | |||
338 | --- src/UbuntuOneClient/Properties/AssemblyInfo.cs 2010-07-28 11:03:35 +0000 | |||
339 | +++ src/UbuntuOneClient/Properties/AssemblyInfo.cs 2010-08-02 18:01:01 +0000 | |||
340 | @@ -40,18 +40,5 @@ | |||
341 | 40 | // app, or any theme specific resource dictionaries) | 40 | // app, or any theme specific resource dictionaries) |
342 | 41 | )] | 41 | )] |
343 | 42 | 42 | ||
344 | 43 | |||
345 | 44 | // Version information for an assembly consists of the following four values: | ||
346 | 45 | // | ||
347 | 46 | // Major Version | ||
348 | 47 | // Minor Version | ||
349 | 48 | // Build Number | ||
350 | 49 | // Revision | ||
351 | 50 | // | ||
352 | 51 | // You can specify all the values or you can default the Build and Revision Numbers | ||
353 | 52 | // by using the '*' as shown below: | ||
354 | 53 | // [assembly: AssemblyVersion("1.0.*")] | ||
355 | 54 | [assembly: AssemblyVersion("1.0.0.0")] | ||
356 | 55 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
357 | 56 | // allow the test assembly to access the internals | 43 | // allow the test assembly to access the internals |
358 | 57 | [assembly: InternalsVisibleTo("UbuntuOneClient.Tests")] | 44 | [assembly: InternalsVisibleTo("UbuntuOneClient.Tests")] |
359 | 58 | 45 | ||
360 | === modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj' | |||
361 | --- src/UbuntuOneClient/UbuntuOneClient.csproj 2010-07-28 11:03:35 +0000 | |||
362 | +++ src/UbuntuOneClient/UbuntuOneClient.csproj 2010-08-02 18:01:01 +0000 | |||
363 | @@ -62,6 +62,9 @@ | |||
364 | 62 | <Reference Include="PresentationFramework" /> | 62 | <Reference Include="PresentationFramework" /> |
365 | 63 | </ItemGroup> | 63 | </ItemGroup> |
366 | 64 | <ItemGroup> | 64 | <ItemGroup> |
367 | 65 | <Compile Include="..\Version.cs"> | ||
368 | 66 | <Link>Version.cs</Link> | ||
369 | 67 | </Compile> | ||
370 | 65 | <Compile Include="ApplicationWrapper.cs" /> | 68 | <Compile Include="ApplicationWrapper.cs" /> |
371 | 66 | <Compile Include="IApplication.cs" /> | 69 | <Compile Include="IApplication.cs" /> |
372 | 67 | <Compile Include="Program.cs" /> | 70 | <Compile Include="Program.cs" /> |
373 | 68 | 71 | ||
374 | === added file 'src/Version.cs' | |||
375 | --- src/Version.cs 1970-01-01 00:00:00 +0000 | |||
376 | +++ src/Version.cs 2010-08-02 18:01:01 +0000 | |||
377 | @@ -0,0 +1,15 @@ | |||
378 | 1 | using System.Reflection; | ||
379 | 2 | |||
380 | 3 | //------------------------------------------------------------------------------ | ||
381 | 4 | // <auto-generated> | ||
382 | 5 | // This code was generated by a tool. | ||
383 | 6 | // Runtime Version:2.0.50727.4927 | ||
384 | 7 | // | ||
385 | 8 | // Changes to this file may cause incorrect behavior and will be lost if | ||
386 | 9 | // the code is regenerated. | ||
387 | 10 | // </auto-generated> | ||
388 | 11 | //------------------------------------------------------------------------------ | ||
389 | 12 | |||
390 | 13 | [assembly: AssemblyVersionAttribute("1.0.0.0")] | ||
391 | 14 | [assembly: AssemblyFileVersionAttribute("1.0.0.0")] | ||
392 | 15 |
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.