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

[Manuel de la Peña]

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

[Rick McBride (rmcbride)]

+1,

review: Approve

[Vincenzo Di Somma (vds)]

Looks good.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-08-18 12:54:43 +0000
+++ .bzrignore	2010-08-18 12:54:43 +0000
@@ -28,3 +28,4 @@
 src/UbuntuOneClient.Tests/obj
 *.ReSharper
 test-results
+install/UbuntuOne.msi
 
=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs	2010-08-04 16:45:17 +0000
+++ install/UbuntuOne.wxs	2010-08-18 12:54:43 +0000
@@ -208,6 +208,22 @@
 									  Source="build_results\Daemon\Spring.Services.xml" 
 									  KeyPath="yes"/>
 							</Component>
+							<Component Id="SpringDataComponent" 
+									   Guid="e1736390-aac1-11df-94e2-0800200c9a66">
+								<File Id="Spring.Data.dll" 
+									  Name="Spring.Data.dll" 
+									  DiskId="1" 
+									  Source="build_results\Daemon\Spring.Data.dll" 
+									  KeyPath="yes"/>
+							</Component>
+							<Component Id="SymstemDataSQLiteComponent" 
+									   Guid="43573410-aac2-11df-94e2-0800200c9a66">
+								<File Id="System.Data.SQLite.DLL" 
+									  Name="System.Data.SQLite.DLL" 
+									  DiskId="1" 
+									  Source="build_results\Daemon\System.Data.SQLite.DLL" 
+									  KeyPath="yes"/>
+							</Component>
 							<Directory Id="DaemonConfigDir"
 								   Name="Config">
 								<Component Id="DaemonConfigLog4Net" 
@@ -446,6 +462,8 @@
 			<ComponentRef Id="ServiceModelBehavioursConfig" />
 			<ComponentRef Id="ServiceModelBindingsConfig" />
 			<ComponentRef Id="ServiceModelServicesConfig" />
+			<ComponentRef Id="SpringDataComponent" />
+			<ComponentRef Id="SymstemDataSQLiteComponent" />
 			<!-- Client components -->
 			<ComponentRef Id="AvalonLib" />
 			<ComponentRef Id="UbuntuOneClientLib" />
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-08-18 12:54:43 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-08-18 12:54:43 +0000
@@ -141,6 +141,10 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\SQLite\System.Data.SQLite.DLL</HintPath>
+    </Reference>
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.ServiceModel">