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

[Manuel de la Peña]

Removes the dlls that are used for the protobuf implementation from the msi package.

[John Lenton (chipaca)]

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs	2010-08-18 12:44:45 +0000
+++ install/UbuntuOne.wxs	2010-08-24 17:51:38 +0000
@@ -136,30 +136,6 @@
 									  Source="build_results\Daemon\log4net.dll" 
 									  KeyPath="yes"/>
 							</Component>
-							<Component Id="ProtobufNetComponent" 
-									   Guid="24d3a3a0-94b7-11df-981c-0800200c9a66">
-								<File Id="protobufnet.dll" 
-									  Name="protobuf-net.dll" 
-									  DiskId="1" 
-									  Source="build_results\Daemon\protobuf-net.dll" 
-									  KeyPath="yes"/>
-							</Component>
-							<Component Id="ProtobufPdbComponent" 
-									   Guid="309dd3e0-94b7-11df-981c-0800200c9a66">
-								<File Id="protobufnet.pdb" 
-									  Name="protobuf-net.pdb" 
-									  DiskId="1" 
-									  Source="build_results\Daemon\protobuf-net.pdb" 
-									  KeyPath="yes"/>
-							</Component>
-							<Component Id="ProtobufConfigComponent" 
-									   Guid="44ba72c0-94b7-11df-981c-0800200c9a66">
-								<File Id="protobufnet.xml" 
-									  Name="protobuf-net.xml" 
-									  DiskId="1" 
-									  Source="build_results\Daemon\protobuf-net.xml" 
-									  KeyPath="yes"/>
-							</Component>
 							<Component Id="SpringAopComponent" 
 									   Guid="5431cc80-94b7-11df-981c-0800200c9a66">
 								<File Id="Spring.Aop.dll" 
@@ -446,9 +422,6 @@
 			<ComponentRef Id="CommonLoggingLog4NetComponent" />
 			<ComponentRef Id="DotUpdaterLib" />
 			<ComponentRef Id="Log4NetComponent" />
-			<ComponentRef Id="ProtobufNetComponent" />
-			<ComponentRef Id="ProtobufPdbComponent" />
-			<ComponentRef Id="ProtobufConfigComponent" />
 			<ComponentRef Id="SpringAopComponent" />
 			<ComponentRef Id="SpringAopConfigComponent" />
 			<ComponentRef Id="SpringCoreComponent" />

=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj	2010-08-24 17:51:38 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj	2010-08-24 17:51:38 +0000
@@ -86,10 +86,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Nunit\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="protobuf-net, Version=1.0.0.282, Culture=neutral, PublicKeyToken=257b51d87d2e4d67">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Protobuf-net\protobuf-net.dll</HintPath>
-    </Reference>
     <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\RhinoMocks\Rhino.Mocks.dll</HintPath>

=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-08-24 17:51:38 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-08-24 17:51:38 +0000
@@ -119,10 +119,6 @@
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.ServiceModel">
     </Reference>
-    <Reference Include="protobuf-net, Version=1.0.0.282, Culture=neutral, PublicKeyToken=257b51d87d2e4d67">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Protobuf-net\protobuf-net.dll</HintPath>
-    </Reference>
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>