Fixed setup.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3488 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Setup/Files.wxs

@@ -207,9 +207,6 @@
 							<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>
-							<Component Id="WeifenLuoWinFormsUIDockingDll" Guid="AB160125-2828-434E-8810-BE642A77B0E5" DiskId="1">
-								<File Source="..\..\bin\WeifenLuo.WinFormsUI.Docking.dll" Id="WeifenLuo.WinFormsUI.Docking.dll" Name="WeifenLuo.WinFormsUI.Docking.dll" Assembly=".net" AssemblyApplication="WeifenLuo.WinFormsUI.Docking.dll" AssemblyManifest="WeifenLuo.WinFormsUI.Docking.dll" KeyPath="yes" />
-							</Component>
 							<Directory Id="ToolsFolder" Name="Tools">
 								<Directory Id="ComponentInspectorFolder" Name="ComponentInspector">
 									<Component Guid="E4175768-82FD-45F4-8E7D-BB4031E97454" Id="ComponentInspectorCoreDll" DiskId="1">
@@ -703,6 +700,12 @@
 							<Component Guid="2EC34D8A-CF14-4E1F-A512-9A596A1C256D" Id="ICSharpCodeCoreWinFormsDll" DiskId="1">
 								<File Source="..\..\bin\ICSharpCode.Core.WinForms.dll" Name="ICSharpCode.Core.WinForms.dll" Id="ICSharpCode.Core.WinForms.dll" KeyPath="yes" />
 							</Component>
+							<Component Guid="A124FA3C-F094-4FC2-88BA-D253DB319DC2" Id="AvalonDockDll" DiskId="1">
+								<File Source="..\..\bin\AvalonDock.dll" Name="AvalonDock.dll" Id="AvalonDock.dll" KeyPath="yes" />
+							</Component>
+							<Component Guid="C54C86B8-EB49-473F-B7BD-639B71226E9E" Id="ICSharpCodeCorePresentationDll" DiskId="1">
+								<File Source="..\..\bin\ICSharpCode.Core.Presentation.dll" Name="ICSharpCode.Core.Presentation.dll" Id="ICSharpCode.Core.Presentation.dll" KeyPath="yes" />
+							</Component>
 						</Directory>
 						<Directory Id="DocFolder" Name="doc">
 							<Component Guid="9DCED5AC-B771-4A4F-B4FE-69867BF2EBDE" Id="SharpDevelopDocFiles" DiskId="1">

src/Setup/Setup.wxs

@@ -170,7 +170,8 @@
 				<ComponentRef Id="AgaControlsDll"/>
 				<ComponentRef Id="log4netDll"/>
 				<ComponentRef Id="MonoCecilDll"/>
-				<ComponentRef Id="WeifenLuoWinFormsUIDockingDll"/>
+				<ComponentRef Id="AvalonDockDll"/>
+				<ComponentRef Id="ICSharpCodeCorePresentationDll"/>
 				<ComponentRef Id="SharpDevelopTechNoteFiles"/>
 				<ComponentRef Id="ComponentInspectorExe"/>
 				<ComponentRef Id="ComponentInspectorCoreDll"/>