Remove the unneeded dock dependency in the layer editor project. Add …

…a line in the installer to delete the library if it exists on installs.
sall · Aug 20, 2016 · d6e3d4f · d6e3d4f
1 parent a4100ab
commit d6e3d4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi
@@ -273,10 +273,12 @@ Section "Application" SEC01
   Delete "$INSTDIR\Modules\EffectEditor\ChaseEffectEditor.dll"
   Delete "$INSTDIR\Modules\EffectEditor\WipeEditor.dll"
   Delete "$INSTDIR\Modules\Editor\VixenModules.Editor.EffectEditor.dll"
+  Delete "$INSTDIR\Modules\Editor\WeifenLuo.WinFormsUI.Docking.dll"
   Delete "$INSTDIR\Modules\Editor\ScriptEditor.dll"
   Delete "$INSTDIR\Modules\Script\CSharp.dll"
   Delete "$INSTDIR\Modules\Script\VB.dll"
   Delete "$INSTDIR\Modules\App\VirtualEffect.dll"
+
 
   ; only overwrite these if this installer has a newer version
   SetOverwrite ifnewer

diff --git a/Modules/Editor/LayerEditor/LayerEditor.csproj b/Modules/Editor/LayerEditor/LayerEditor.csproj
@@ -45,9 +45,6 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking">
-      <HintPath>..\..\..\packages\DockPanelSuite.2.9.0.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />