Browse Source

Fix for missing Wpf Tk dll in SDR (best solution would be to have dll once in bin)

pull/607/head
Christoph Wille 12 years ago
parent
commit
422b655c94
  1. 3
      src/Setup/Files.wxs
  2. 1
      src/Setup/Setup.wxs

3
src/Setup/Files.wxs

@ -1310,6 +1310,9 @@
<Component Guid="3AA38468-F3F9-4F73-BF59-1DB0A1EBE96F" Id="PdfSharpDll" DiskId="1"> <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" /> <File Source="..\..\AddIns\Misc\SharpDevelopReporting\PdfSharp.dll" Name="PdfSharp.dll" Id="PdfSharp.dll" KeyPath="yes" />
</Component> </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>
<Directory Id="PackageManagement" Name="PackageManagement"> <Directory Id="PackageManagement" Name="PackageManagement">
<Component Id="NuGetCoreDll" Guid="AA347D26-712F-4BF7-BB74-517F6BFC563F" DiskId="1"> <Component Id="NuGetCoreDll" Guid="AA347D26-712F-4BF7-BB74-517F6BFC563F" DiskId="1">

1
src/Setup/Setup.wxs

@ -397,6 +397,7 @@
<ComponentRef Id="ICSharpCodeReportingDll"/> <ComponentRef Id="ICSharpCodeReportingDll"/>
<ComponentRef Id="IronyDll"/> <ComponentRef Id="IronyDll"/>
<ComponentRef Id="PdfSharpDll"/> <ComponentRef Id="PdfSharpDll"/>
<ComponentRef Id="SdrXceedWpfToolkitDll"/>
<ComponentRef Id="AboutNuGetCmdletsHelpTxt"/> <ComponentRef Id="AboutNuGetCmdletsHelpTxt"/>
<ComponentRef Id="NuGetConsoleTypesDll"/> <ComponentRef Id="NuGetConsoleTypesDll"/>

Loading…
Cancel
Save