From 590e641d9b5f46448f8a6b0d2d4783f32de12239 Mon Sep 17 00:00:00 2001
From: Eusebiu Marcu <marcueusebiu@gmail.com>
Date: Tue, 7 Dec 2010 23:24:18 +0200
Subject: [PATCH 1/3] remove copy local flags

---
 src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index 67d344518c..4eaa6576a6 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -60,12 +60,15 @@
   <ItemGroup>
     <Reference Include="GraphSharp">
       <HintPath>..\..\..\Libraries\GraphSharp\GraphSharp.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="GraphSharp.Controls">
       <HintPath>..\..\..\Libraries\GraphSharp\GraphSharp.Controls.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Contracts">
       <HintPath>..\..\..\Libraries\GraphSharp\Microsoft.Contracts.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore">
@@ -79,6 +82,7 @@
     </Reference>
     <Reference Include="QuickGraph">
       <HintPath>..\..\..\Libraries\GraphSharp\QuickGraph.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

From cc5e41fa01340ff23263fa1c0fa64b271265d71b Mon Sep 17 00:00:00 2001
From: Eusebiu Marcu <marcueusebiu@gmail.com>
Date: Wed, 8 Dec 2010 00:12:34 +0200
Subject: [PATCH 2/3] Remove unused assembly reference Add GraphSharp to
 installer

---
 src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj | 4 ----
 src/Setup/Files.wxs                                      | 9 +++++++++
 src/Setup/Setup.wxs                                      | 3 +++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index 4eaa6576a6..8edd041726 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -66,10 +66,6 @@
       <HintPath>..\..\..\Libraries\GraphSharp\GraphSharp.Controls.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.Contracts">
-      <HintPath>..\..\..\Libraries\GraphSharp\Microsoft.Contracts.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index edb6ce57df..dd2bb38d04 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -183,6 +183,15 @@
 							<Component Id="log4netDll" Guid="0CE6ECAC-3C96-419E-9EA9-01F95C2C17BC" DiskId="1">
 								<File Source="..\..\bin\log4net.dll" Name="log4net.dll" Id="log4net.dll" Assembly=".net" AssemblyApplication="log4net.dll" AssemblyManifest="log4net.dll" KeyPath="yes" />
 							</Component>
+							<Component Id="GraphSharpDll" Guid="f0095de3-7fdb-4a63-961f-6b3b9f8a754f" DiskId="1">
+								<File Source="..\..\bin\GraphSharp.dll" Name="GraphSharp.dll" Id="GraphSharp.dll" Assembly=".net" AssemblyApplication="GraphSharp.dll" AssemblyManifest="GraphSharp.dll" KeyPath="yes" />
+							</Component>
+							<Component Id="GraphSharpControlsDll" Guid="8c7d8646-b2f4-4285-8880-5d86a1aea4f3" DiskId="1">
+								<File Source="..\..\bin\GraphSharp.Controls.dll" Name="GraphSharp.Controls.dll" Id="GraphSharp.Controls.dll" Assembly=".net" AssemblyApplication="GraphSharp.Controls.dll" AssemblyManifest="GraphSharp.Controls.dll" KeyPath="yes" />
+							</Component>
+							<Component Id="QuickGraphDll" Guid="f0893d49-6690-4cb7-ac7a-2931a8146134" DiskId="1">
+								<File Source="..\..\bin\QuickGraph.dll" Name="QuickGraph.dll" Id="QuickGraph.dll" Assembly=".net" AssemblyApplication="QuickGraph.dll" AssemblyManifest="QuickGraph.dll" KeyPath="yes" />
+							</Component>
 							<Component Id="MonoCecilDll" Guid="F714FD47-9E0A-488F-8F44-11C0220721E3" DiskId="1">
 								<File Source="..\..\bin\Mono.Cecil.dll" Id="Mono.Cecil.dll" Name="Mono.Cecil.dll" Assembly=".net" AssemblyApplication="Mono.Cecil.dll" AssemblyManifest="Mono.Cecil.dll" KeyPath="yes" />
 							</Component>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 80ee81ac9c..65c9894be0 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -197,6 +197,9 @@
 				<ComponentRef Id="ICSharpCodeSharpDevelopBuildWorker40Exe"/>
 				<ComponentRef Id="AgaControlsDll"/>
 				<ComponentRef Id="log4netDll"/>
+				<ComponentRef Id="GraphSharpDll"/>
+				<ComponentRef Id="GraphSharpControlsDll"/>
+				<ComponentRef Id="QuickGraphDll"/>
 				<ComponentRef Id="MonoCecilDll"/>
 				<ComponentRef Id="AvalonDockDll"/>
 				<ComponentRef Id="ICSharpCodeCorePresentationDll"/>

From dca04142c42c4f373c408fdb302b8de828d9a471 Mon Sep 17 00:00:00 2001
From: Eusebiu Marcu <marcueusebiu@gmail.com>
Date: Wed, 8 Dec 2010 00:35:52 +0200
Subject: [PATCH 3/3] add GraphSharp dependencies to setup

---
 src/Setup/Files.wxs | 9 +++++++++
 src/Setup/Setup.wxs | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index dd2bb38d04..ab81ec8ff5 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -192,6 +192,15 @@
 							<Component Id="QuickGraphDll" Guid="f0893d49-6690-4cb7-ac7a-2931a8146134" DiskId="1">
 								<File Source="..\..\bin\QuickGraph.dll" Name="QuickGraph.dll" Id="QuickGraph.dll" Assembly=".net" AssemblyApplication="QuickGraph.dll" AssemblyManifest="QuickGraph.dll" KeyPath="yes" />
 							</Component>
+							<Component Id="GraphSharpContractsDll" Guid="a0a8f6a4-3caa-4095-a9e2-fa25ce239b13" DiskId="1">
+								<File Source="..\..\bin\GraphSharp.Contracts.dll" Name="GraphSharp.Contracts.dll" Id="GraphSharp.Contracts.dll" Assembly=".net" AssemblyApplication="GraphSharp.Contracts.dll" AssemblyManifest="GraphSharp.Contracts.dll" KeyPath="yes" />
+							</Component>
+							<Component Id="MicrosoftContractsDll" Guid="fce77701-43d5-41a2-92fa-636050893a54" DiskId="1">
+								<File Source="..\..\bin\Microsoft.Contracts.dll" Name="Microsoft.Contracts.dll" Id="Microsoft.Contracts.dll" Assembly=".net" AssemblyApplication="Microsoft.Contracts.dll" AssemblyManifest="Microsoft.Contracts.dll" KeyPath="yes" />
+							</Component>
+							<Component Id="WPFExtensionsDll" Guid="932d7d54-773c-4132-ba0a-31f0d4590ee5" DiskId="1">
+								<File Source="..\..\bin\WPFExtensions.dll" Name="WPFExtensions.dll" Id="WPFExtensions.dll" Assembly=".net" AssemblyApplication="WPFExtensions.dll" AssemblyManifest="WPFExtensions.dll" KeyPath="yes" />
+							</Component>
 							<Component Id="MonoCecilDll" Guid="F714FD47-9E0A-488F-8F44-11C0220721E3" DiskId="1">
 								<File Source="..\..\bin\Mono.Cecil.dll" Id="Mono.Cecil.dll" Name="Mono.Cecil.dll" Assembly=".net" AssemblyApplication="Mono.Cecil.dll" AssemblyManifest="Mono.Cecil.dll" KeyPath="yes" />
 							</Component>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 65c9894be0..8a279c8d53 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -200,6 +200,9 @@
 				<ComponentRef Id="GraphSharpDll"/>
 				<ComponentRef Id="GraphSharpControlsDll"/>
 				<ComponentRef Id="QuickGraphDll"/>
+				<ComponentRef Id="GraphSharpContractsDll"/>
+				<ComponentRef Id="MicrosoftContractsDll"/>
+				<ComponentRef Id="WPFExtensionsDll"/>
 				<ComponentRef Id="MonoCecilDll"/>
 				<ComponentRef Id="AvalonDockDll"/>
 				<ComponentRef Id="ICSharpCodeCorePresentationDll"/>