Merge lp:~mandel/ubuntuone-windows-installer/sandcastle into lp:ubuntuone-windows-installer/beta
- sandcastle
- Merge into beta
Proposed by
Manuel de la Peña
Status: | Merged |
---|---|
Approved by: | Rodrigo Moya |
Approved revision: | 28 |
Merged at revision: | 52 |
Proposed branch: | lp:~mandel/ubuntuone-windows-installer/sandcastle |
Merge into: | lp:ubuntuone-windows-installer/beta |
Prerequisite: | lp:~mandel/ubuntuone-windows-installer/implement_notify_presenter |
Diff against target: |
1132 lines (+691/-197) 17 files modified
docs/feedBack_content.xml (+32/-0) docs/sandcastle.config (+153/-0) docs/shared_content.xml (+250/-0) main.build (+226/-0) src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj (+2/-0) src/Canonical.UbuntuOne.Client.Views/App.xaml (+0/-8) src/Canonical.UbuntuOne.Client.Views/App.xaml.cs (+0/-17) src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj (+11/-97) src/Canonical.UbuntuOne.Client.Views/Properties/Settings.Designer.cs (+0/-30) src/Canonical.UbuntuOne.Client.Views/Properties/Settings.settings (+0/-7) src/Canonical.UbuntuOne.Client.Views/Properties/app.manifest (+0/-26) src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj (+1/-0) src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj (+1/-0) src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj (+1/-0) src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj (+1/-0) src/UbuntuOne.sln (+11/-11) src/UbuntuOneClient/UbuntuOneClient.csproj (+2/-1) |
To merge this branch: | bzr merge lp:~mandel/ubuntuone-windows-installer/sandcastle |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Rodrigo Moya (community) | Approve | ||
Vincenzo Di Somma (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
Added new task in build script to create the developers documentation. Sandcaslte and HTMl Help project should be installed.
To post a comment you must log in.
- 26. By Manuel de la Peña
-
Merge with parent
- 27. By Manuel de la Peña
-
Merge with parent.
- 28. By Manuel de la Peña
-
Ensure that the dlls from the views are present for the tests.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Rodrigo Moya (rodrigo-moya) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'docs' | |||
2 | === added file 'docs/feedBack_content.xml' | |||
3 | --- docs/feedBack_content.xml 1970-01-01 00:00:00 +0000 | |||
4 | +++ docs/feedBack_content.xml 2010-08-09 16:28:46 +0000 | |||
5 | @@ -0,0 +1,32 @@ | |||
6 | 1 | <content xml:space="preserve"> | ||
7 | 2 | |||
8 | 3 | <item id="fb_alias">ubuntuone-users@lists.launchpad.net</item> | ||
9 | 4 | <item id="fb_product"></item> | ||
10 | 5 | <item id="fb_deliverable"></item> | ||
11 | 6 | |||
12 | 7 | <item id="fb_subject">Documentation%20Feedback</item> | ||
13 | 8 | <item id="fb_body">%0\dThank%20you%20for%20your%20feedback. Please give as much detail as possible so that we know your opinion.</item> | ||
14 | 9 | |||
15 | 10 | <item id="fb_headerFeedBack">Send Feedback</item> | ||
16 | 11 | |||
17 | 12 | |||
18 | 13 | <!-- feedback values for sandcastle scenario --> | ||
19 | 14 | |||
20 | 15 | <item id="feedback_alias"></item> | ||
21 | 16 | <item id="feedback_product"></item> | ||
22 | 17 | <item id="feedback_deliverable"></item> | ||
23 | 18 | <item id="feedback_fileVersion"></item> | ||
24 | 19 | <item id="feedback_topicVersion"></item> | ||
25 | 20 | <item id="feedback_body"></item> | ||
26 | 21 | <item id="feedback_subject"></item> | ||
27 | 22 | |||
28 | 23 | <item id="fb_Introduction">We value your feedback. To rate this topic and send feedback about this topic to the documentation team, click a rating, and then click <b>Send Feedback</b>. For assistance with support issues, refer to the technical support information included with the product.</item> | ||
29 | 24 | |||
30 | 25 | <item id="fb_Send">Send Feedback</item> | ||
31 | 26 | <item id="fb_Poor">Poor</item> | ||
32 | 27 | <item id="fb_Excellent">Outstanding</item> | ||
33 | 28 | <item id="fb_EnterFeedbackText">To e-mail your feedback, click here:</item> | ||
34 | 29 | <item id="fb_Title">Documentation Feedback</item> | ||
35 | 30 | <item id="fb_altIcon">Display feedback instructions at the bottom of the page.</item> | ||
36 | 31 | |||
37 | 32 | </content> | ||
38 | 0 | \ No newline at end of file | 33 | \ No newline at end of file |
39 | 1 | 34 | ||
40 | === added file 'docs/sandcastle.config' | |||
41 | --- docs/sandcastle.config 1970-01-01 00:00:00 +0000 | |||
42 | +++ docs/sandcastle.config 2010-08-09 16:28:46 +0000 | |||
43 | @@ -0,0 +1,153 @@ | |||
44 | 1 | <configuration> | ||
45 | 2 | <dduetools> | ||
46 | 3 | <builder> | ||
47 | 4 | <components> | ||
48 | 5 | |||
49 | 6 | <!-- Create skeleton document --> | ||
50 | 7 | <component type="Microsoft.Ddue.Tools.CopyFromFileComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
51 | 8 | <data file="%DXROOT%\Presentation\vs2005\Transforms\skeleton.xml" /> | ||
52 | 9 | <copy source="/*" target="/" /> | ||
53 | 10 | </component> | ||
54 | 11 | |||
55 | 12 | <!-- Copy in reflection data --> | ||
56 | 13 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
57 | 14 | <index name="reflection" value="/reflection/apis/api" key="@id" cache="10"> | ||
58 | 15 | <data base="%DXROOT%\Data\Reflection" recurse="true" files="*.xml" /> | ||
59 | 16 | <data files=".\reflection.xml" /> | ||
60 | 17 | </index> | ||
61 | 18 | <copy name="reflection" source="*" target="/document/reference" /> | ||
62 | 19 | </component> | ||
63 | 20 | |||
64 | 21 | <!-- Copy in container data --> | ||
65 | 22 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
66 | 23 | <copy name="reflection" key="string(/document/reference/containers/namespace/@api)" source="*[not(local-name()='elements')]" target="/document/reference/containers/namespace" /> | ||
67 | 24 | </component> | ||
68 | 25 | <component type="Microsoft.Ddue.Tools.ForEachComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
69 | 26 | <variable expression="/document/reference/containers//type/@api" /> | ||
70 | 27 | <components> | ||
71 | 28 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
72 | 29 | <copy name="reflection" source="apidata|typedata|templates|attributes" target="/document/reference/containers//type[@api=$key]" /> | ||
73 | 30 | </component> | ||
74 | 31 | </components> | ||
75 | 32 | </component> | ||
76 | 33 | |||
77 | 34 | <!-- Copy in explicitInterfaceImplemented reflection data --> | ||
78 | 35 | <component type="Microsoft.Ddue.Tools.ForEachComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
79 | 36 | <variable expression="/document/reference/implements/member/@api | /document/reference/implements//type/@api" /> | ||
80 | 37 | <components> | ||
81 | 38 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
82 | 39 | <copy name="reflection" source="apidata" target="/document/reference/implements//*[@api=$key and not(apidata)]" /> | ||
83 | 40 | <copy name="reflection" source="templates" target="/document/reference/implements//*[@api=$key and not(apidata) and not(specialization)]" /> | ||
84 | 41 | </component> | ||
85 | 42 | </components> | ||
86 | 43 | </component> | ||
87 | 44 | |||
88 | 45 | <!-- Copy in parameter data --> | ||
89 | 46 | <component type="Microsoft.Ddue.Tools.ForEachComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
90 | 47 | <variable expression="/document/reference/parameters/parameter//type/@api" /> | ||
91 | 48 | <components> | ||
92 | 49 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
93 | 50 | <copy name="reflection" source="apidata" target="/document/reference/parameters/parameter//type[boolean(@api=$key) and not(apidata)]" /> | ||
94 | 51 | </component> | ||
95 | 52 | </components> | ||
96 | 53 | </component> | ||
97 | 54 | |||
98 | 55 | <!-- Generate syntax --> | ||
99 | 56 | <component type="Microsoft.Ddue.Tools.IfThenComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
100 | 57 | <if condition="not(starts-with($key,'Overload:') or starts-with($key,'R:'))" /> | ||
101 | 58 | <then> | ||
102 | 59 | <component type="Microsoft.Ddue.Tools.SyntaxComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
103 | 60 | <syntax input="/document/reference" output="/document/syntax" /> | ||
104 | 61 | <generators> | ||
105 | 62 | <generator type="Microsoft.Ddue.Tools.VisualBasicDeclarationSyntaxGenerator" assembly="%DXROOT%\ProductionTools\SyntaxComponents.dll" /> | ||
106 | 63 | <generator type="Microsoft.Ddue.Tools.CSharpDeclarationSyntaxGenerator" assembly="%DXROOT%\ProductionTools\SyntaxComponents.dll" /> | ||
107 | 64 | <generator type="Microsoft.Ddue.Tools.CPlusPlusDeclarationSyntaxGenerator" assembly="%DXROOT%\ProductionTools\SyntaxComponents.dll" /> | ||
108 | 65 | <generator type="Microsoft.Ddue.Tools.ScriptSharpDeclarationSyntaxGenerator" assembly="%DXROOT%\ProductionTools\SyntaxComponents.dll" /> | ||
109 | 66 | </generators> | ||
110 | 67 | </component> | ||
111 | 68 | </then> | ||
112 | 69 | </component> | ||
113 | 70 | |||
114 | 71 | <!-- Copy in comments --> | ||
115 | 72 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
116 | 73 | <index name="comments" value="/doc/members/member" key="@name" cache="100"> | ||
117 | 74 | <data base="%SystemRoot%\Microsoft.NET\Framework\v2.0.50727" recurse="false" files="*.xml" /> | ||
118 | 75 | <data files=".\*.xml" /> | ||
119 | 76 | </index> | ||
120 | 77 | <copy name="comments" source="*" target="/document/comments" /> | ||
121 | 78 | <components> | ||
122 | 79 | <!-- copy comments for inheritdoc --> | ||
123 | 80 | <component type="Microsoft.Ddue.Tools.InheritDocumentationComponent" assembly="%DXROOT%\ProductionTools\CopyComponents.dll"> | ||
124 | 81 | <copy name="comments" use="reflection"/> | ||
125 | 82 | </component> | ||
126 | 83 | </components> | ||
127 | 84 | </component> | ||
128 | 85 | |||
129 | 86 | <!-- Copy in reflection data and comments for members --> | ||
130 | 87 | <component type="Microsoft.Ddue.Tools.ForEachComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
131 | 88 | <variable expression="/document/reference/elements//element/@api" /> | ||
132 | 89 | <components> | ||
133 | 90 | <component type="Microsoft.Ddue.Tools.IfThenComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
134 | 91 | <if condition="not(/document/reference/elements/element[@api=$key]/apidata)" /> | ||
135 | 92 | <then> | ||
136 | 93 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
137 | 94 | <copy name="reflection" source="*[not(self::elements)]" target="/document/reference/elements//element[@api=$key]" /> | ||
138 | 95 | </component> | ||
139 | 96 | </then> | ||
140 | 97 | </component> | ||
141 | 98 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
142 | 99 | <copy name="comments" source="summary|overloads|inheritdoc" target="/document/reference/elements//element[@api=$key]" /> | ||
143 | 100 | <components> | ||
144 | 101 | <!-- copy comments for inheritdoc --> | ||
145 | 102 | <component type="Microsoft.Ddue.Tools.InheritDocumentationComponent" assembly="%DXROOT%\ProductionTools\CopyComponents.dll"> | ||
146 | 103 | <copy name="comments" use="reflection"/> | ||
147 | 104 | </component> | ||
148 | 105 | </components> | ||
149 | 106 | </component> | ||
150 | 107 | </components> | ||
151 | 108 | </component> | ||
152 | 109 | |||
153 | 110 | <!-- Copy in comments for the member's declaring type. --> | ||
154 | 111 | <component type="Microsoft.Ddue.Tools.CopyFromIndexComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
155 | 112 | <copy name="comments" key="string(/document/reference/containers/type/@api)" source="summary" target="/document/reference/containers" /> | ||
156 | 113 | </component> | ||
157 | 114 | |||
158 | 115 | <!-- transform --> | ||
159 | 116 | <component type="Microsoft.Ddue.Tools.TransformComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
160 | 117 | <transform file="%DXROOT%\Presentation\vs2005\Transforms\main_sandcastle.xsl"> | ||
161 | 118 | <argument key="metadata" value="true" /> | ||
162 | 119 | <argument key="languages"> | ||
163 | 120 | <language label="VisualBasic" name="VisualBasic" style="vb" /> | ||
164 | 121 | <language label="CSharp" name="CSharp" style="cs" /> | ||
165 | 122 | <language label="ManagedCPlusPlus" name="ManagedCPlusPlus" style="cpp" /> | ||
166 | 123 | <!--<language label="JSharp" name="JSharp" style="cs" /> | ||
167 | 124 | <language label="JScript" name="JScript" style="cs" />--> | ||
168 | 125 | <language label="JavaScript" name="JavaScript" style="cs" /> | ||
169 | 126 | </argument> | ||
170 | 127 | </transform> | ||
171 | 128 | </component> | ||
172 | 129 | |||
173 | 130 | <!-- resolve shared content --> | ||
174 | 131 | <component type="Microsoft.Ddue.Tools.SharedContentComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
175 | 132 | <content file=".\shared_content.xml" /> | ||
176 | 133 | <content file="%DXROOT%\Presentation\vs2005\content\reference_content.xml" /> | ||
177 | 134 | <content file="%DXROOT%\Presentation\shared\content\syntax_content.xml" /> | ||
178 | 135 | <content file=".\feedback_content.xml" /> | ||
179 | 136 | </component> | ||
180 | 137 | |||
181 | 138 | |||
182 | 139 | <!-- resolve reference links --> | ||
183 | 140 | <component type="Microsoft.Ddue.Tools.ResolveReferenceLinksComponent2" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
184 | 141 | <targets base="%DXROOT%\Data\Reflection" recurse="true" files="*.xml" type="msdn" /> | ||
185 | 142 | <targets files=".\reflection.xml" type="local" /> | ||
186 | 143 | </component> | ||
187 | 144 | |||
188 | 145 | <!-- save the result --> | ||
189 | 146 | <component type="Microsoft.Ddue.Tools.SaveComponent" assembly="%DXROOT%\ProductionTools\BuildComponents.dll"> | ||
190 | 147 | <save base =".\Output\html" path="concat(/html/head/meta[@name='file']/@content,'.htm')" indent="true" omit-xml-declaration="true" /> | ||
191 | 148 | </component> | ||
192 | 149 | |||
193 | 150 | </components> | ||
194 | 151 | </builder> | ||
195 | 152 | </dduetools> | ||
196 | 153 | </configuration> | ||
197 | 0 | 154 | ||
198 | === added file 'docs/shared_content.xml' | |||
199 | --- docs/shared_content.xml 1970-01-01 00:00:00 +0000 | |||
200 | +++ docs/shared_content.xml 2010-08-09 16:28:46 +0000 | |||
201 | @@ -0,0 +1,250 @@ | |||
202 | 1 | <content xml:space="preserve" | ||
203 | 2 | xmlns:MSHelp="http://msdn.microsoft.com/mshelp"> | ||
204 | 3 | |||
205 | 4 | <!-- paths --> | ||
206 | 5 | <item id="iconPath">../icons/{0}</item> | ||
207 | 6 | <item id="scriptPath">../scripts/{0}</item> | ||
208 | 7 | <item id="artPath">../art/{0}</item> | ||
209 | 8 | <item id="stylePath">../styles/{0}</item> | ||
210 | 9 | |||
211 | 10 | <!-- locale --> | ||
212 | 11 | <item id="locale">en-us</item> | ||
213 | 12 | |||
214 | 13 | <item id="desktopTechnologyAttribute">kbNetFramewk</item> | ||
215 | 14 | <item id="netcfTechnologyAttribute">kbNetCompactFramewk</item> | ||
216 | 15 | <item id="netcfDocSetAttribute">NetCompactFramework</item> | ||
217 | 16 | <item id="xnaTechnologyAttribute">kbXNA</item> | ||
218 | 17 | <item id="xnaDocSetAttribute">XNA</item> | ||
219 | 18 | |||
220 | 19 | <!-- header --> | ||
221 | 20 | <item id="header"><font color="DarkGray"></font><p/> </item> | ||
222 | 21 | |||
223 | 22 | <!-- freshness date --> | ||
224 | 23 | <item id="UpdateTitle"><font color="DarkGray">Updated: {0}</font></item> | ||
225 | 24 | |||
226 | 25 | <!-- topic title --> | ||
227 | 26 | <item id="nsrTitle">{0}</item> | ||
228 | 27 | |||
229 | 28 | <!-- alert titles --> | ||
230 | 29 | <item id="tipTitle"><b>Tip:</b></item> | ||
231 | 30 | <item id="cautionTitle"><b>Caution:</b></item> | ||
232 | 31 | <item id="securityTitle"><b>Security Note:</b></item> | ||
233 | 32 | <item id="noteTitle"><b>Note:</b></item> | ||
234 | 33 | <item id="importantTitle"><b>Important Note:</b></item> | ||
235 | 34 | <item id="visualBasicTitle"><b>Visual Basic Note:</b></item> | ||
236 | 35 | <item id="visualC#Title"><b>C# Note:</b></item> | ||
237 | 36 | <item id="visualC++Title"><b>C++ Note:</b></item> | ||
238 | 37 | <item id="visualJ#Title"><b>J# Note:</b></item> | ||
239 | 38 | |||
240 | 39 | <!-- alert alt text --> | ||
241 | 40 | <item id="tipAltText">Tip</item> | ||
242 | 41 | <item id="cautionAltText">Caution note</item> | ||
243 | 42 | <item id="securityAltText">Security note</item> | ||
244 | 43 | <item id="noteAltText">Note</item> | ||
245 | 44 | <item id="importantAltText">Important note</item> | ||
246 | 45 | <item id="visualBasicAltText">Visual Basic note</item> | ||
247 | 46 | <item id="visualC#AltText">C# note</item> | ||
248 | 47 | <item id="visualC++AltText">C++ note</item> | ||
249 | 48 | <item id="visualJ#AltText">J# note</item> | ||
250 | 49 | |||
251 | 50 | <!-- code labels --> | ||
252 | 51 | <item id="CSharpLabel">C#</item> | ||
253 | 52 | <item id="VisualBasicLabel">Visual Basic</item> | ||
254 | 53 | <item id="ManagedCPlusPlusLabel">Visual C++</item> | ||
255 | 54 | <item id="JSharpLabel">J#</item> | ||
256 | 55 | <item id="JScriptLabel">JScript</item> | ||
257 | 56 | <item id="JavaScriptLabel">JavaScript</item> | ||
258 | 57 | <item id="XAMLLabel">XAML</item> | ||
259 | 58 | |||
260 | 59 | <!-- section titles --> | ||
261 | 60 | <item id="exceptionsTitle">Exceptions</item> | ||
262 | 61 | <item id="SeeAlso">See Also</item> | ||
263 | 62 | <item id="SeeAlsoTasks">Tasks</item> | ||
264 | 63 | <item id="SeeAlsoReference">Reference</item> | ||
265 | 64 | <item id="SeeAlsoConcepts">Concepts</item> | ||
266 | 65 | <item id="SeeAlsoOtherResources">Other Resources</item> | ||
267 | 66 | |||
268 | 67 | <!-- tool tips --> | ||
269 | 68 | <item id="collapseAllImage">CollapseAll image</item> | ||
270 | 69 | <item id="expandAllImage">ExpandAll image</item> | ||
271 | 70 | <item id="dropDownImage">DropDown image</item> | ||
272 | 71 | <item id="dropDownHoverImage">DropDownHover image</item> | ||
273 | 72 | <item id="collapseImage">Collapse image</item> | ||
274 | 73 | <item id="expandImage">Expand Image</item> | ||
275 | 74 | <item id="copyHoverImage">CopyHover image</item> | ||
276 | 75 | <item id="copyImage">Copy image</item> | ||
277 | 76 | <item id="footerImage">Footer image</item> | ||
278 | 77 | |||
279 | 78 | <!-- product labels --> | ||
280 | 79 | <item id="framework">.NET Framework</item> | ||
281 | 80 | <item id="compact">.NET Compact Framework</item> | ||
282 | 81 | <item id="everett">1.1</item> | ||
283 | 82 | <item id="whidbey">2.0</item> | ||
284 | 83 | |||
285 | 84 | <item id="copyCode">Copy Code</item> | ||
286 | 85 | |||
287 | 86 | |||
288 | 87 | <!-- dynamic Link Information --> | ||
289 | 88 | <item id="mshelpKTable"><MSHelp:ktable keywords='{0}' locHeader='Location' topicHeader = 'Topic' disambiguator='table' indexMoniker='!DefaultDynamicLinkIndex' /></item> | ||
290 | 89 | |||
291 | 90 | <item id="dynamicLinkInlinePreFixText">For more information, see </item> | ||
292 | 91 | <item id="dynamicLinkInlinePostFixText">.</item> | ||
293 | 92 | <item id="dynamicLinkInlineSeperatorText"> and </item> | ||
294 | 93 | |||
295 | 94 | <item id="remarksTitle">Remarks</item> | ||
296 | 95 | |||
297 | 96 | <!-- devlangs filter --> | ||
298 | 97 | <item id="devlangsDropdown">Code: {0}</item> | ||
299 | 98 | <item id="all">All</item> | ||
300 | 99 | <item id="multiple">Multiple</item> | ||
301 | 100 | <item id="VisualBasic">Visual Basic</item> | ||
302 | 101 | <item id="VBScript">Visual Basic Script</item> | ||
303 | 102 | <item id="CSharp">C#</item> | ||
304 | 103 | <item id="ManagedCPlusPlus">Visual C++</item> | ||
305 | 104 | <item id="JSharp">J#</item> | ||
306 | 105 | <item id="JScript">JScript</item> | ||
307 | 106 | <item id="xmlLang">Xml</item> | ||
308 | 107 | <item id="JavaScript">JavaScript</item> | ||
309 | 108 | <item id="html">Html</item> | ||
310 | 109 | <item id="visualbasicANDcsharp"><include item="VisualBasic"/> and <include item="CSharp"/></item> | ||
311 | 110 | <item id="other"></item> | ||
312 | 111 | <item id="XAML">XAML</item> | ||
313 | 112 | <item id="usage">Usage</item> | ||
314 | 113 | <item id="AspNet">ASP.NET</item> | ||
315 | 114 | <item id="VisualBasicDeclaration"><include item="VisualBasic"/> (Declaration)</item> | ||
316 | 115 | <item id="VisualBasicUsage"><include item="VisualBasic"/> (<include item="usage"/>)</item> | ||
317 | 116 | |||
318 | 117 | <item id="dropdownSeparator"><span>    </span></item> | ||
319 | 118 | <item id="nsrLinkSeparator"> </item> | ||
320 | 119 | |||
321 | 120 | <!-- language keywords --> | ||
322 | 121 | <item id="nullKeyword">a null reference (<span class="keyword">Nothing</span> in Visual Basic)</item> | ||
323 | 122 | <item id="staticKeyword"><span class="keyword">static</span> (<span class="keyword">Shared</span> in Visual Basic)</item> | ||
324 | 123 | <item id="virtualKeyword"><span class="keyword">virtual</span> (<span class="keyword">Overridable</span> in Visual Basic)</item> | ||
325 | 124 | <item id="trueKeyword"><span class="keyword">true</span> (<span class="keyword">True</span> in Visual Basic)</item> | ||
326 | 125 | <item id="falseKeyword"><span class="keyword">false</span> (<span class="keyword">False</span> in Visual Basic)</item> | ||
327 | 126 | <item id="abstractKeyword"><span class="keyword">abstract</span> (<span class="keyword">MustInherit</span> in Visual Basic)</item> | ||
328 | 127 | |||
329 | 128 | <!-- transforms insert K Index Technology qualifiers based on a conceptual topic's //metadata/attribute[@name='DocSet'] value />--> | ||
330 | 129 | <!-- If you add new docset values, the item/@id must = "kIndexTechTag_" + the lower-case DocSet name. --> | ||
331 | 130 | <item id="kIndexTermWithTechQualifier">{0}<include item="kIndexTechTag_{1}" />{2}</item> | ||
332 | 131 | <item id="kIndexTechTag_avalon"> [WPF]</item> | ||
333 | 132 | <item id="kIndexTechTag_wpf"> [WPF]</item> | ||
334 | 133 | <item id="kIndexTechTag_wcf"> [Windows Communication Foundation]</item> | ||
335 | 134 | <item id="kindextechtag_windowsforms"> [Windows Forms]</item> | ||
336 | 135 | |||
337 | 136 | <!-- values for MSHelp:Attr Name="TopicType" --> | ||
338 | 137 | <item id="TT_developerConceptualDocument">kbArticle</item> | ||
339 | 138 | <item id="TT_developerErrorMessageDocument">kbRef</item> | ||
340 | 139 | <item id="TT_developerGlossaryDocument">kbRef</item> | ||
341 | 140 | <item id="TT_developerHowToDocument">kbHowTo</item> | ||
342 | 141 | <item id="TT_developerOrientationDocument">kbOrient</item> | ||
343 | 142 | <item id="TT_developerReferenceWithSyntaxDocument">kbSyntax</item> | ||
344 | 143 | <item id="TT_developerReferenceWithoutSyntaxDocument">kbRef</item> | ||
345 | 144 | <item id="TT_developerSampleDocument">kbSampleProd</item> | ||
346 | 145 | <item id="TT_developerSDKTechnologyOverviewArchitectureDocument">kbArticle</item> | ||
347 | 146 | <item id="TT_developerSDKTechnologyOverviewCodeDirectoryDocument">kbOrient</item> | ||
348 | 147 | <item id="TT_developerSDKTechnologyOverviewOrientationDocument">kbOrient</item> | ||
349 | 148 | <item id="TT_developerSDKTechnologyOverviewScenariosDocument">kbHowTo</item> | ||
350 | 149 | <item id="TT_developerSDKTechnologyOverviewTechnologySummaryDocument">kbRef</item> | ||
351 | 150 | <item id="TT_developerTroubleshootingDocument">kbHowTo</item> | ||
352 | 151 | <item id="TT_developerUIReferenceDocument">kbRef</item> | ||
353 | 152 | <item id="TT_developerWalkthroughDocument">kbHowTo</item> | ||
354 | 153 | <item id="TT_developerWhitePaperDocument">kbArticle</item> | ||
355 | 154 | <item id="TT_developerXmlReference">kbSyntax</item> | ||
356 | 155 | <item id="TT_ManagedReference">apiref</item> | ||
357 | 156 | |||
358 | 157 | <item id="top">Top</item> | ||
359 | 158 | |||
360 | 159 | <!-- footer --> | ||
361 | 160 | |||
362 | 161 | <!-- <item id="footer"> | ||
363 | 162 | <p/> | ||
364 | 163 | <span> | ||
365 | 164 | Send | ||
366 | 165 | <a> | ||
367 | 166 | <includeAttribute name="href" item="MailToLink"> | ||
368 | 167 | <parameter>{0}</parameter> | ||
369 | 168 | <parameter>{1}</parameter> | ||
370 | 169 | </includeAttribute> | ||
371 | 170 | comments | ||
372 | 171 | </a> | ||
373 | 172 | about this topic to Canonical Ltd. | ||
374 | 173 | </span> | ||
375 | 174 | </item> | ||
376 | 175 | |||
377 | 176 | <item id="MailToLink">javascript:sendfeedback('Documentation Feedback (Sandcastle CTP): ', '{1}', '');</item> | ||
378 | 177 | --> | ||
379 | 178 | |||
380 | 179 | <item id="footer"> | ||
381 | 180 | <span id="feedbackarea"> | ||
382 | 181 | Send | ||
383 | 182 | <a> | ||
384 | 183 | <includeAttribute name="href" item="MailToLink"> | ||
385 | 184 | <parameter>{2}</parameter> | ||
386 | 185 | <parameter>{3}</parameter> | ||
387 | 186 | </includeAttribute> | ||
388 | 187 | feedback | ||
389 | 188 | </a> | ||
390 | 189 | on this topic to Canonical Ltd. | ||
391 | 190 | </span> | ||
392 | 191 | </item> | ||
393 | 192 | |||
394 | 193 | <item id="feedbackHeader"> | ||
395 | 194 | <span id="headfeedbackarea" class="feedbackhead"> | ||
396 | 195 | <a> | ||
397 | 196 | <includeAttribute name="href" item="MailToLink"> | ||
398 | 197 | <parameter>{0}</parameter> | ||
399 | 198 | <parameter>{1}</parameter> | ||
400 | 199 | </includeAttribute> | ||
401 | 200 | <include item="fb_headerFeedBack" /> | ||
402 | 201 | </a> | ||
403 | 202 | </span> | ||
404 | 203 | </item> | ||
405 | 204 | <item id="MailToLink">javascript:SubmitFeedback('<include item="fb_alias" />','<include item="fb_product" />','<include item="fb_deliverable" />','{0}','{1}','<include item="fb_body" />','<include item="fb_subject" />');</item> | ||
406 | 205 | |||
407 | 206 | <!-- 5 star rating feedback control in sandcastle scenario--> | ||
408 | 207 | <!-- | ||
409 | 208 | <item id="footer"> | ||
410 | 209 | <A NAME="feedback"></A> | ||
411 | 210 | <span id="fb" class="feedbackcss"> | ||
412 | 211 | <div ID="feedbackarea"> | ||
413 | 212 | <FORM METHOD="post" ENCTYPE="text/plain" NAME="formRating"> | ||
414 | 213 | <H5><include item="fb_Title" /></H5> | ||
415 | 214 | <P><include item="fb_Introduction" /></P> | ||
416 | 215 | <table> | ||
417 | 216 | <tr> | ||
418 | 217 | <td><include item="fb_Poor" /></td> | ||
419 | 218 | <td class="fbinputId" align="right">1<BR/><input name="fbRating" type="radio" value="0"></input></td> | ||
420 | 219 | <td class="fbinputId" align="right">2<BR/><input name="fbRating" type="radio" value="0"></input></td> | ||
421 | 220 | <td class="fbinputId" align="right">3<BR/><input name="fbRating" type="radio" value="0"></input></td> | ||
422 | 221 | <td class="fbinputId" align="right">4<BR/><input name="fbRating" type="radio" value="0"></input></td> | ||
423 | 222 | <td class="fbinputId" align="right">5<BR/><input name="fbRating" type="radio" value="0"></input></td> | ||
424 | 223 | <td><include item="fb_Excellent" /></td> | ||
425 | 224 | </tr> | ||
426 | 225 | </table> | ||
427 | 226 | <P> | ||
428 | 227 | <include item="fb_EnterFeedbackText" /> | ||
429 | 228 | <input id="submitFeedback" type="button"><includeAttribute name="value" item="fb_Send"/><includeAttribute name="onclick" item="MailtoLink" /></input> | ||
430 | 229 | </P> | ||
431 | 230 | </FORM> | ||
432 | 231 | </div> | ||
433 | 232 | </span> | ||
434 | 233 | </item> | ||
435 | 234 | |||
436 | 235 | <item id="feedbackHeader"> | ||
437 | 236 | <span id="headfeedbackarea" class="feedbackhead"> | ||
438 | 237 | <a href="#feedback" ID="IconFB" Target="_self"> | ||
439 | 238 | <include item="fb_headerFeedBack" /> | ||
440 | 239 | </a> | ||
441 | 240 | </span> | ||
442 | 241 | </item> | ||
443 | 242 | |||
444 | 243 | <item id="MailToLink">javascript:SubmitFeedback('<include item="feedback_alias" />','<include item="feedback_product" />','<include item="feedback_deliverable" />','<include item="feedback_fileVersion" />','<include item="feedback_topicVersion" />','<include item="feedback_body" />','<include item="feedback_subject" />');</item> | ||
445 | 244 | --> | ||
446 | 245 | |||
447 | 246 | <item id="copyrightStatement"><include item="copyrightText"/></item> | ||
448 | 247 | |||
449 | 248 | <item id="copyrightText">© 2010 Canonical Ltd. All rights reserved.</item> | ||
450 | 249 | |||
451 | 250 | </content> | ||
452 | 0 | 251 | ||
453 | === modified file 'main.build' | |||
454 | --- main.build 2010-08-04 14:23:27 +0000 | |||
455 | +++ main.build 2010-08-09 16:28:46 +0000 | |||
456 | @@ -4,6 +4,9 @@ | |||
457 | 4 | <property name="enviroment" value="debug" /> | 4 | <property name="enviroment" value="debug" /> |
458 | 5 | <!-- property that allows to pass where to place the build results --> | 5 | <!-- property that allows to pass where to place the build results --> |
459 | 6 | <property name="build_results" value="install/build_results" /> | 6 | <property name="build_results" value="install/build_results" /> |
460 | 7 | <property name="docs_api" value="docs/api" /> | ||
461 | 8 | <property name="sandcastle_path" value="C:\Program Files\Sandcastle" /> | ||
462 | 9 | <property name="html_help_compiler_path" value="C:\Program Files\HTML Help Workshop" /> | ||
463 | 7 | <!-- property that allows to pass the number for the current build. --> | 10 | <!-- property that allows to pass the number for the current build. --> |
464 | 8 | <property name="build" value="0" /> | 11 | <property name="build" value="0" /> |
465 | 9 | <target name="clean" | 12 | <target name="clean" |
466 | @@ -42,10 +45,29 @@ | |||
467 | 42 | <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin')}" /> | 45 | <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin')}" /> |
468 | 43 | <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj')}" /> | 46 | <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj')}" /> |
469 | 44 | 47 | ||
470 | 48 | <echo>Cleaning ServiceTest results.</echo> | ||
471 | 49 | |||
472 | 50 | <delete dir="src/ServiceTestApp/bin" if="${directory::exists('src/ServiceTestApp/bin')}" /> | ||
473 | 51 | <delete dir="src/ServiceTestApp/obj" if="${directory::exists('src/ServiceTestApp/obj')}" /> | ||
474 | 52 | |||
475 | 53 | <echo>Cleaning UbuntuOneClient results.</echo> | ||
476 | 54 | |||
477 | 55 | <delete dir="src/UbuntuOneClient/bin" if="${directory::exists('src/UbuntuOneClient/bin')}" /> | ||
478 | 56 | <delete dir="src/UbuntuOneClient/obj" if="${directory::exists('src/UbuntuOneClient/obj')}" /> | ||
479 | 57 | |||
480 | 58 | <echo>Cleaning UbuntuOneClient.Tests results.</echo> | ||
481 | 59 | |||
482 | 60 | <delete dir="src/UbuntuOneClient.Tests/bin" if="${directory::exists('src/UbuntuOneClient.Tests/bin')}" /> | ||
483 | 61 | <delete dir="src/UbuntuOneClient.Tests/obj" if="${directory::exists('src/UbuntuOneClient.Tests/obj')}" /> | ||
484 | 62 | |||
485 | 45 | <echo>Clean the data from the msi</echo> | 63 | <echo>Clean the data from the msi</echo> |
486 | 46 | 64 | ||
487 | 47 | <delete dir="${build_results}" if="${directory::exists('${build_results}')}" /> | 65 | <delete dir="${build_results}" if="${directory::exists('${build_results}')}" /> |
488 | 48 | 66 | ||
489 | 67 | <echo>Cleaning documentation results.</echo> | ||
490 | 68 | |||
491 | 69 | <delete dir="${docs_api}" if="${directory::exists('docs/api')}" /> | ||
492 | 70 | |||
493 | 49 | </target> | 71 | </target> |
494 | 50 | 72 | ||
495 | 51 | <target name="generate_protos" description="Generates the code that is used to talk with the python process using protobuffer."> | 73 | <target name="generate_protos" description="Generates the code that is used to talk with the python process using protobuffer."> |
496 | @@ -167,6 +189,12 @@ | |||
497 | 167 | workingdir="src/Canonical.UbuntuOne.Client.Test/bin/${enviroment}" | 189 | workingdir="src/Canonical.UbuntuOne.Client.Test/bin/${enviroment}" |
498 | 168 | program="nunit-console.exe" | 190 | program="nunit-console.exe" |
499 | 169 | commandline="Canonical.UbuntuOne.Client.Test.dll /xml=../../../../test-results/Canonical.UbuntuOne.Client.Test-Result.xml" /> | 191 | commandline="Canonical.UbuntuOne.Client.Test.dll /xml=../../../../test-results/Canonical.UbuntuOne.Client.Test-Result.xml" /> |
500 | 192 | |||
501 | 193 | <!-- copy the views to the tests bin to ensure that spring finds them --> | ||
502 | 194 | <copy file="src/Canonical.UbuntuOne.Client.Views/bin/${enviroment}/Canonical.UbuntuOne.Client.Views.dll" | ||
503 | 195 | tofile="src/UbuntuOneClient.Tests/bin/${enviroment}/Canonical.UbuntuOne.Client.Views.dll" /> | ||
504 | 196 | <copy file="src/Canonical.UbuntuOne.Client.Views/bin/${enviroment}/AvalonLibrary.dll" | ||
505 | 197 | tofile="src/UbuntuOneClient.Tests/bin/${enviroment}/AvalonLibrary.dll" /> | ||
506 | 170 | 198 | ||
507 | 171 | <echo>UbuntuOneClient.Tests</echo> | 199 | <echo>UbuntuOneClient.Tests</echo> |
508 | 172 | <exec basedir="tools/NUnit" | 200 | <exec basedir="tools/NUnit" |
509 | @@ -224,4 +252,202 @@ | |||
510 | 224 | program="InstallerLinker.exe" | 252 | program="InstallerLinker.exe" |
511 | 225 | commandline="/Output:setup.exe /Template:dotNetInstaller.exe /Configuration:InstallerProject.xml /Embed+" /> | 253 | commandline="/Output:setup.exe /Template:dotNetInstaller.exe /Configuration:InstallerProject.xml /Embed+" /> |
512 | 226 | </target> | 254 | </target> |
513 | 255 | |||
514 | 256 | <target name="documentation" | ||
515 | 257 | description="Generates the documentation using the xml documents." | ||
516 | 258 | depends="build"> | ||
517 | 259 | |||
518 | 260 | <mkdir dir="${docs_api}" /> | ||
519 | 261 | |||
520 | 262 | <!-- copy the custom file to the api dir --> | ||
521 | 263 | <copy file="docs/sandcastle.config" | ||
522 | 264 | tofile="${docs_api}/sandcastle.config" /> | ||
523 | 265 | <!-- <copy file="${sandcastle_path}/Presentation/vs2005/configuration/sandcastle.config" | ||
524 | 266 | tofile="${docs_api}/sandcastle.config" /> --> | ||
525 | 267 | |||
526 | 268 | <copy file="docs/feedBack_content.xml" | ||
527 | 269 | tofile="${docs_api}/feedBack_content.xml" /> | ||
528 | 270 | |||
529 | 271 | <copy file="docs/shared_content.xml" | ||
530 | 272 | tofile="${docs_api}/shared_content.xml" /> | ||
531 | 273 | |||
532 | 274 | <!-- copy all the diff xmls so that it is simple to generate the docs --> | ||
533 | 275 | <copy file="src/Canonical.UbuntuOne.Client/bin/${enviroment}/Canonical.UbuntuOne.Client.XML" | ||
534 | 276 | tofile="${docs_api}/Canonical.UbuntuOne.Client.XML" /> | ||
535 | 277 | |||
536 | 278 | <copy file="src/Canonical.UbuntuOne.Client.Views/bin/${enviroment}/Canonical.UbuntuOne.Client.Views.XML" | ||
537 | 279 | tofile="${docs_api}/Canonical.UbuntuOne.Client.Views.XML" /> | ||
538 | 280 | |||
539 | 281 | <copy file="src/Canonical.UbuntuOne.Common/bin/${enviroment}/Canonical.UbuntuOne.Common.XML" | ||
540 | 282 | tofile="${docs_api}/Canonical.UbuntuOne.Common.XML" /> | ||
541 | 283 | |||
542 | 284 | <copy file="src/Canonical.UbuntuOne.ProcessDispatcher/bin/${enviroment}/Canonical.UbuntuOne.ProcessDispatcher.XML" | ||
543 | 285 | tofile="${docs_api}/Canonical.UbuntuOne.ProcessDispatcher.XML" /> | ||
544 | 286 | |||
545 | 287 | <copy file="src/UbuntuOneClient/bin/${enviroment}/UbuntuOneClient.XML" | ||
546 | 288 | tofile="${docs_api}/UbuntuOneClient.XML" /> | ||
547 | 289 | |||
548 | 290 | <!-- Copy generated doc from those libs that have it --> | ||
549 | 291 | |||
550 | 292 | <copy file="lib/Spring.Net/Spring.Aop.xml" | ||
551 | 293 | tofile="${docs_api}/Spring.Aop.xml" /> | ||
552 | 294 | |||
553 | 295 | <copy file="lib/Spring.Net/Spring.Core.xml" | ||
554 | 296 | tofile="${docs_api}/Spring.Core.xml" /> | ||
555 | 297 | |||
556 | 298 | <!-- Copy all the dlls we are interested in to docs_api to call it nicelly and then remove them --> | ||
557 | 299 | |||
558 | 300 | <copy file="src/Canonical.UbuntuOne.Client/bin/${enviroment}/Canonical.UbuntuOne.Client.dll" | ||
559 | 301 | tofile="${docs_api}/Canonical.UbuntuOne.Client.dll" /> | ||
560 | 302 | |||
561 | 303 | <copy file="src/Canonical.UbuntuOne.Client.Views/bin/${enviroment}/Canonical.UbuntuOne.Client.Views.dll" | ||
562 | 304 | tofile="${docs_api}/Canonical.UbuntuOne.Client.Views.dll" /> | ||
563 | 305 | |||
564 | 306 | <copy file="src/Canonical.UbuntuOne.Common/bin/${enviroment}/Canonical.UbuntuOne.Common.dll" | ||
565 | 307 | tofile="${docs_api}/Canonical.UbuntuOne.Common.dll" /> | ||
566 | 308 | |||
567 | 309 | <copy file="src/Canonical.UbuntuOne.ProcessDispatcher/bin/${enviroment}/Canonical.UbuntuOne.ProcessDispatcher.exe" | ||
568 | 310 | tofile="${docs_api}/Canonical.UbuntuOne.ProcessDispatcher.exe" /> | ||
569 | 311 | |||
570 | 312 | <copy file="src/UbuntuOneClient/bin/${enviroment}/UbuntuOneClient.exe" | ||
571 | 313 | tofile="${docs_api}/UbuntuOneClient.exe" /> | ||
572 | 314 | |||
573 | 315 | <copy file="lib/WPFContrib/AvalonLibrary.dll" | ||
574 | 316 | tofile="${docs_api}/AvalonLibrary.dll" /> | ||
575 | 317 | |||
576 | 318 | <copy file="lib/Spring.Net/Spring.Aop.dll" | ||
577 | 319 | tofile="${docs_api}/Spring.Aop.dll" /> | ||
578 | 320 | |||
579 | 321 | <copy file="lib/Spring.Net/Spring.Core.dll" | ||
580 | 322 | tofile="${docs_api}/Spring.Core.dll" /> | ||
581 | 323 | |||
582 | 324 | <copy file="lib/DotUpdater/DotUpdater.dll" | ||
583 | 325 | tofile="${docs_api}/DotUpdater.dll" /> | ||
584 | 326 | |||
585 | 327 | <copy file="lib/log4net/log4net.dll" | ||
586 | 328 | tofile="${docs_api}/log4net.dll" /> | ||
587 | 329 | |||
588 | 330 | <copy file="lib/Protobuf-net/protobuf-net.dll" | ||
589 | 331 | tofile="${docs_api}/protobuf-net.dll" /> | ||
590 | 332 | |||
591 | 333 | <!-- generate the xml from the reflection of the code --> | ||
592 | 334 | |||
593 | 335 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
594 | 336 | workingdir="${docs_api}" | ||
595 | 337 | managed="true" | ||
596 | 338 | program="MrefBuilder.exe" | ||
597 | 339 | commandline="Canonical.UbuntuOne.Client.dll Canonical.UbuntuOne.Client.Views.dll Canonical.UbuntuOne.Common.dll Canonical.UbuntuOne.ProcessDispatcher.exe UbuntuOneClient.dll /out:reflection.org" /> | ||
598 | 340 | |||
599 | 341 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
600 | 342 | workingdir="${docs_api}" | ||
601 | 343 | managed="true" | ||
602 | 344 | program="XslTransform.exe" | ||
603 | 345 | commandline='/xsl:"${sandcastle_path}\ProductionTransforms\ApplyVSDocModel.xsl" reflection.org /xsl:"${sandcastle_path}\ProductionTransforms\AddFriendlyFilenames.xsl" /out:reflection.xml' /> | ||
604 | 346 | |||
605 | 347 | <!-- delete all the dlls and .exe since we do not need then any more --> | ||
606 | 348 | |||
607 | 349 | <delete> | ||
608 | 350 | <fileset basedir="${docs_api}"> | ||
609 | 351 | <include name="*.dll" /> | ||
610 | 352 | <include name="*.exe" /> | ||
611 | 353 | </fileset> | ||
612 | 354 | </delete> | ||
613 | 355 | |||
614 | 356 | <!-- generate a topic manifest --> | ||
615 | 357 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
616 | 358 | workingdir="${docs_api}" | ||
617 | 359 | managed="true" | ||
618 | 360 | program="XslTransform.exe" | ||
619 | 361 | commandline='/xsl:"${sandcastle_path}\ProductionTransforms\ReflectionToManifest.xsl" reflection.xml /out:manifest.xml' /> | ||
620 | 362 | |||
621 | 363 | <!-- create an html folder where the output will be placed before it is compiled --> | ||
622 | 364 | |||
623 | 365 | <mkdir dir="${docs_api}/Output/html" /> | ||
624 | 366 | <mkdir dir="${docs_api}/Output/icons" /> | ||
625 | 367 | <mkdir dir="${docs_api}/Output/styles" /> | ||
626 | 368 | <mkdir dir="${docs_api}/Output/scripts" /> | ||
627 | 369 | |||
628 | 370 | <!-- copy the icons scropts and styles to our location --> | ||
629 | 371 | |||
630 | 372 | <copy todir="${docs_api}/Output/icons"> | ||
631 | 373 | <fileset basedir="${sandcastle_path}/Presentation/vs2005/icons"> | ||
632 | 374 | <include name="*" /> | ||
633 | 375 | </fileset> | ||
634 | 376 | </copy> | ||
635 | 377 | |||
636 | 378 | <copy todir="${docs_api}/Output/styles" flatten="true"> | ||
637 | 379 | <fileset basedir="${sandcastle_path}/Presentation/vs2005/styles"> | ||
638 | 380 | <include name="*" /> | ||
639 | 381 | </fileset> | ||
640 | 382 | </copy> | ||
641 | 383 | |||
642 | 384 | <copy todir="${docs_api}/Output/scripts" flatten="true"> | ||
643 | 385 | <fileset basedir="${sandcastle_path}/Presentation/vs2005/scripts"> | ||
644 | 386 | <include name="*" /> | ||
645 | 387 | </fileset> | ||
646 | 388 | </copy> | ||
647 | 389 | |||
648 | 390 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
649 | 391 | workingdir="${docs_api}" | ||
650 | 392 | managed="true" | ||
651 | 393 | program="BuildAssembler.exe" | ||
652 | 394 | commandline="/config:sandcastle.config manifest.xml" /> | ||
653 | 395 | |||
654 | 396 | <!-- Generate HTML help project --> | ||
655 | 397 | |||
656 | 398 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
657 | 399 | workingdir="${docs_api}" | ||
658 | 400 | managed="true" | ||
659 | 401 | program="XslTransform.exe" | ||
660 | 402 | commandline='/xsl:"${sandcastle_path}\ProductionTransforms\ReflectionToChmProject.xsl" reflection.xml /out:Output\test.hhp' /> | ||
661 | 403 | |||
662 | 404 | <!-- Generate the table of contensts --> | ||
663 | 405 | |||
664 | 406 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
665 | 407 | workingdir="${docs_api}" | ||
666 | 408 | managed="true" | ||
667 | 409 | program="XslTransform.exe" | ||
668 | 410 | commandline='/xsl:"${sandcastle_path}\ProductionTransforms\createvstoc.xsl" reflection.xml /out:toc.xml' /> | ||
669 | 411 | |||
670 | 412 | <!-- Generate HTML help project information --> | ||
671 | 413 | |||
672 | 414 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
673 | 415 | workingdir="${docs_api}" | ||
674 | 416 | managed="true" | ||
675 | 417 | program="XslTransform.exe" | ||
676 | 418 | commandline='/xsl:"${sandcastle_path}\ProductionTransforms\TocToChmContents.xsl" toc.xml /out:Output\test.hhc' /> | ||
677 | 419 | |||
678 | 420 | <exec basedir="${sandcastle_path}/ProductionTools" | ||
679 | 421 | workingdir="${docs_api}" | ||
680 | 422 | managed="true" | ||
681 | 423 | program="XslTransform.exe" | ||
682 | 424 | commandline='/xsl:"${sandcastle_path}\ProductionTransforms\ReflectionToChmIndex.xsl" reflection.xml /out:Output\test.hhk' /> | ||
683 | 425 | |||
684 | 426 | <!-- Generate chm --> | ||
685 | 427 | |||
686 | 428 | <!-- you have to add a failonerror false because hhc is stupid and has a non-zero return WTF!--> | ||
687 | 429 | <exec basedir="${html_help_compiler_path}" | ||
688 | 430 | workingdir="${docs_api}" | ||
689 | 431 | managed="true" | ||
690 | 432 | program="hhc.exe" | ||
691 | 433 | failonerror="false" | ||
692 | 434 | commandline="Output\test.hhp" /> | ||
693 | 435 | |||
694 | 436 | <!-- move the generated doc to the api dir --> | ||
695 | 437 | |||
696 | 438 | <copy file="${docs_api}/Output/test.chm" | ||
697 | 439 | tofile="${docs_api}/UbuntuOne.chm" /> | ||
698 | 440 | |||
699 | 441 | <!-- delete useless data for the developer --> | ||
700 | 442 | <delete> | ||
701 | 443 | <fileset basedir="${docs_api}"> | ||
702 | 444 | <include name="*.xml" /> | ||
703 | 445 | <include name="*.config" /> | ||
704 | 446 | <include name="*.org" /> | ||
705 | 447 | </fileset> | ||
706 | 448 | </delete> | ||
707 | 449 | |||
708 | 450 | <delete dir="${docs_api}/Output"/> | ||
709 | 451 | |||
710 | 452 | </target> | ||
711 | 227 | </project> | 453 | </project> |
712 | 228 | \ No newline at end of file | 454 | \ No newline at end of file |
713 | 229 | 455 | ||
714 | === modified file 'src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj' | |||
715 | --- src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj 2010-08-09 16:28:45 +0000 | |||
716 | +++ src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj 2010-08-09 16:28:46 +0000 | |||
717 | @@ -21,6 +21,8 @@ | |||
718 | 21 | <DefineConstants>DEBUG;TRACE</DefineConstants> | 21 | <DefineConstants>DEBUG;TRACE</DefineConstants> |
719 | 22 | <ErrorReport>prompt</ErrorReport> | 22 | <ErrorReport>prompt</ErrorReport> |
720 | 23 | <WarningLevel>4</WarningLevel> | 23 | <WarningLevel>4</WarningLevel> |
721 | 24 | <DocumentationFile> | ||
722 | 25 | </DocumentationFile> | ||
723 | 24 | </PropertyGroup> | 26 | </PropertyGroup> |
724 | 25 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 27 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
725 | 26 | <DebugType>pdbonly</DebugType> | 28 | <DebugType>pdbonly</DebugType> |
726 | 27 | 29 | ||
727 | === removed file 'src/Canonical.UbuntuOne.Client.Views/App.xaml' | |||
728 | --- src/Canonical.UbuntuOne.Client.Views/App.xaml 2010-07-27 15:02:26 +0000 | |||
729 | +++ src/Canonical.UbuntuOne.Client.Views/App.xaml 1970-01-01 00:00:00 +0000 | |||
730 | @@ -1,8 +0,0 @@ | |||
731 | 1 | <Application x:Class="Canonical.UbuntuOne.Client.Views.App" | ||
732 | 2 | xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
733 | 3 | xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
734 | 4 | StartupUri="PreferencesDialog.xaml"> | ||
735 | 5 | <Application.Resources> | ||
736 | 6 | |||
737 | 7 | </Application.Resources> | ||
738 | 8 | </Application> | ||
739 | 9 | 0 | ||
740 | === removed file 'src/Canonical.UbuntuOne.Client.Views/App.xaml.cs' | |||
741 | --- src/Canonical.UbuntuOne.Client.Views/App.xaml.cs 2010-07-13 09:52:05 +0000 | |||
742 | +++ src/Canonical.UbuntuOne.Client.Views/App.xaml.cs 1970-01-01 00:00:00 +0000 | |||
743 | @@ -1,17 +0,0 @@ | |||
744 | 1 | using System; | ||
745 | 2 | using System.Collections.Generic; | ||
746 | 3 | using System.Configuration; | ||
747 | 4 | using System.Data; | ||
748 | 5 | using System.Linq; | ||
749 | 6 | using System.Windows; | ||
750 | 7 | using System.Windows.Navigation; | ||
751 | 8 | |||
752 | 9 | namespace Canonical.UbuntuOne.Client.Views | ||
753 | 10 | { | ||
754 | 11 | /// <summary> | ||
755 | 12 | /// Interaction logic for App.xaml | ||
756 | 13 | /// </summary> | ||
757 | 14 | public partial class App : Application | ||
758 | 15 | { | ||
759 | 16 | } | ||
760 | 17 | } | ||
761 | 18 | 0 | ||
762 | === modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj' | |||
763 | --- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-08-04 14:23:27 +0000 | |||
764 | +++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-08-09 16:28:46 +0000 | |||
765 | @@ -3,9 +3,10 @@ | |||
766 | 3 | <PropertyGroup> | 3 | <PropertyGroup> |
767 | 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
768 | 5 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 5 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
769 | 6 | <ProductVersion>9.0.21022</ProductVersion> | ||
770 | 6 | <SchemaVersion>2.0</SchemaVersion> | 7 | <SchemaVersion>2.0</SchemaVersion> |
773 | 7 | <ProjectGuid>{1F0E3DAF-F22F-4B0C-8039-118B082DA237}</ProjectGuid> | 8 | <ProjectGuid>{1B5BA61A-4B34-424A-886E-E2B0CF547D4D}</ProjectGuid> |
774 | 8 | <OutputType>WinExe</OutputType> | 9 | <OutputType>library</OutputType> |
775 | 9 | <AppDesignerFolder>Properties</AppDesignerFolder> | 10 | <AppDesignerFolder>Properties</AppDesignerFolder> |
776 | 10 | <RootNamespace>Canonical.UbuntuOne.Client.Views</RootNamespace> | 11 | <RootNamespace>Canonical.UbuntuOne.Client.Views</RootNamespace> |
777 | 11 | <AssemblyName>Canonical.UbuntuOne.Client.Views</AssemblyName> | 12 | <AssemblyName>Canonical.UbuntuOne.Client.Views</AssemblyName> |
778 | @@ -13,30 +14,6 @@ | |||
779 | 13 | <FileAlignment>512</FileAlignment> | 14 | <FileAlignment>512</FileAlignment> |
780 | 14 | <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 15 | <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
781 | 15 | <WarningLevel>4</WarningLevel> | 16 | <WarningLevel>4</WarningLevel> |
782 | 16 | <EnableSecurityDebugging>true</EnableSecurityDebugging> | ||
783 | 17 | <StartAction>URL</StartAction> | ||
784 | 18 | <HostInBrowser>true</HostInBrowser> | ||
785 | 19 | <TargetZone>Internet</TargetZone> | ||
786 | 20 | <GenerateManifests>true</GenerateManifests> | ||
787 | 21 | <SignManifests>True</SignManifests> | ||
788 | 22 | <ManifestKeyFile>Canonical.UbuntuOne.Client.Views_TemporaryKey.pfx</ManifestKeyFile> | ||
789 | 23 | <ManifestCertificateThumbprint>C01A25E9B7EE9BDD2B4107D4536464D937953964</ManifestCertificateThumbprint> | ||
790 | 24 | <StartupObject>Canonical.UbuntuOne.Client.Views.App</StartupObject> | ||
791 | 25 | <PublishUrl>publish\</PublishUrl> | ||
792 | 26 | <Install>false</Install> | ||
793 | 27 | <InstallFrom>Disk</InstallFrom> | ||
794 | 28 | <UpdateEnabled>false</UpdateEnabled> | ||
795 | 29 | <UpdateMode>Foreground</UpdateMode> | ||
796 | 30 | <UpdateInterval>7</UpdateInterval> | ||
797 | 31 | <UpdateIntervalUnits>Days</UpdateIntervalUnits> | ||
798 | 32 | <UpdatePeriodically>false</UpdatePeriodically> | ||
799 | 33 | <UpdateRequired>false</UpdateRequired> | ||
800 | 34 | <MapFileExtensions>true</MapFileExtensions> | ||
801 | 35 | <ApplicationRevision>0</ApplicationRevision> | ||
802 | 36 | <ApplicationVersion>1.0.0.%2a</ApplicationVersion> | ||
803 | 37 | <IsWebBootstrapper>false</IsWebBootstrapper> | ||
804 | 38 | <UseApplicationTrust>false</UseApplicationTrust> | ||
805 | 39 | <BootstrapperEnabled>false</BootstrapperEnabled> | ||
806 | 40 | </PropertyGroup> | 17 | </PropertyGroup> |
807 | 41 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 18 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
808 | 42 | <DebugSymbols>true</DebugSymbols> | 19 | <DebugSymbols>true</DebugSymbols> |
809 | @@ -46,6 +23,7 @@ | |||
810 | 46 | <DefineConstants>DEBUG;TRACE</DefineConstants> | 23 | <DefineConstants>DEBUG;TRACE</DefineConstants> |
811 | 47 | <ErrorReport>prompt</ErrorReport> | 24 | <ErrorReport>prompt</ErrorReport> |
812 | 48 | <WarningLevel>4</WarningLevel> | 25 | <WarningLevel>4</WarningLevel> |
813 | 26 | <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Client.Views.XML</DocumentationFile> | ||
814 | 49 | </PropertyGroup> | 27 | </PropertyGroup> |
815 | 50 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 28 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
816 | 51 | <DebugType>pdbonly</DebugType> | 29 | <DebugType>pdbonly</DebugType> |
817 | @@ -68,7 +46,6 @@ | |||
818 | 68 | <Reference Include="System.Core"> | 46 | <Reference Include="System.Core"> |
819 | 69 | <RequiredTargetFramework>3.5</RequiredTargetFramework> | 47 | <RequiredTargetFramework>3.5</RequiredTargetFramework> |
820 | 70 | </Reference> | 48 | </Reference> |
821 | 71 | <Reference Include="System.Drawing" /> | ||
822 | 72 | <Reference Include="System.Xml.Linq"> | 49 | <Reference Include="System.Xml.Linq"> |
823 | 73 | <RequiredTargetFramework>3.5</RequiredTargetFramework> | 50 | <RequiredTargetFramework>3.5</RequiredTargetFramework> |
824 | 74 | </Reference> | 51 | </Reference> |
825 | @@ -77,24 +54,11 @@ | |||
826 | 77 | </Reference> | 54 | </Reference> |
827 | 78 | <Reference Include="System.Data" /> | 55 | <Reference Include="System.Data" /> |
828 | 79 | <Reference Include="System.Xml" /> | 56 | <Reference Include="System.Xml" /> |
841 | 80 | <Reference Include="UIAutomationProvider"> | 57 | <Reference Include="WindowsBase" /> |
842 | 81 | <RequiredTargetFramework>3.0</RequiredTargetFramework> | 58 | <Reference Include="PresentationCore" /> |
843 | 82 | </Reference> | 59 | <Reference Include="PresentationFramework" /> |
832 | 83 | <Reference Include="WindowsBase"> | ||
833 | 84 | <RequiredTargetFramework>3.0</RequiredTargetFramework> | ||
834 | 85 | </Reference> | ||
835 | 86 | <Reference Include="PresentationCore"> | ||
836 | 87 | <RequiredTargetFramework>3.0</RequiredTargetFramework> | ||
837 | 88 | </Reference> | ||
838 | 89 | <Reference Include="PresentationFramework"> | ||
839 | 90 | <RequiredTargetFramework>3.0</RequiredTargetFramework> | ||
840 | 91 | </Reference> | ||
844 | 92 | </ItemGroup> | 60 | </ItemGroup> |
845 | 93 | <ItemGroup> | 61 | <ItemGroup> |
846 | 94 | <ApplicationDefinition Include="App.xaml"> | ||
847 | 95 | <Generator>MSBuild:Compile</Generator> | ||
848 | 96 | <SubType>Designer</SubType> | ||
849 | 97 | </ApplicationDefinition> | ||
850 | 98 | <Page Include="NotifyIcon.xaml"> | 62 | <Page Include="NotifyIcon.xaml"> |
851 | 99 | <Generator>MSBuild:Compile</Generator> | 63 | <Generator>MSBuild:Compile</Generator> |
852 | 100 | <SubType>Designer</SubType> | 64 | <SubType>Designer</SubType> |
853 | @@ -111,13 +75,8 @@ | |||
854 | 111 | <SubType>Designer</SubType> | 75 | <SubType>Designer</SubType> |
855 | 112 | <Generator>MSBuild:Compile</Generator> | 76 | <Generator>MSBuild:Compile</Generator> |
856 | 113 | </Page> | 77 | </Page> |
857 | 114 | <Compile Include="App.xaml.cs"> | ||
858 | 115 | <DependentUpon>App.xaml</DependentUpon> | ||
859 | 116 | <SubType>Code</SubType> | ||
860 | 117 | </Compile> | ||
861 | 118 | <Compile Include="NotifyIcon.xaml.cs"> | 78 | <Compile Include="NotifyIcon.xaml.cs"> |
862 | 119 | <DependentUpon>NotifyIcon.xaml</DependentUpon> | 79 | <DependentUpon>NotifyIcon.xaml</DependentUpon> |
863 | 120 | <SubType>Code</SubType> | ||
864 | 121 | </Compile> | 80 | </Compile> |
865 | 122 | </ItemGroup> | 81 | </ItemGroup> |
866 | 123 | <ItemGroup> | 82 | <ItemGroup> |
867 | @@ -136,11 +95,6 @@ | |||
868 | 136 | <DesignTime>True</DesignTime> | 95 | <DesignTime>True</DesignTime> |
869 | 137 | <DependentUpon>Resources.resx</DependentUpon> | 96 | <DependentUpon>Resources.resx</DependentUpon> |
870 | 138 | </Compile> | 97 | </Compile> |
871 | 139 | <Compile Include="Properties\Settings.Designer.cs"> | ||
872 | 140 | <AutoGen>True</AutoGen> | ||
873 | 141 | <DependentUpon>Settings.settings</DependentUpon> | ||
874 | 142 | <DesignTimeSharedInput>True</DesignTimeSharedInput> | ||
875 | 143 | </Compile> | ||
876 | 144 | <Compile Include="Resources\Resources.Designer.cs"> | 98 | <Compile Include="Resources\Resources.Designer.cs"> |
877 | 145 | <AutoGen>True</AutoGen> | 99 | <AutoGen>True</AutoGen> |
878 | 146 | <DesignTime>True</DesignTime> | 100 | <DesignTime>True</DesignTime> |
879 | @@ -158,50 +112,13 @@ | |||
880 | 158 | <SubType>Designer</SubType> | 112 | <SubType>Designer</SubType> |
881 | 159 | </EmbeddedResource> | 113 | </EmbeddedResource> |
882 | 160 | <EmbeddedResource Include="Resources\Resources.resx"> | 114 | <EmbeddedResource Include="Resources\Resources.resx"> |
883 | 161 | <Generator>PublicResXFileCodeGenerator</Generator> | ||
884 | 162 | <LastGenOutput>Resources.Designer.cs</LastGenOutput> | ||
885 | 163 | <SubType>Designer</SubType> | 115 | <SubType>Designer</SubType> |
886 | 164 | </EmbeddedResource> | 116 | </EmbeddedResource> |
922 | 165 | <None Include="Canonical.UbuntuOne.Client.Views_TemporaryKey.pfx" /> | 117 | </ItemGroup> |
923 | 166 | <None Include="Properties\Settings.settings"> | 118 | <ItemGroup> |
924 | 167 | <Generator>SettingsSingleFileGenerator</Generator> | 119 | <Resource Include="Resources\ubuntu-logo-22x22.png" /> |
890 | 168 | <LastGenOutput>Settings.Designer.cs</LastGenOutput> | ||
891 | 169 | </None> | ||
892 | 170 | <None Include="Properties\app.manifest" /> | ||
893 | 171 | <AppDesigner Include="Properties\" /> | ||
894 | 172 | </ItemGroup> | ||
895 | 173 | <ItemGroup> | ||
896 | 174 | <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> | ||
897 | 175 | <Visible>False</Visible> | ||
898 | 176 | <ProductName>.NET Framework 2.0 %28x86%29</ProductName> | ||
899 | 177 | <Install>false</Install> | ||
900 | 178 | </BootstrapperPackage> | ||
901 | 179 | <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> | ||
902 | 180 | <Visible>False</Visible> | ||
903 | 181 | <ProductName>.NET Framework 3.0 %28x86%29</ProductName> | ||
904 | 182 | <Install>false</Install> | ||
905 | 183 | </BootstrapperPackage> | ||
906 | 184 | <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> | ||
907 | 185 | <Visible>False</Visible> | ||
908 | 186 | <ProductName>.NET Framework 3.5</ProductName> | ||
909 | 187 | <Install>true</Install> | ||
910 | 188 | </BootstrapperPackage> | ||
911 | 189 | <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> | ||
912 | 190 | <Visible>False</Visible> | ||
913 | 191 | <ProductName>Windows Installer 3.1</ProductName> | ||
914 | 192 | <Install>true</Install> | ||
915 | 193 | </BootstrapperPackage> | ||
916 | 194 | </ItemGroup> | ||
917 | 195 | <ItemGroup> | ||
918 | 196 | <Resource Include="Resources\ubuntu-logo-22x22.png"> | ||
919 | 197 | </Resource> | ||
920 | 198 | </ItemGroup> | ||
921 | 199 | <ItemGroup> | ||
925 | 200 | <Resource Include="Resources\ubuntu-logo-24x24.png" /> | 120 | <Resource Include="Resources\ubuntu-logo-24x24.png" /> |
930 | 201 | </ItemGroup> | 121 | <Resource Include="Resources\ubuntu-logo-32x32.png" /> |
927 | 202 | <ItemGroup> | ||
928 | 203 | <Resource Include="Resources\ubuntu-logo-32x32.png"> | ||
929 | 204 | </Resource> | ||
931 | 205 | </ItemGroup> | 122 | </ItemGroup> |
932 | 206 | <ItemGroup> | 123 | <ItemGroup> |
933 | 207 | <ProjectReference Include="..\Canonical.UbuntuOne.Client\Canonical.UbuntuOne.Client.csproj"> | 124 | <ProjectReference Include="..\Canonical.UbuntuOne.Client\Canonical.UbuntuOne.Client.csproj"> |
934 | @@ -224,7 +141,4 @@ | |||
935 | 224 | <Target Name="AfterBuild"> | 141 | <Target Name="AfterBuild"> |
936 | 225 | </Target> | 142 | </Target> |
937 | 226 | --> | 143 | --> |
938 | 227 | <PropertyGroup> | ||
939 | 228 | <StartArguments /> | ||
940 | 229 | </PropertyGroup> | ||
941 | 230 | </Project> | 144 | </Project> |
942 | 231 | \ No newline at end of file | 145 | \ No newline at end of file |
943 | 232 | 146 | ||
944 | === removed file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views_TemporaryKey.pfx' | |||
945 | 233 | Binary files src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views_TemporaryKey.pfx 2010-07-13 09:52:05 +0000 and src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views_TemporaryKey.pfx 1970-01-01 00:00:00 +0000 differ | 147 | Binary files src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views_TemporaryKey.pfx 2010-07-13 09:52:05 +0000 and src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views_TemporaryKey.pfx 1970-01-01 00:00:00 +0000 differ |
946 | === removed file 'src/Canonical.UbuntuOne.Client.Views/Properties/Settings.Designer.cs' | |||
947 | --- src/Canonical.UbuntuOne.Client.Views/Properties/Settings.Designer.cs 2010-07-13 09:52:05 +0000 | |||
948 | +++ src/Canonical.UbuntuOne.Client.Views/Properties/Settings.Designer.cs 1970-01-01 00:00:00 +0000 | |||
949 | @@ -1,30 +0,0 @@ | |||
950 | 1 | //------------------------------------------------------------------------------ | ||
951 | 2 | // <auto-generated> | ||
952 | 3 | // This code was generated by a tool. | ||
953 | 4 | // Runtime Version:2.0.50727.4927 | ||
954 | 5 | // | ||
955 | 6 | // Changes to this file may cause incorrect behavior and will be lost if | ||
956 | 7 | // the code is regenerated. | ||
957 | 8 | // </auto-generated> | ||
958 | 9 | //------------------------------------------------------------------------------ | ||
959 | 10 | |||
960 | 11 | namespace Canonical.UbuntuOne.Client.Views.Properties | ||
961 | 12 | { | ||
962 | 13 | |||
963 | 14 | |||
964 | 15 | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] | ||
965 | 16 | [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] | ||
966 | 17 | internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase | ||
967 | 18 | { | ||
968 | 19 | |||
969 | 20 | private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); | ||
970 | 21 | |||
971 | 22 | public static Settings Default | ||
972 | 23 | { | ||
973 | 24 | get | ||
974 | 25 | { | ||
975 | 26 | return defaultInstance; | ||
976 | 27 | } | ||
977 | 28 | } | ||
978 | 29 | } | ||
979 | 30 | } | ||
980 | 31 | 0 | ||
981 | === removed file 'src/Canonical.UbuntuOne.Client.Views/Properties/Settings.settings' | |||
982 | --- src/Canonical.UbuntuOne.Client.Views/Properties/Settings.settings 2010-07-13 09:52:05 +0000 | |||
983 | +++ src/Canonical.UbuntuOne.Client.Views/Properties/Settings.settings 1970-01-01 00:00:00 +0000 | |||
984 | @@ -1,7 +0,0 @@ | |||
985 | 1 | <?xml version='1.0' encoding='utf-8'?> | ||
986 | 2 | <SettingsFile xmlns="uri:settings" CurrentProfile="(Default)"> | ||
987 | 3 | <Profiles> | ||
988 | 4 | <Profile Name="(Default)" /> | ||
989 | 5 | </Profiles> | ||
990 | 6 | <Settings /> | ||
991 | 7 | </SettingsFile> | ||
992 | 8 | \ No newline at end of file | 0 | \ No newline at end of file |
993 | 9 | 1 | ||
994 | === removed file 'src/Canonical.UbuntuOne.Client.Views/Properties/app.manifest' | |||
995 | --- src/Canonical.UbuntuOne.Client.Views/Properties/app.manifest 2010-07-13 09:52:05 +0000 | |||
996 | +++ src/Canonical.UbuntuOne.Client.Views/Properties/app.manifest 1970-01-01 00:00:00 +0000 | |||
997 | @@ -1,26 +0,0 @@ | |||
998 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
999 | 2 | <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
1000 | 3 | <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/> | ||
1001 | 4 | <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> | ||
1002 | 5 | <security> | ||
1003 | 6 | <applicationRequestMinimum> | ||
1004 | 7 | <defaultAssemblyRequest permissionSetReference="Custom" /> | ||
1005 | 8 | <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" /> | ||
1006 | 9 | </applicationRequestMinimum> | ||
1007 | 10 | <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> | ||
1008 | 11 | <!-- UAC Manifest Options | ||
1009 | 12 | If you want to change the Windows User Account Control level replace the | ||
1010 | 13 | requestedExecutionLevel node with one of the following. | ||
1011 | 14 | |||
1012 | 15 | <requestedExecutionLevel level="asInvoker" uiAccess="false" /> | ||
1013 | 16 | <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> | ||
1014 | 17 | <requestedExecutionLevel level="highestAvailable" uiAccess="false" /> | ||
1015 | 18 | |||
1016 | 19 | If you want to utilize File and Registry Virtualization for backward | ||
1017 | 20 | compatibility then delete the requestedExecutionLevel node. | ||
1018 | 21 | --> | ||
1019 | 22 | <requestedExecutionLevel level="asInvoker" uiAccess="false" /> | ||
1020 | 23 | </requestedPrivileges> | ||
1021 | 24 | </security> | ||
1022 | 25 | </trustInfo> | ||
1023 | 26 | </asmv1:assembly> | ||
1024 | 27 | 0 | ||
1025 | === modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj' | |||
1026 | --- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-08-09 16:28:45 +0000 | |||
1027 | +++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-08-09 16:28:46 +0000 | |||
1028 | @@ -21,6 +21,7 @@ | |||
1029 | 21 | <WarningLevel>4</WarningLevel> | 21 | <WarningLevel>4</WarningLevel> |
1030 | 22 | <PlatformTarget>x86</PlatformTarget> | 22 | <PlatformTarget>x86</PlatformTarget> |
1031 | 23 | <ConsolePause>false</ConsolePause> | 23 | <ConsolePause>false</ConsolePause> |
1032 | 24 | <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Client.XML</DocumentationFile> | ||
1033 | 24 | </PropertyGroup> | 25 | </PropertyGroup> |
1034 | 25 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> |
1035 | 26 | <DebugType>none</DebugType> | 27 | <DebugType>none</DebugType> |
1036 | 27 | 28 | ||
1037 | === modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj' | |||
1038 | --- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-08-04 14:20:36 +0000 | |||
1039 | +++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-08-09 16:28:46 +0000 | |||
1040 | @@ -21,6 +21,7 @@ | |||
1041 | 21 | <WarningLevel>4</WarningLevel> | 21 | <WarningLevel>4</WarningLevel> |
1042 | 22 | <PlatformTarget>x86</PlatformTarget> | 22 | <PlatformTarget>x86</PlatformTarget> |
1043 | 23 | <ConsolePause>false</ConsolePause> | 23 | <ConsolePause>false</ConsolePause> |
1044 | 24 | <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Common.Tests.XML</DocumentationFile> | ||
1045 | 24 | </PropertyGroup> | 25 | </PropertyGroup> |
1046 | 25 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> |
1047 | 26 | <DebugType>none</DebugType> | 27 | <DebugType>none</DebugType> |
1048 | 27 | 28 | ||
1049 | === modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj' | |||
1050 | --- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-08-09 16:28:45 +0000 | |||
1051 | +++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-08-09 16:28:46 +0000 | |||
1052 | @@ -21,6 +21,7 @@ | |||
1053 | 21 | <WarningLevel>4</WarningLevel> | 21 | <WarningLevel>4</WarningLevel> |
1054 | 22 | <PlatformTarget>x86</PlatformTarget> | 22 | <PlatformTarget>x86</PlatformTarget> |
1055 | 23 | <ConsolePause>false</ConsolePause> | 23 | <ConsolePause>false</ConsolePause> |
1056 | 24 | <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Common.XML</DocumentationFile> | ||
1057 | 24 | </PropertyGroup> | 25 | </PropertyGroup> |
1058 | 25 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> |
1059 | 26 | <DebugType>none</DebugType> | 27 | <DebugType>none</DebugType> |
1060 | 27 | 28 | ||
1061 | === modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj' | |||
1062 | --- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-08-02 17:57:48 +0000 | |||
1063 | +++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-08-09 16:28:46 +0000 | |||
1064 | @@ -41,6 +41,7 @@ | |||
1065 | 41 | <WarningLevel>4</WarningLevel> | 41 | <WarningLevel>4</WarningLevel> |
1066 | 42 | <PlatformTarget>x86</PlatformTarget> | 42 | <PlatformTarget>x86</PlatformTarget> |
1067 | 43 | <ConsolePause>false</ConsolePause> | 43 | <ConsolePause>false</ConsolePause> |
1068 | 44 | <DocumentationFile>bin\Debug\Canonical.UbuntuOne.ProcessDispatcher.XML</DocumentationFile> | ||
1069 | 44 | </PropertyGroup> | 45 | </PropertyGroup> |
1070 | 45 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> | 46 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> |
1071 | 46 | <DebugType>none</DebugType> | 47 | <DebugType>none</DebugType> |
1072 | 47 | 48 | ||
1073 | === modified file 'src/UbuntuOne.sln' | |||
1074 | --- src/UbuntuOne.sln 2010-07-30 07:38:58 +0000 | |||
1075 | +++ src/UbuntuOne.sln 2010-08-09 16:28:46 +0000 | |||
1076 | @@ -11,7 +11,7 @@ | |||
1077 | 11 | EndProject | 11 | EndProject |
1078 | 12 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Canonical.UbuntuOne.ProcessDispatcher.Tests", "Canonical.UbuntuOne.ProcessDispatcher.Tests\Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj", "{6C139C0B-FDBB-4DA3-9308-0E57531A085F}" | 12 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Canonical.UbuntuOne.ProcessDispatcher.Tests", "Canonical.UbuntuOne.ProcessDispatcher.Tests\Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj", "{6C139C0B-FDBB-4DA3-9308-0E57531A085F}" |
1079 | 13 | EndProject | 13 | EndProject |
1081 | 14 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Canonical.UbuntuOne.Client.Views", "Canonical.UbuntuOne.Client.Views\Canonical.UbuntuOne.Client.Views.csproj", "{1F0E3DAF-F22F-4B0C-8039-118B082DA237}" | 14 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Canonical.UbuntuOne.Client.Views", "Canonical.UbuntuOne.Client.Views\Canonical.UbuntuOne.Client.Views.csproj", "{1B5BA61A-4B34-424A-886E-E2B0CF547D4D}" |
1082 | 15 | EndProject | 15 | EndProject |
1083 | 16 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTestApp", "ServiceTestApp\ServiceTestApp.csproj", "{009E6FD4-DE20-410A-B1F3-5F0542CD8745}" | 16 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTestApp", "ServiceTestApp\ServiceTestApp.csproj", "{009E6FD4-DE20-410A-B1F3-5F0542CD8745}" |
1084 | 17 | EndProject | 17 | EndProject |
1085 | @@ -81,16 +81,16 @@ | |||
1086 | 81 | {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Release|Mixed Platforms.Build.0 = Release|x86 | 81 | {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Release|Mixed Platforms.Build.0 = Release|x86 |
1087 | 82 | {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Release|x86.ActiveCfg = Release|x86 | 82 | {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Release|x86.ActiveCfg = Release|x86 |
1088 | 83 | {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Release|x86.Build.0 = Release|x86 | 83 | {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Release|x86.Build.0 = Release|x86 |
1099 | 84 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 84 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
1100 | 85 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Debug|Any CPU.Build.0 = Debug|Any CPU | 85 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU |
1101 | 86 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU | 86 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU |
1102 | 87 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU | 87 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU |
1103 | 88 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Debug|x86.ActiveCfg = Debug|Any CPU | 88 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Debug|x86.ActiveCfg = Debug|Any CPU |
1104 | 89 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Release|Any CPU.ActiveCfg = Release|Any CPU | 89 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU |
1105 | 90 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Release|Any CPU.Build.0 = Release|Any CPU | 90 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|Any CPU.Build.0 = Release|Any CPU |
1106 | 91 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU | 91 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU |
1107 | 92 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Release|Mixed Platforms.Build.0 = Release|Any CPU | 92 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU |
1108 | 93 | {1F0E3DAF-F22F-4B0C-8039-118B082DA237}.Release|x86.ActiveCfg = Release|Any CPU | 93 | {1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|x86.ActiveCfg = Release|Any CPU |
1109 | 94 | {009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 94 | {009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
1110 | 95 | {009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Any CPU.Build.0 = Debug|Any CPU | 95 | {009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Any CPU.Build.0 = Debug|Any CPU |
1111 | 96 | {009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU | 96 | {009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU |
1112 | 97 | 97 | ||
1113 | === modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj' | |||
1114 | --- src/UbuntuOneClient/UbuntuOneClient.csproj 2010-08-09 16:28:45 +0000 | |||
1115 | +++ src/UbuntuOneClient/UbuntuOneClient.csproj 2010-08-09 16:28:46 +0000 | |||
1116 | @@ -23,6 +23,7 @@ | |||
1117 | 23 | <DefineConstants>DEBUG;TRACE</DefineConstants> | 23 | <DefineConstants>DEBUG;TRACE</DefineConstants> |
1118 | 24 | <ErrorReport>prompt</ErrorReport> | 24 | <ErrorReport>prompt</ErrorReport> |
1119 | 25 | <WarningLevel>4</WarningLevel> | 25 | <WarningLevel>4</WarningLevel> |
1120 | 26 | <DocumentationFile>bin\Debug\UbuntuOneClient.XML</DocumentationFile> | ||
1121 | 26 | </PropertyGroup> | 27 | </PropertyGroup> |
1122 | 27 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 28 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
1123 | 28 | <DebugType>pdbonly</DebugType> | 29 | <DebugType>pdbonly</DebugType> |
1124 | @@ -63,7 +64,7 @@ | |||
1125 | 63 | </ItemGroup> | 64 | </ItemGroup> |
1126 | 64 | <ItemGroup> | 65 | <ItemGroup> |
1127 | 65 | <Compile Include="..\Version.cs"> | 66 | <Compile Include="..\Version.cs"> |
1129 | 66 | <Link>Version.cs</Link> | 67 | <Link>Properties\Version.cs</Link> |
1130 | 67 | </Compile> | 68 | </Compile> |
1131 | 68 | <Compile Include="Program.cs" /> | 69 | <Compile Include="Program.cs" /> |
1132 | 69 | <Compile Include="Properties\AssemblyInfo.cs"> | 70 | <Compile Include="Properties\AssemblyInfo.cs"> |
Build, tests, install, disinstall.