Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit f2568c1

Browse files
committed
Fix ReflectionTypeLoadException in WPF designer.
The Xceed.Wpf.Toolkit.dll file needed by the WPF designer was not included in the installer.
1 parent dd292ff commit f2568c1

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

src/Setup/Files.wxs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,6 +1342,9 @@
13421342
<Component Guid="E89BBA3D-D267-4E4F-8DA7-E38E864C4317" Id="WpfDesignAddin" DiskId="1">
13431343
<File Source="..\..\AddIns\DisplayBindings\WpfDesign\WpfDesign.addin" Name="WpfDesign.addin" Id="WpfDesign.addin" KeyPath="yes" />
13441344
</Component>
1345+
<Component Id="XceedWpfToolkitDll" Guid="21814C24-5CB8-4BBD-BAA7-2AEBD4CBF25D" DiskId="1">
1346+
<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" />
1347+
</Component>
13451348
</Directory>
13461349
<Directory Id="Data" Name="Data">
13471350
<Component Guid="16E65D48-658D-4C6B-BCCB-9B5450727CFD" Id="ICSharpCodeDataAddin" DiskId="1">

src/Setup/Setup.wxs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@
436436
<ComponentRef Id="ICSharpCodeWpfDesignDll"/>
437437
<ComponentRef Id="ICSharpCodeWpfDesignXamlDomDll"/>
438438
<ComponentRef Id="WpfDesignAddin"/>
439+
<ComponentRef Id="XceedWpfToolkitDll"/>
439440

440441
<ComponentRef Id="ICSharpCodeDataAddin"/>
441442
<ComponentRef Id="ICSharpCodeDataAddinDll"/>

0 commit comments

Comments
 (0)