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 | 1.0.404.5869 | ||
6 | 2 | \ No newline at end of file | 1 | \ No newline at end of file |
7 | 2 | 1.0.405.3708 | ||
8 | 3 | \ No newline at end of file | 3 | \ No newline at end of file |
9 | 4 | 4 | ||
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 @@ | |||
33 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
34 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
35 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
36 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
37 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
38 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
39 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
40 | 8 | * as published by the Free Software Foundation. | 8 | // |
41 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
42 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
43 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
44 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
45 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
46 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
47 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
48 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
49 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
31 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
32 | 19 | */ | ||
50 | 20 | using System; | 18 | using System; |
51 | 21 | using System.Collections.Generic; | 19 | using System.Collections.Generic; |
52 | 22 | using Canonical.UbuntuOne.Client.Notification; | 20 | using Canonical.UbuntuOne.Client.Notification; |
53 | 23 | 21 | ||
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 @@ | |||
59 | 1 | using System; | 1 | // Copyright 2010 Canonical Ltd. |
60 | 2 | // | ||
61 | 3 | // This file is part of UbuntuOne on Windows. | ||
62 | 4 | // | ||
63 | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify | ||
64 | 6 | // it under the terms of the GNU Lesser General Public License version | ||
65 | 7 | // as published by the Free Software Foundation. | ||
66 | 8 | // | ||
67 | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, | ||
68 | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
69 | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
70 | 12 | // GNU Lesser General Public License for more details. | ||
71 | 13 | // | ||
72 | 14 | // You should have received a copy of the GNU Lesser General Public License | ||
73 | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | ||
74 | 16 | // | ||
75 | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
76 | 18 | using System; | ||
77 | 2 | using System.Collections.Generic; | 19 | using System.Collections.Generic; |
78 | 3 | using System.Linq; | 20 | using System.Linq; |
79 | 4 | using System.Text; | 21 | using System.Text; |
80 | 5 | 22 | ||
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 @@ | |||
104 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
105 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
106 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
107 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
108 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
109 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
110 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
111 | 8 | * as published by the Free Software Foundation. | 8 | // |
112 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
113 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
114 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
115 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
116 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
117 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
118 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
119 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
120 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
102 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
103 | 19 | */ | ||
121 | 20 | using System.Windows; | 18 | using System.Windows; |
122 | 21 | using Canonical.UbuntuOne.Common; | 19 | using Canonical.UbuntuOne.Common; |
123 | 22 | 20 | ||
124 | 23 | 21 | ||
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 @@ | |||
148 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
149 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
150 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
151 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
152 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
153 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
154 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
155 | 8 | * as published by the Free Software Foundation. | 8 | // |
156 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
157 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
158 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
159 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
160 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
161 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
162 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
163 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
164 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
146 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
147 | 19 | */ | ||
165 | 20 | using System; | 18 | using System; |
166 | 21 | using Canonical.UbuntuOne.Common.Update; | 19 | using Canonical.UbuntuOne.Common.Update; |
167 | 22 | using StaticResources = Canonical.UbuntuOne.Client.Views.Resources.Resources; | 20 | using StaticResources = Canonical.UbuntuOne.Client.Views.Resources.Resources; |
168 | 23 | 21 | ||
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 @@ | |||
192 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
193 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
194 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
195 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
196 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
197 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
198 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
199 | 8 | * as published by the Free Software Foundation. | 8 | // |
200 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
201 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
202 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
203 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
204 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
205 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
206 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
207 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
208 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
190 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
191 | 19 | */ | ||
209 | 20 | using System; | 18 | using System; |
210 | 21 | using Canonical.UbuntuOne.Common.Update; | 19 | using Canonical.UbuntuOne.Common.Update; |
211 | 22 | 20 | ||
212 | 23 | 21 | ||
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 | 21 | <WarningLevel>4</WarningLevel> | 21 | <WarningLevel>4</WarningLevel> |
218 | 22 | <PlatformTarget>x86</PlatformTarget> | 22 | <PlatformTarget>x86</PlatformTarget> |
219 | 23 | <ConsolePause>false</ConsolePause> | 23 | <ConsolePause>false</ConsolePause> |
221 | 24 | <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Common.Tests.XML</DocumentationFile> | 24 | <DocumentationFile> |
222 | 25 | </DocumentationFile> | ||
223 | 25 | </PropertyGroup> | 26 | </PropertyGroup> |
224 | 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | 27 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> |
225 | 27 | <DebugType>none</DebugType> | 28 | <DebugType>none</DebugType> |
226 | 28 | 29 | ||
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 @@ | |||
250 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
251 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
252 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
253 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
254 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
255 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
256 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
257 | 8 | * as published by the Free Software Foundation. | 8 | // |
258 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
259 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
260 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
261 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
262 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
263 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
264 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
265 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
266 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
248 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
249 | 19 | */ | ||
267 | 20 | using System; | 18 | using System; |
268 | 21 | using System.Collections; | 19 | using System.Collections; |
269 | 22 | using System.Linq; | 20 | using System.Linq; |
270 | 23 | 21 | ||
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 @@ | |||
294 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
295 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
296 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
297 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
298 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
299 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
300 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
301 | 8 | * as published by the Free Software Foundation. | 8 | // |
302 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
303 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
304 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
305 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
306 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
307 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
308 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
309 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
310 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
292 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
293 | 19 | */ | ||
311 | 20 | using System.Runtime.Serialization; | 18 | using System.Runtime.Serialization; |
312 | 21 | 19 | ||
313 | 22 | namespace Canonical.UbuntuOne.Common | 20 | namespace Canonical.UbuntuOne.Common |
314 | 23 | 21 | ||
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 @@ | |||
338 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
339 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
340 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
341 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
342 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
343 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
344 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
345 | 8 | * as published by the Free Software Foundation. | 8 | // |
346 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
347 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
348 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
349 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
350 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
351 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
352 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
353 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
354 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
336 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
337 | 19 | */ | ||
355 | 20 | using System; | 18 | using System; |
356 | 21 | using Microsoft.ApplicationBlocks.Updater; | 19 | using Microsoft.ApplicationBlocks.Updater; |
357 | 22 | 20 | ||
358 | 23 | 21 | ||
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 @@ | |||
382 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
383 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
384 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
385 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
386 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
387 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
388 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
389 | 8 | * as published by the Free Software Foundation. | 8 | // |
390 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
391 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
392 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
393 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
394 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
395 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
396 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
397 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
398 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
380 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
381 | 19 | */ | ||
399 | 20 | 18 | ||
400 | 21 | namespace Canonical.UbuntuOne.Common.Update | 19 | namespace Canonical.UbuntuOne.Common.Update |
401 | 22 | { | 20 | { |
402 | 23 | 21 | ||
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 @@ | |||
408 | 1 | /** | 1 | /* |
409 | 2 | * Copyright 2010 Canonical Ltd. | 2 | * Copyright 2010 Canonical Ltd. |
410 | 3 | * | 3 | * |
411 | 4 | * This file is part of UbuntuOne on Windows. | 4 | * This file is part of UbuntuOne on Windows. |
412 | 5 | 5 | ||
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 @@ | |||
436 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
437 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
438 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
439 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
440 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
441 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
442 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
443 | 8 | * as published by the Free Software Foundation. | 8 | // |
444 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
445 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
446 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
447 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
448 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
449 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
450 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
451 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
452 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
434 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
435 | 19 | */ | ||
453 | 20 | using Canonical.UbuntuOne.Common; | 18 | using Canonical.UbuntuOne.Common; |
454 | 21 | 19 | ||
455 | 22 | namespace Canonical.UbuntuOne.ProcessDispatcher | 20 | namespace Canonical.UbuntuOne.ProcessDispatcher |
456 | 23 | 21 | ||
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 @@ | |||
462 | 1 | /** | 1 | /* |
463 | 2 | * Copyright 2010 Canonical Ltd. | 2 | * Copyright 2010 Canonical Ltd. |
464 | 3 | * | 3 | * |
465 | 4 | * This file is part of UbuntuOne on Windows. | 4 | * This file is part of UbuntuOne on Windows. |
466 | 5 | 5 | ||
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 @@ | |||
472 | 1 | /** | 1 | /* |
473 | 2 | * Copyright 2010 Canonical Ltd. | 2 | * Copyright 2010 Canonical Ltd. |
474 | 3 | * | 3 | * |
475 | 4 | * This file is part of UbuntuOne on Windows. | 4 | * This file is part of UbuntuOne on Windows. |
476 | 5 | 5 | ||
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 @@ | |||
500 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
501 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
502 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
503 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
504 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
505 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
506 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
507 | 8 | * as published by the Free Software Foundation. | 8 | // |
508 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
509 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
510 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
511 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
512 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
513 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
514 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
515 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
516 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
498 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
499 | 19 | */ | ||
517 | 20 | using System.Collections.Generic; | 18 | using System.Collections.Generic; |
518 | 21 | 19 | ||
519 | 22 | namespace Canonical.UbuntuOne.ProcessDispatcher | 20 | namespace Canonical.UbuntuOne.ProcessDispatcher |
520 | 23 | 21 | ||
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 @@ | |||
526 | 1 | /** | 1 | /* |
527 | 2 | * Copyright 2010 Canonical Ltd. | 2 | * Copyright 2010 Canonical Ltd. |
528 | 3 | * | 3 | * |
529 | 4 | * This file is part of UbuntuOne on Windows. | 4 | * This file is part of UbuntuOne on Windows. |
530 | 5 | 5 | ||
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 @@ | |||
554 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
555 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
556 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
557 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
558 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
559 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
560 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
561 | 8 | * as published by the Free Software Foundation. | 8 | // |
562 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
563 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
564 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
565 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
566 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
567 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
568 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
569 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
570 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
552 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
553 | 19 | */ | ||
571 | 20 | using System; | 18 | using System; |
572 | 21 | using System.Collections.Generic; | 19 | using System.Collections.Generic; |
573 | 22 | using Canonical.UbuntuOne.Common; | 20 | using Canonical.UbuntuOne.Common; |
574 | 23 | 21 | ||
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 @@ | |||
580 | 1 | /** | 1 | /* |
581 | 2 | * Copyright 2010 Canonical Ltd. | 2 | * Copyright 2010 Canonical Ltd. |
582 | 3 | * | 3 | * |
583 | 4 | * This file is part of UbuntuOne on Windows. | 4 | * This file is part of UbuntuOne on Windows. |
584 | 5 | 5 | ||
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 @@ | |||
608 | 1 | /** | 1 | // Copyright 2010 Canonical Ltd. |
609 | 2 | * Copyright 2010 Canonical Ltd. | 2 | // |
610 | 3 | * | 3 | // This file is part of UbuntuOne on Windows. |
611 | 4 | * This file is part of UbuntuOne on Windows. | 4 | // |
612 | 5 | * | 5 | // UbuntuOne on Windows is free software: you can redistribute it and/or modify |
613 | 6 | * UbuntuOne on Windows is free software: you can redistribute it and/or modify | 6 | // it under the terms of the GNU Lesser General Public License version |
614 | 7 | * it under the terms of the GNU Lesser General Public License version | 7 | // as published by the Free Software Foundation. |
615 | 8 | * as published by the Free Software Foundation. | 8 | // |
616 | 9 | * | 9 | // Ubuntu One on Windows is distributed in the hope that it will be useful, |
617 | 10 | * Ubuntu One on Windows is distributed in the hope that it will be useful, | 10 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
618 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
619 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // GNU Lesser General Public License for more details. |
620 | 13 | * GNU Lesser General Public License for more details. | 13 | // |
621 | 14 | * | 14 | // You should have received a copy of the GNU Lesser General Public License |
622 | 15 | * You should have received a copy of the GNU Lesser General Public License | 15 | // along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. |
623 | 16 | * along with UbuntuOne for Windows. If not, see <http://www.gnu.org/licenses/>. | 16 | // |
624 | 17 | * | 17 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
606 | 18 | * Authors: Manuel de la Peña <manuel.delapena@canonical.com> | ||
607 | 19 | */ | ||
625 | 20 | using System; | 18 | using System; |
626 | 21 | using System.Collections.Generic; | 19 | using System.Collections.Generic; |
627 | 22 | using Canonical.UbuntuOne.Common; | 20 | using Canonical.UbuntuOne.Common; |
628 | 23 | 21 | ||
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 | 10 | // </auto-generated> | 10 | // </auto-generated> |
634 | 11 | //------------------------------------------------------------------------------ | 11 | //------------------------------------------------------------------------------ |
635 | 12 | 12 | ||
638 | 13 | [assembly: AssemblyVersionAttribute("1.0.404.5869")] | 13 | [assembly: AssemblyVersionAttribute("1.0.405.3708")] |
639 | 14 | [assembly: AssemblyFileVersionAttribute("1.0.404.5869")] | 14 | [assembly: AssemblyFileVersionAttribute("1.0.405.3708")] |
640 | 15 | 15 |
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