Merge lp:~mandel/ubuntuone-windows-installer/sandcastle into lp:ubuntuone-windows-installer/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
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
Vincenzo Di Somma (community) Approve
Review via email: mp+31757@code.launchpad.net

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
Vincenzo Di Somma (vds) wrote :

Build, tests, install, disinstall.

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

Subscribers

People subscribed via source and target branches

to all changes: