From 422b655c94cc18fdad0ac9b52c1002bde9215492 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Wed, 3 Dec 2014 09:18:53 +0100
Subject: [PATCH] Fix for missing Wpf Tk dll in SDR (best solution would be to
 have dll once in bin)

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

diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 9132581428..966cabdc25 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -1310,6 +1310,9 @@
 									<Component Guid="3AA38468-F3F9-4F73-BF59-1DB0A1EBE96F" Id="PdfSharpDll" DiskId="1">
 										<File Source="..\..\AddIns\Misc\SharpDevelopReporting\PdfSharp.dll" Name="PdfSharp.dll" Id="PdfSharp.dll" KeyPath="yes" />
 									</Component>
+									<Component Id="SdrXceedWpfToolkitDll" Guid="D844FC03-053A-4897-BD74-0FDDE7D82F80" DiskId="1">
+										<File Id="Sdr.Xceed.Wpf.Toolkit.dll" Name="Xceed.Wpf.Toolkit.dll" Source="..\..\AddIns\Misc\SharpDevelopReporting\Xceed.Wpf.Toolkit.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Xceed.Wpf.Toolkit.dll" AssemblyManifest="Xceed.Wpf.Toolkit.dll" />
+									</Component>
 								</Directory>
 								<Directory Id="PackageManagement" Name="PackageManagement">
 									<Component Id="NuGetCoreDll" Guid="AA347D26-712F-4BF7-BB74-517F6BFC563F" DiskId="1">
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 6135e85b2a..01e4f12b68 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -397,6 +397,7 @@
 				<ComponentRef Id="ICSharpCodeReportingDll"/>
 				<ComponentRef Id="IronyDll"/>
 				<ComponentRef Id="PdfSharpDll"/>
+				<ComponentRef Id="SdrXceedWpfToolkitDll"/>
 			
 				<ComponentRef Id="AboutNuGetCmdletsHelpTxt"/>
 				<ComponentRef Id="NuGetConsoleTypesDll"/>