Ubuntu One Windows Installer

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

  1. update_daemon_msi
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Vincenzo Di Somma
Approved revision: 50
Merged at revision: 67
Proposed branch: lp:~mandel/ubuntuone-windows-installer/update_daemon_msi
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/implement_db_port_manager
Diff against target: 59 lines (+23/-0)
3 files modified
.bzrignore (+1/-0)
install/UbuntuOne.wxs (+18/-0)
src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj (+4/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/update_daemon_msi
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
Rick McBride (community) Approve
Review via email: mp+32993@code.launchpad.net

Description of the change

Provides updates in the wix code to ensure that the new dependencies from the daemon are installed in the users machine.

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

+1,

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

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-08-18 12:54:43 +0000
3+++ .bzrignore 2010-08-18 12:54:43 +0000
4@@ -28,3 +28,4 @@
5 src/UbuntuOneClient.Tests/obj
6 *.ReSharper
7 test-results
8+install/UbuntuOne.msi
9
10=== modified file 'install/UbuntuOne.wxs'
11--- install/UbuntuOne.wxs 2010-08-04 16:45:17 +0000
12+++ install/UbuntuOne.wxs 2010-08-18 12:54:43 +0000
13@@ -208,6 +208,22 @@
14 Source="build_results\Daemon\Spring.Services.xml"
15 KeyPath="yes"/>
16 </Component>
17+ <Component Id="SpringDataComponent"
18+ Guid="e1736390-aac1-11df-94e2-0800200c9a66">
19+ <File Id="Spring.Data.dll"
20+ Name="Spring.Data.dll"
21+ DiskId="1"
22+ Source="build_results\Daemon\Spring.Data.dll"
23+ KeyPath="yes"/>
24+ </Component>
25+ <Component Id="SymstemDataSQLiteComponent"
26+ Guid="43573410-aac2-11df-94e2-0800200c9a66">
27+ <File Id="System.Data.SQLite.DLL"
28+ Name="System.Data.SQLite.DLL"
29+ DiskId="1"
30+ Source="build_results\Daemon\System.Data.SQLite.DLL"
31+ KeyPath="yes"/>
32+ </Component>
33 <Directory Id="DaemonConfigDir"
34 Name="Config">
35 <Component Id="DaemonConfigLog4Net"
36@@ -446,6 +462,8 @@
37 <ComponentRef Id="ServiceModelBehavioursConfig" />
38 <ComponentRef Id="ServiceModelBindingsConfig" />
39 <ComponentRef Id="ServiceModelServicesConfig" />
40+ <ComponentRef Id="SpringDataComponent" />
41+ <ComponentRef Id="SymstemDataSQLiteComponent" />
42 <!-- Client components -->
43 <ComponentRef Id="AvalonLib" />
44 <ComponentRef Id="UbuntuOneClientLib" />
45
46=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
47--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-08-18 12:54:43 +0000
48+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-08-18 12:54:43 +0000
49@@ -141,6 +141,10 @@
50 </Reference>
51 <Reference Include="System" />
52 <Reference Include="System.Data" />
53+ <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
54+ <SpecificVersion>False</SpecificVersion>
55+ <HintPath>..\..\lib\SQLite\System.Data.SQLite.DLL</HintPath>
56+ </Reference>
57 <Reference Include="System.ServiceProcess" />
58 <Reference Include="System.Configuration.Install" />
59 <Reference Include="System.ServiceModel">

Subscribers

People subscribed via source and target branches

to all changes: