Fix ReflectionTypeLoadException in WPF designer.

The Xceed.Wpf.Toolkit.dll file needed by the WPF designer was not included in the installer.
11 years ago · f2568c1f82
2 changed files with 4 additions and 0 deletions
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@ -1342,6 +1342,9 @@
				@@ -1342,6 +1342,9 @@
 									<Component Guid="E89BBA3D-D267-4E4F-8DA7-E38E864C4317" Id="WpfDesignAddin" DiskId="1">
 										<File Source="..\..\AddIns\DisplayBindings\WpfDesign\WpfDesign.addin" Name="WpfDesign.addin" Id="WpfDesign.addin" KeyPath="yes" />
 									</Component>
+									<Component Id="XceedWpfToolkitDll" Guid="21814C24-5CB8-4BBD-BAA7-2AEBD4CBF25D" DiskId="1">
+										<File Id="Xceed.Wpf.Toolkit.dll" Name="Xceed.Wpf.Toolkit.dll" Source="..\..\AddIns\DisplayBindings\WpfDesign\Xceed.Wpf.Toolkit.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Xceed.Wpf.Toolkit.dll" AssemblyManifest="Xceed.Wpf.Toolkit.dll" />
+									</Component>
 								</Directory>
 								<Directory Id="Data" Name="Data">
 									<Component Guid="16E65D48-658D-4C6B-BCCB-9B5450727CFD" Id="ICSharpCodeDataAddin" DiskId="1">
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@ -436,6 +436,7 @@
				@@ -436,6 +436,7 @@
 				<ComponentRef Id="ICSharpCodeWpfDesignDll"/>
 				<ComponentRef Id="ICSharpCodeWpfDesignXamlDomDll"/>
 				<ComponentRef Id="WpfDesignAddin"/>
+				<ComponentRef Id="XceedWpfToolkitDll"/>
 				
 				<ComponentRef Id="ICSharpCodeDataAddin"/>
 				<ComponentRef Id="ICSharpCodeDataAddinDll"/>