Merge lp:~mandel/ubuntuone-windows-installer/fix_xml_warnings_3 into lp:ubuntuone-windows-installer/beta
- fix_xml_warnings_3
- Merge into beta
Status: | Merged |
---|---|
Approved by: | Rodrigo Moya |
Approved revision: | 32 |
Merged at revision: | 56 |
Proposed branch: | lp:~mandel/ubuntuone-windows-installer/fix_xml_warnings_3 |
Merge into: | lp:ubuntuone-windows-installer/beta |
Prerequisite: | lp:~mandel/ubuntuone-windows-installer/fix_xml_warnings_2 |
Diff against target: |
639 lines (+232/-238) 21 files modified
build.number (+1/-1) src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs (+17/-19) src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs (+18/-1) src/Canonical.UbuntuOne.Client.Views/UbuntuOneMessageBox.cs (+17/-19) src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs (+17/-19) src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs (+17/-19) src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj (+2/-1) src/Canonical.UbuntuOne.Common/Container/SpringContainer.cs (+17/-19) src/Canonical.UbuntuOne.Common/DataContracts/ShareData.cs (+17/-19) src/Canonical.UbuntuOne.Common/Update/IDotUpdaterWrapper.cs (+17/-19) src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs (+17/-19) src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/FolderMessageExtensions.cs (+1/-1) src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncConfigurationMessageFactory.cs (+17/-19) src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncShareMessageFactory.cs (+1/-1) src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncConfigurationMessageFactory.cs (+1/-1) src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncDaemonMessageExtensions.cs (+17/-19) src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncFolderMessageFactory.cs (+1/-1) src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs (+17/-19) src/Canonical.UbuntuOne.ProcessDispatcher/SyncFileManagerService.cs (+1/-1) src/Canonical.UbuntuOne.ProcessDispatcher/SyncSharesService.cs (+17/-19) src/Version.cs (+2/-2) |
To merge this branch: | bzr merge lp:~mandel/ubuntuone-windows-installer/fix_xml_warnings_3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincenzo Di Somma (community) | Approve | ||
Rodrigo Moya (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
Remove another 100 warning messages due to the xml docs. Removed the a test dll that was generating documentation.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Manuel de la Peña (mandel) wrote : | # |
He, stupid windows, those funny things are there because the encoding is UTF8 with a BOM.
From unicode.org:
A byte order mark (BOM) consists of the character code U+FEFF at the beginning of a data stream, where it can be used as a signature defining the byte order and encoding form, primarily of unmarked plaintext files. Under some higher level protocols, use of a BOM may be mandatory (or prohibited) in the Unicode data stream defined in that protocol.
I've been using VS set to Auto-detect UTF8 encoding without a signature so I have really no clue of what the hell is the BOM doing there. I wonder what happens if I remove it, will it be added again?
I'll check WTF is windows doing.
- 31. By Manuel de la Peña
-
Fix xml comments issues
- 32. By Manuel de la Peña
-
Merge with parent.
Preview Diff
1 | === modified file 'build.number' |
2 | --- build.number 2010-08-04 14:20:36 +0000 |
3 | +++ build.number 2010-08-09 16:43:43 +0000 |
4 | @@ -1,1 +1,1 @@ |
5 | -1.0.404.5869 |
6 | \ No newline at end of file |
7 | +1.0.405.3708 |
8 | \ No newline at end of file |
9 | |
10 | === modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs' |
11 | --- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-08-09 16:43:42 +0000 |
12 | +++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-08-09 16:43:43 +0000 |
13 | @@ -1,22 +1,20 @@ |
14 | -/** |
15 | - * Copyright 2010 Canonical Ltd. |
16 | - * |
17 | - * This file is part of UbuntuOne on Windows. |
18 | - * |
19 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
20 | - * it under the terms of the GNU Lesser General Public License version |
21 | - * as published by the Free Software Foundation. |
22 | - * |
23 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
24 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
25 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
26 | - * GNU Lesser General Public License for more details. |
27 | - * |
28 | - * You should have received a copy of the GNU Lesser General Public License |
29 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
30 | - * |
31 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
32 | - */ |
33 | +// Copyright 2010 Canonical Ltd. |
34 | +// |
35 | +// This file is part of UbuntuOne on Windows. |
36 | +// |
37 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
38 | +// it under the terms of the GNU Lesser General Public License version |
39 | +// as published by the Free Software Foundation. |
40 | +// |
41 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
42 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
43 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
44 | +// GNU Lesser General Public License for more details. |
45 | +// |
46 | +// You should have received a copy of the GNU Lesser General Public License |
47 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
48 | +// |
49 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
50 | using System; |
51 | using System.Collections.Generic; |
52 | using Canonical.UbuntuOne.Client.Notification; |
53 | |
54 | === modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs' |
55 | --- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs 2010-08-09 16:43:42 +0000 |
56 | +++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs 2010-08-09 16:43:43 +0000 |
57 | @@ -1,4 +1,21 @@ |
58 | -using System; |
59 | +// Copyright 2010 Canonical Ltd. |
60 | +// |
61 | +// This file is part of UbuntuOne on Windows. |
62 | +// |
63 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
64 | +// it under the terms of the GNU Lesser General Public License version |
65 | +// as published by the Free Software Foundation. |
66 | +// |
67 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
68 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
69 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
70 | +// GNU Lesser General Public License for more details. |
71 | +// |
72 | +// You should have received a copy of the GNU Lesser General Public License |
73 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
74 | +// |
75 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
76 | +using System; |
77 | using System.Collections.Generic; |
78 | using System.Linq; |
79 | using System.Text; |
80 | |
81 | === modified file 'src/Canonical.UbuntuOne.Client.Views/UbuntuOneMessageBox.cs' |
82 | --- src/Canonical.UbuntuOne.Client.Views/UbuntuOneMessageBox.cs 2010-07-29 17:16:40 +0000 |
83 | +++ src/Canonical.UbuntuOne.Client.Views/UbuntuOneMessageBox.cs 2010-08-09 16:43:43 +0000 |
84 | @@ -1,22 +1,20 @@ |
85 | -/** |
86 | - * Copyright 2010 Canonical Ltd. |
87 | - * |
88 | - * This file is part of UbuntuOne on Windows. |
89 | - * |
90 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
91 | - * it under the terms of the GNU Lesser General Public License version |
92 | - * as published by the Free Software Foundation. |
93 | - * |
94 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
95 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
96 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
97 | - * GNU Lesser General Public License for more details. |
98 | - * |
99 | - * You should have received a copy of the GNU Lesser General Public License |
100 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
101 | - * |
102 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
103 | - */ |
104 | +// Copyright 2010 Canonical Ltd. |
105 | +// |
106 | +// This file is part of UbuntuOne on Windows. |
107 | +// |
108 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
109 | +// it under the terms of the GNU Lesser General Public License version |
110 | +// as published by the Free Software Foundation. |
111 | +// |
112 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
113 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
114 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
115 | +// GNU Lesser General Public License for more details. |
116 | +// |
117 | +// You should have received a copy of the GNU Lesser General Public License |
118 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
119 | +// |
120 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
121 | using System.Windows; |
122 | using Canonical.UbuntuOne.Common; |
123 | |
124 | |
125 | === modified file 'src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs' |
126 | --- src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs 2010-08-09 16:43:42 +0000 |
127 | +++ src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs 2010-08-09 16:43:43 +0000 |
128 | @@ -1,22 +1,20 @@ |
129 | -/** |
130 | - * Copyright 2010 Canonical Ltd. |
131 | - * |
132 | - * This file is part of UbuntuOne on Windows. |
133 | - * |
134 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
135 | - * it under the terms of the GNU Lesser General Public License version |
136 | - * as published by the Free Software Foundation. |
137 | - * |
138 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
139 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
140 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
141 | - * GNU Lesser General Public License for more details. |
142 | - * |
143 | - * You should have received a copy of the GNU Lesser General Public License |
144 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
145 | - * |
146 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
147 | - */ |
148 | +// Copyright 2010 Canonical Ltd. |
149 | +// |
150 | +// This file is part of UbuntuOne on Windows. |
151 | +// |
152 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
153 | +// it under the terms of the GNU Lesser General Public License version |
154 | +// as published by the Free Software Foundation. |
155 | +// |
156 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
157 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
158 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
159 | +// GNU Lesser General Public License for more details. |
160 | +// |
161 | +// You should have received a copy of the GNU Lesser General Public License |
162 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
163 | +// |
164 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
165 | using System; |
166 | using Canonical.UbuntuOne.Common.Update; |
167 | using StaticResources = Canonical.UbuntuOne.Client.Views.Resources.Resources; |
168 | |
169 | === modified file 'src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs' |
170 | --- src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs 2010-08-09 16:43:42 +0000 |
171 | +++ src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs 2010-08-09 16:43:43 +0000 |
172 | @@ -1,22 +1,20 @@ |
173 | -/** |
174 | - * Copyright 2010 Canonical Ltd. |
175 | - * |
176 | - * This file is part of UbuntuOne on Windows. |
177 | - * |
178 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
179 | - * it under the terms of the GNU Lesser General Public License version |
180 | - * as published by the Free Software Foundation. |
181 | - * |
182 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
183 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
184 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
185 | - * GNU Lesser General Public License for more details. |
186 | - * |
187 | - * You should have received a copy of the GNU Lesser General Public License |
188 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
189 | - * |
190 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
191 | - */ |
192 | +// Copyright 2010 Canonical Ltd. |
193 | +// |
194 | +// This file is part of UbuntuOne on Windows. |
195 | +// |
196 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
197 | +// it under the terms of the GNU Lesser General Public License version |
198 | +// as published by the Free Software Foundation. |
199 | +// |
200 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
201 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
202 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
203 | +// GNU Lesser General Public License for more details. |
204 | +// |
205 | +// You should have received a copy of the GNU Lesser General Public License |
206 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
207 | +// |
208 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
209 | using System; |
210 | using Canonical.UbuntuOne.Common.Update; |
211 | |
212 | |
213 | === modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj' |
214 | --- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-08-09 16:43:42 +0000 |
215 | +++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-08-09 16:43:43 +0000 |
216 | @@ -21,7 +21,8 @@ |
217 | <WarningLevel>4</WarningLevel> |
218 | <PlatformTarget>x86</PlatformTarget> |
219 | <ConsolePause>false</ConsolePause> |
220 | - <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Common.Tests.XML</DocumentationFile> |
221 | + <DocumentationFile> |
222 | + </DocumentationFile> |
223 | </PropertyGroup> |
224 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> |
225 | <DebugType>none</DebugType> |
226 | |
227 | === modified file 'src/Canonical.UbuntuOne.Common/Container/SpringContainer.cs' |
228 | --- src/Canonical.UbuntuOne.Common/Container/SpringContainer.cs 2010-08-09 16:43:42 +0000 |
229 | +++ src/Canonical.UbuntuOne.Common/Container/SpringContainer.cs 2010-08-09 16:43:43 +0000 |
230 | @@ -1,22 +1,20 @@ |
231 | -/** |
232 | - * Copyright 2010 Canonical Ltd. |
233 | - * |
234 | - * This file is part of UbuntuOne on Windows. |
235 | - * |
236 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
237 | - * it under the terms of the GNU Lesser General Public License version |
238 | - * as published by the Free Software Foundation. |
239 | - * |
240 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
241 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
242 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
243 | - * GNU Lesser General Public License for more details. |
244 | - * |
245 | - * You should have received a copy of the GNU Lesser General Public License |
246 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
247 | - * |
248 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
249 | - */ |
250 | +// Copyright 2010 Canonical Ltd. |
251 | +// |
252 | +// This file is part of UbuntuOne on Windows. |
253 | +// |
254 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
255 | +// it under the terms of the GNU Lesser General Public License version |
256 | +// as published by the Free Software Foundation. |
257 | +// |
258 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
259 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
260 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
261 | +// GNU Lesser General Public License for more details. |
262 | +// |
263 | +// You should have received a copy of the GNU Lesser General Public License |
264 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
265 | +// |
266 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
267 | using System; |
268 | using System.Collections; |
269 | using System.Linq; |
270 | |
271 | === modified file 'src/Canonical.UbuntuOne.Common/DataContracts/ShareData.cs' |
272 | --- src/Canonical.UbuntuOne.Common/DataContracts/ShareData.cs 2010-08-09 16:43:42 +0000 |
273 | +++ src/Canonical.UbuntuOne.Common/DataContracts/ShareData.cs 2010-08-09 16:43:43 +0000 |
274 | @@ -1,22 +1,20 @@ |
275 | -/** |
276 | - * Copyright 2010 Canonical Ltd. |
277 | - * |
278 | - * This file is part of UbuntuOne on Windows. |
279 | - * |
280 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
281 | - * it under the terms of the GNU Lesser General Public License version |
282 | - * as published by the Free Software Foundation. |
283 | - * |
284 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
285 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
286 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
287 | - * GNU Lesser General Public License for more details. |
288 | - * |
289 | - * You should have received a copy of the GNU Lesser General Public License |
290 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
291 | - * |
292 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
293 | - */ |
294 | +// Copyright 2010 Canonical Ltd. |
295 | +// |
296 | +// This file is part of UbuntuOne on Windows. |
297 | +// |
298 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
299 | +// it under the terms of the GNU Lesser General Public License version |
300 | +// as published by the Free Software Foundation. |
301 | +// |
302 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
303 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
304 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
305 | +// GNU Lesser General Public License for more details. |
306 | +// |
307 | +// You should have received a copy of the GNU Lesser General Public License |
308 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
309 | +// |
310 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
311 | using System.Runtime.Serialization; |
312 | |
313 | namespace Canonical.UbuntuOne.Common |
314 | |
315 | === modified file 'src/Canonical.UbuntuOne.Common/Update/IDotUpdaterWrapper.cs' |
316 | --- src/Canonical.UbuntuOne.Common/Update/IDotUpdaterWrapper.cs 2010-07-21 08:27:33 +0000 |
317 | +++ src/Canonical.UbuntuOne.Common/Update/IDotUpdaterWrapper.cs 2010-08-09 16:43:43 +0000 |
318 | @@ -1,22 +1,20 @@ |
319 | -/** |
320 | - * Copyright 2010 Canonical Ltd. |
321 | - * |
322 | - * This file is part of UbuntuOne on Windows. |
323 | - * |
324 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
325 | - * it under the terms of the GNU Lesser General Public License version |
326 | - * as published by the Free Software Foundation. |
327 | - * |
328 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
329 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
330 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
331 | - * GNU Lesser General Public License for more details. |
332 | - * |
333 | - * You should have received a copy of the GNU Lesser General Public License |
334 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
335 | - * |
336 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
337 | - */ |
338 | +// Copyright 2010 Canonical Ltd. |
339 | +// |
340 | +// This file is part of UbuntuOne on Windows. |
341 | +// |
342 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
343 | +// it under the terms of the GNU Lesser General Public License version |
344 | +// as published by the Free Software Foundation. |
345 | +// |
346 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
347 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
348 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
349 | +// GNU Lesser General Public License for more details. |
350 | +// |
351 | +// You should have received a copy of the GNU Lesser General Public License |
352 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
353 | +// |
354 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
355 | using System; |
356 | using Microsoft.ApplicationBlocks.Updater; |
357 | |
358 | |
359 | === modified file 'src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs' |
360 | --- src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs 2010-08-09 16:43:42 +0000 |
361 | +++ src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs 2010-08-09 16:43:43 +0000 |
362 | @@ -1,22 +1,20 @@ |
363 | -/** |
364 | - * Copyright 2010 Canonical Ltd. |
365 | - * |
366 | - * This file is part of UbuntuOne on Windows. |
367 | - * |
368 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
369 | - * it under the terms of the GNU Lesser General Public License version |
370 | - * as published by the Free Software Foundation. |
371 | - * |
372 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
373 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
374 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
375 | - * GNU Lesser General Public License for more details. |
376 | - * |
377 | - * You should have received a copy of the GNU Lesser General Public License |
378 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
379 | - * |
380 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
381 | - */ |
382 | +// Copyright 2010 Canonical Ltd. |
383 | +// |
384 | +// This file is part of UbuntuOne on Windows. |
385 | +// |
386 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
387 | +// it under the terms of the GNU Lesser General Public License version |
388 | +// as published by the Free Software Foundation. |
389 | +// |
390 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
391 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
392 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
393 | +// GNU Lesser General Public License for more details. |
394 | +// |
395 | +// You should have received a copy of the GNU Lesser General Public License |
396 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
397 | +// |
398 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
399 | |
400 | namespace Canonical.UbuntuOne.Common.Update |
401 | { |
402 | |
403 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/FolderMessageExtensions.cs' |
404 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/FolderMessageExtensions.cs 2010-07-13 09:52:05 +0000 |
405 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/FolderMessageExtensions.cs 2010-08-09 16:43:43 +0000 |
406 | @@ -1,4 +1,4 @@ |
407 | -/** |
408 | +/* |
409 | * Copyright 2010 Canonical Ltd. |
410 | * |
411 | * This file is part of UbuntuOne on Windows. |
412 | |
413 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncConfigurationMessageFactory.cs' |
414 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncConfigurationMessageFactory.cs 2010-07-07 17:06:36 +0000 |
415 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncConfigurationMessageFactory.cs 2010-08-09 16:43:43 +0000 |
416 | @@ -1,22 +1,20 @@ |
417 | -/** |
418 | - * Copyright 2010 Canonical Ltd. |
419 | - * |
420 | - * This file is part of UbuntuOne on Windows. |
421 | - * |
422 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
423 | - * it under the terms of the GNU Lesser General Public License version |
424 | - * as published by the Free Software Foundation. |
425 | - * |
426 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
427 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
428 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
429 | - * GNU Lesser General Public License for more details. |
430 | - * |
431 | - * You should have received a copy of the GNU Lesser General Public License |
432 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
433 | - * |
434 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
435 | - */ |
436 | +// Copyright 2010 Canonical Ltd. |
437 | +// |
438 | +// This file is part of UbuntuOne on Windows. |
439 | +// |
440 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
441 | +// it under the terms of the GNU Lesser General Public License version |
442 | +// as published by the Free Software Foundation. |
443 | +// |
444 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
445 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
446 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
447 | +// GNU Lesser General Public License for more details. |
448 | +// |
449 | +// You should have received a copy of the GNU Lesser General Public License |
450 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
451 | +// |
452 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
453 | using Canonical.UbuntuOne.Common; |
454 | |
455 | namespace Canonical.UbuntuOne.ProcessDispatcher |
456 | |
457 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncShareMessageFactory.cs' |
458 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncShareMessageFactory.cs 2010-07-08 11:39:25 +0000 |
459 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/ISyncShareMessageFactory.cs 2010-08-09 16:43:43 +0000 |
460 | @@ -1,4 +1,4 @@ |
461 | -/** |
462 | +/* |
463 | * Copyright 2010 Canonical Ltd. |
464 | * |
465 | * This file is part of UbuntuOne on Windows. |
466 | |
467 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncConfigurationMessageFactory.cs' |
468 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncConfigurationMessageFactory.cs 2010-07-13 09:12:00 +0000 |
469 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncConfigurationMessageFactory.cs 2010-08-09 16:43:43 +0000 |
470 | @@ -1,4 +1,4 @@ |
471 | -/** |
472 | +/* |
473 | * Copyright 2010 Canonical Ltd. |
474 | * |
475 | * This file is part of UbuntuOne on Windows. |
476 | |
477 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncDaemonMessageExtensions.cs' |
478 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncDaemonMessageExtensions.cs 2010-07-13 09:52:05 +0000 |
479 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncDaemonMessageExtensions.cs 2010-08-09 16:43:43 +0000 |
480 | @@ -1,22 +1,20 @@ |
481 | -/** |
482 | - * Copyright 2010 Canonical Ltd. |
483 | - * |
484 | - * This file is part of UbuntuOne on Windows. |
485 | - * |
486 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
487 | - * it under the terms of the GNU Lesser General Public License version |
488 | - * as published by the Free Software Foundation. |
489 | - * |
490 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
491 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
492 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
493 | - * GNU Lesser General Public License for more details. |
494 | - * |
495 | - * You should have received a copy of the GNU Lesser General Public License |
496 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
497 | - * |
498 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
499 | - */ |
500 | +// Copyright 2010 Canonical Ltd. |
501 | +// |
502 | +// This file is part of UbuntuOne on Windows. |
503 | +// |
504 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
505 | +// it under the terms of the GNU Lesser General Public License version |
506 | +// as published by the Free Software Foundation. |
507 | +// |
508 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
509 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
510 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
511 | +// GNU Lesser General Public License for more details. |
512 | +// |
513 | +// You should have received a copy of the GNU Lesser General Public License |
514 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
515 | +// |
516 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
517 | using System.Collections.Generic; |
518 | |
519 | namespace Canonical.UbuntuOne.ProcessDispatcher |
520 | |
521 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncFolderMessageFactory.cs' |
522 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncFolderMessageFactory.cs 2010-07-13 09:12:00 +0000 |
523 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Protobuf/SyncFolderMessageFactory.cs 2010-08-09 16:43:43 +0000 |
524 | @@ -1,4 +1,4 @@ |
525 | -/** |
526 | +/* |
527 | * Copyright 2010 Canonical Ltd. |
528 | * |
529 | * This file is part of UbuntuOne on Windows. |
530 | |
531 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs' |
532 | --- src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs 2010-08-09 16:43:42 +0000 |
533 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs 2010-08-09 16:43:43 +0000 |
534 | @@ -1,22 +1,20 @@ |
535 | -/** |
536 | - * Copyright 2010 Canonical Ltd. |
537 | - * |
538 | - * This file is part of UbuntuOne on Windows. |
539 | - * |
540 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
541 | - * it under the terms of the GNU Lesser General Public License version |
542 | - * as published by the Free Software Foundation. |
543 | - * |
544 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
545 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
546 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
547 | - * GNU Lesser General Public License for more details. |
548 | - * |
549 | - * You should have received a copy of the GNU Lesser General Public License |
550 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
551 | - * |
552 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
553 | - */ |
554 | +// Copyright 2010 Canonical Ltd. |
555 | +// |
556 | +// This file is part of UbuntuOne on Windows. |
557 | +// |
558 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
559 | +// it under the terms of the GNU Lesser General Public License version |
560 | +// as published by the Free Software Foundation. |
561 | +// |
562 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
563 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
564 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
565 | +// GNU Lesser General Public License for more details. |
566 | +// |
567 | +// You should have received a copy of the GNU Lesser General Public License |
568 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
569 | +// |
570 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
571 | using System; |
572 | using System.Collections.Generic; |
573 | using Canonical.UbuntuOne.Common; |
574 | |
575 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/SyncFileManagerService.cs' |
576 | --- src/Canonical.UbuntuOne.ProcessDispatcher/SyncFileManagerService.cs 2010-08-09 16:43:42 +0000 |
577 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/SyncFileManagerService.cs 2010-08-09 16:43:43 +0000 |
578 | @@ -1,4 +1,4 @@ |
579 | -/** |
580 | +/* |
581 | * Copyright 2010 Canonical Ltd. |
582 | * |
583 | * This file is part of UbuntuOne on Windows. |
584 | |
585 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/SyncSharesService.cs' |
586 | --- src/Canonical.UbuntuOne.ProcessDispatcher/SyncSharesService.cs 2010-08-09 16:43:42 +0000 |
587 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/SyncSharesService.cs 2010-08-09 16:43:43 +0000 |
588 | @@ -1,22 +1,20 @@ |
589 | -/** |
590 | - * Copyright 2010 Canonical Ltd. |
591 | - * |
592 | - * This file is part of UbuntuOne on Windows. |
593 | - * |
594 | - * UbuntuOne on Windows is free software: you can redistribute it and/or modify |
595 | - * it under the terms of the GNU Lesser General Public License version |
596 | - * as published by the Free Software Foundation. |
597 | - * |
598 | - * Ubuntu One on Windows is distributed in the hope that it will be useful, |
599 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
600 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
601 | - * GNU Lesser General Public License for more details. |
602 | - * |
603 | - * You should have received a copy of the GNU Lesser General Public License |
604 | - * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
605 | - * |
606 | - * Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
607 | - */ |
608 | +// Copyright 2010 Canonical Ltd. |
609 | +// |
610 | +// This file is part of UbuntuOne on Windows. |
611 | +// |
612 | +// UbuntuOne on Windows is free software: you can redistribute it and/or modify |
613 | +// it under the terms of the GNU Lesser General Public License version |
614 | +// as published by the Free Software Foundation. |
615 | +// |
616 | +// Ubuntu One on Windows is distributed in the hope that it will be useful, |
617 | +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
618 | +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
619 | +// GNU Lesser General Public License for more details. |
620 | +// |
621 | +// You should have received a copy of the GNU Lesser General Public License |
622 | +// along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
623 | +// |
624 | +// Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
625 | using System; |
626 | using System.Collections.Generic; |
627 | using Canonical.UbuntuOne.Common; |
628 | |
629 | === modified file 'src/Version.cs' |
630 | --- src/Version.cs 2010-08-04 14:20:36 +0000 |
631 | +++ src/Version.cs 2010-08-09 16:43:43 +0000 |
632 | @@ -10,6 +10,6 @@ |
633 | // </auto-generated> |
634 | //------------------------------------------------------------------------------ |
635 | |
636 | -[assembly: AssemblyVersionAttribute("1.0.404.5869")] |
637 | -[assembly: AssemblyFileVersionAttribute("1.0.404.5869")] |
638 | +[assembly: AssemblyVersionAttribute("1.0.405.3708")] |
639 | +[assembly: AssemblyFileVersionAttribute("1.0.405.3708")] |
640 |
24 +//
what are those chars in the first line?
Also, your name is wrong in some of the comments:
+// Authors: Manuel de la Peña <email address hidden>
Seems you (that is, the Windows editor you are using) are saving the files in an incorrect encoding?
Apart from that, since I just see a fix in the XML (apart from the comments changes), approving