Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/fix_nant_warnings into lp:ubuntuone-windows-installer/beta

  1. fix_nant_warnings
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Stuart Colville
Approved revision: 14
Merge reported by: Manuel de la Peña
Merged at revision: not available
Proposed branch: lp:~mandel/ubuntuone-windows-installer/fix_nant_warnings
Merge into: lp:ubuntuone-windows-installer/beta
Diff against target: 83 lines (+10/-10)
1 file modified
main.build (+10/-10)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/fix_nant_warnings
Reviewer Review Type Date Requested Status
Stuart Colville (community) Approve
Vincenzo Di Somma (community) Approve
Review via email: mp+30273@code.launchpad.net

Description of the change

All the noise of the warning due to deprecated attributes has been removed.

To post a comment you must log in.
lp:~mandel/ubuntuone-windows-installer/fix_nant_warnings updated
14. By Manuel de la Peña

Merge with trunk

Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
Stuart Colville (muffinresearch) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'main.build'
2--- main.build 2010-07-19 10:10:22 +0000
3+++ main.build 2010-07-19 14:13:02 +0000
4@@ -64,31 +64,31 @@
5
6 <!-- execute the proto-gen tool to generate the code of the c# project -->
7 <exec basedir="lib/Protobuf-net"
8- useruntimeengine="true"
9+ managed="true"
10 workingdir="lib/Protobuf-net"
11 program="protogen.exe"
12 commandline="-i:sync_daemon.proto -o:SyncDaemon.cs -ns:Canonical.UbuntuOne.ProcessDispatcher -p:fixCase=true"/>
13
14 <exec basedir="lib/Protobuf-net"
15- useruntimeengine="true"
16+ managed="true"
17 workingdir="lib/Protobuf-net"
18 program="protogen.exe"
19 commandline="-i:configuration.proto -o:Configuration.cs -ns:Canonical.UbuntuOne.ProcessDispatcher -p:fixCase=true"/>
20
21 <exec basedir="lib/Protobuf-net"
22- useruntimeengine="true"
23+ managed="true"
24 workingdir="lib/Protobuf-net"
25 program="protogen.exe"
26 commandline="-i:sync_daemon_client.proto -o:SyncDaemonClient.cs -ns:Canonical.UbuntuOne.ProcessDispatcher -p:fixCase=true"/>
27
28 <exec basedir="lib/Protobuf-net"
29- useruntimeengine="true"
30+ managed="true"
31 workingdir="lib/Protobuf-net"
32 program="protogen.exe"
33 commandline="-i:folder.proto -o:Folder.cs -ns:Canonical.UbuntuOne.ProcessDispatcher -p:fixCase=true"/>
34
35 <exec basedir="lib/Protobuf-net"
36- useruntimeengine="true"
37+ managed="true"
38 workingdir="lib/Protobuf-net"
39 program="protogen.exe"
40 commandline="-i:shares.proto -o:Shares.cs -ns:Canonical.UbuntuOne.ProcessDispatcher -p:fixCase=true"/>
41@@ -128,14 +128,14 @@
42 <!-- execute the nunit console from the tools dir agains each of the test dlls -->
43 <echo>Executing Canonical.UbuntuOne.Common.Tests</echo>
44 <exec basedir="tools/NUnit"
45- useruntimeengine="true"
46+ managed="true"
47 workingdir="src/Canonical.UbuntuOne.Common.Tests/bin/${enviroment}"
48 program="nunit-console.exe"
49 commandline="Canonical.UbuntuOne.Common.Tests.dll /xml=../../../../test-results/Canonical.UbuntuOne.Common.Tests-Result.xml" />
50
51 <echo>Executng Canonical.UbuntuOne.ProcessDispatcher.Tests</echo>
52 <exec basedir="tools/NUnit"
53- useruntimeengine="true"
54+ managed="true"
55 workingdir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin/${enviroment}"
56 program="nunit-console.exe"
57 commandline="Canonical.UbuntuOne.ProcessDispatcher.Tests.dll /xml=../../../../test-results/Canonical.UbuntuOne.ProcessDispatcher.Tests-Result.xml" />
58@@ -147,14 +147,14 @@
59
60 <!-- wix compiler -->
61 <exec basedir="${wix_path}"
62- useruntimeengine="true"
63+ managed="true"
64 workingdir="install"
65 program="candle.exe"
66 commandline=" UbuntuOne.wxs"/>
67
68 <!-- wix linker -->
69 <exec basedir="${wix_path}"
70- useruntimeengine="true"
71+ managed="true"
72 workingdir="install"
73 program="light.exe"
74 commandline="-out UbuntuOne.msi -ext WixUIExtension UbuntuOne.wixobj"/>
75@@ -166,7 +166,7 @@
76 description="Creates a bootstrapper that will allow to install Ubuntu One, Tomboy and Gtk Sharp in the users machine.">
77
78 <exec basedir="tools/dotNetInstaller/bin"
79- useruntimeengine="true"
80+ managed="true"
81 workingdir="install"
82 program="InstallerLinker.exe"
83 commandline="/Output:setup.exe /Template:dotNetInstaller.exe /Configuration:InstallerProject.xml /Embed+" />

Subscribers

People subscribed via source and target branches

to all changes: