Updates for updated docking library, Reverted to v3.0.6 for now due t…

…o build service issues.
xteen16 · Nov 22, 2021 · 37b65b1 · 37b65b1
1 parent 2cac886
commit 37b65b1
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 36 deletions.
diff --git a/SuperPutty/SuperPutty.csproj b/SuperPutty/SuperPutty.csproj
@@ -81,43 +81,52 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.3.1.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
-    </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2005, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.ThemeVS2005.3.1.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2005.dll</HintPath>
+    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+      <HintPath>..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AboutBox1.cs" />
+    <Compile Include="AboutBox1.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="AboutBox1.Designer.cs">
       <DependentUpon>AboutBox1.cs</DependentUpon>
     </Compile>
     <Compile Include="Data\HistoryEntry.cs" />
     <Compile Include="Data\KeyboardShortcut.cs" />
-    <Compile Include="dlgScriptEditor.cs" />
+    <Compile Include="dlgScriptEditor.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgScriptEditor.Designer.cs">
       <DependentUpon>dlgScriptEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="GitRelease.cs" />
     <Compile Include="Gui\BaseViewModel.cs" />
     <Compile Include="Gui\DataGridViewProgressColumn.cs" />
     <Compile Include="Gui\DpiUtils.cs" />
-    <Compile Include="Gui\ImageListPopup.cs" />
+    <Compile Include="Gui\ImageListPopup.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Gui\ImageListPopup.designer.cs">
       <DependentUpon>ImageListPopup.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmDocumentSelector.cs" />
+    <Compile Include="frmDocumentSelector.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmDocumentSelector.Designer.cs">
       <DependentUpon>frmDocumentSelector.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\KeyboardShortcutEditor.cs" />
+    <Compile Include="Gui\KeyboardShortcutEditor.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Gui\KeyboardShortcutEditor.Designer.cs">
       <DependentUpon>KeyboardShortcutEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="Gui\ListViewExtensions.cs" />
-    <Compile Include="Gui\QuickSelector.cs" />
+    <Compile Include="Gui\QuickSelector.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Gui\QuickSelector.Designer.cs">
       <DependentUpon>QuickSelector.cs</DependentUpon>
     </Compile>
@@ -134,19 +143,25 @@
     <Compile Include="Scp\BrowserCommon.cs" />
     <Compile Include="Scp\BrowserViewModel.cs" />
     <Compile Include="Scp\BrowserPresenter.cs" />
-    <Compile Include="Scp\BrowserView.cs" />
+    <Compile Include="Scp\BrowserView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Scp\BrowserView.Designer.cs">
       <DependentUpon>BrowserView.cs</DependentUpon>
     </Compile>
     <Compile Include="Scp\FileTransfer.cs" />
     <Compile Include="Scp\FileTransferPresenter.cs" />
-    <Compile Include="Scp\FileTransferView.cs" />
+    <Compile Include="Scp\FileTransferView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Scp\FileTransferView.Designer.cs">
       <DependentUpon>FileTransferView.cs</DependentUpon>
     </Compile>
     <Compile Include="Scp\FileTransferViewModel.cs" />
     <Compile Include="Scp\LocalBrowserModel.cs" />
-    <Compile Include="Scp\PscpBrowserPanel.cs" />
+    <Compile Include="Scp\PscpBrowserPanel.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Scp\PscpBrowserPanel.Designer.cs">
       <DependentUpon>PscpBrowserPanel.cs</DependentUpon>
     </Compile>
@@ -159,44 +174,62 @@
     <Compile Include="Scripting\SendLineCommand.cs" />
     <Compile Include="Scripting\SleepCommand.cs" />
     <Compile Include="Scripting\Spsl.cs" />
-    <Compile Include="SessionDetail.cs" />
+    <Compile Include="SessionDetail.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="SessionDetail.Designer.cs">
       <DependentUpon>SessionDetail.cs</DependentUpon>
     </Compile>
-    <Compile Include="ToolWindowEx.cs" />
+    <Compile Include="ToolWindowEx.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="ToolWindowEx.Designer.cs">
       <DependentUpon>ToolWindowEx.cs</DependentUpon>
     </Compile>
     <Compile Include="Utils\ChildWindowFocusHelper.cs" />
     <Compile Include="Utils\CommandData.cs" />
     <Compile Include="Utils\CygtermStartInfo.cs" />
-    <Compile Include="ctlApplicationPanel.cs" />
+    <Compile Include="ctlApplicationPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Data\LayoutData.cs" />
     <Compile Include="Data\PuttyDataHelper.cs" />
     <Compile Include="Data\RDPDataHelper.cs" />
     <Compile Include="Data\SessionData.cs" />
     <Compile Include="Data\SessionDataStartInfo.cs" />
-    <Compile Include="DebugLogViewer.cs" />
+    <Compile Include="DebugLogViewer.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="DebugLogViewer.Designer.cs">
       <DependentUpon>DebugLogViewer.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgMouseFeedback.cs" />
+    <Compile Include="dlgMouseFeedback.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgMouseFeedback.Designer.cs">
       <DependentUpon>dlgMouseFeedback.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\dlgRenameItem.cs" />
+    <Compile Include="Gui\dlgRenameItem.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Gui\dlgRenameItem.Designer.cs">
       <DependentUpon>dlgRenameItem.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmTransferStatus.cs" />
+    <Compile Include="frmTransferStatus.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmTransferStatus.Designer.cs">
       <DependentUpon>frmTransferStatus.cs</DependentUpon>
     </Compile>
-    <Compile Include="LayoutsList.cs" />
+    <Compile Include="LayoutsList.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="LayoutsList.Designer.cs">
       <DependentUpon>LayoutsList.cs</DependentUpon>
     </Compile>
-    <Compile Include="Log4netDebugLogForm.cs" />
+    <Compile Include="Log4netDebugLogForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Log4netDebugLogForm.Designer.cs">
       <DependentUpon>Log4netDebugLogForm.cs</DependentUpon>
     </Compile>
@@ -206,23 +239,33 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="RemoteFileListPanel.cs" />
+    <Compile Include="RemoteFileListPanel.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="RemoteFileListPanel.Designer.cs">
       <DependentUpon>RemoteFileListPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgFindPutty.cs" />
+    <Compile Include="dlgFindPutty.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgFindPutty.Designer.cs">
       <DependentUpon>dlgFindPutty.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgLogin.cs" />
+    <Compile Include="dlgLogin.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgLogin.Designer.cs">
       <DependentUpon>dlgLogin.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmSuperPutty.cs" />
+    <Compile Include="frmSuperPutty.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmSuperPutty.Designer.cs">
       <DependentUpon>frmSuperPutty.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgEditSession.cs" />
+    <Compile Include="dlgEditSession.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgEditSession.Designer.cs">
       <DependentUpon>dlgEditSession.cs</DependentUpon>
     </Compile>
@@ -350,16 +393,22 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="PscpTransfer.cs" />
-    <Compile Include="SessionTreeview.cs" />
+    <Compile Include="SessionTreeview.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="SessionTreeview.Designer.cs">
       <DependentUpon>SessionTreeview.cs</DependentUpon>
     </Compile>
-    <Compile Include="ctlPuttyPanel.cs" />
+    <Compile Include="ctlPuttyPanel.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="ctlPuttyPanel.Designer.cs">
       <DependentUpon>ctlPuttyPanel.cs</DependentUpon>
     </Compile>
     <Compile Include="SuperPuTTY.cs" />
-    <Compile Include="ToolWindow.cs" />
+    <Compile Include="ToolWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="ToolWindow.Designer.cs">
       <DependentUpon>ToolWindow.cs</DependentUpon>
     </Compile>

diff --git a/SuperPutty/packages.config b/SuperPutty/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DockPanelSuite" version="3.1.0" targetFramework="net45" />
-  <package id="DockPanelSuite.ThemeVS2005" version="3.1.0" targetFramework="net45" />
+  <package id="DockPanelSuite" version="3.0.6" targetFramework="net45" />
   <package id="log4net" version="2.0.13" targetFramework="net45" />
 </packages>
diff --git a/SuperPuttyUnitTests/SuperPuttyUnitTests.csproj b/SuperPuttyUnitTests/SuperPuttyUnitTests.csproj
@@ -78,8 +78,8 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.3.1.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+      <HintPath>..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/SuperPuttyUnitTests/packages.config b/SuperPuttyUnitTests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DockPanelSuite" version="3.1.0" targetFramework="net45" />
+  <package id="DockPanelSuite" version="3.0.6" targetFramework="net45" />
   <package id="log4net" version="2.0.13" targetFramework="net45" />
 </packages>