Skip to content

Commit 1df1704

Browse files
Mighty-ProfessionalMighty-Professional
authored
Fix docking forms registry error on windows (AscensionGameDev#2161)
* Added fixed DockPanelSuite submodule * Removed reference to DockPanelSuite nugget, and added dependency on locally built version * Redoing last commit because it didnt go through * Swapped to intersect DockPanelSuite * Updated DockPanelSuite
1 parent e6e7a46 commit 1df1704

File tree

4 files changed

+35
-23
lines changed

4 files changed

+35
-23
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "vendor/LiteNetLib"]
22
path = vendor/LiteNetLib
33
url = https://github.com/AscensionGameDev/LiteNetLib.git
4+
[submodule "vendor/dockpanelsuite"]
5+
path = vendor/dockpanelsuite
6+
url = https://github.com/AscensionGameDev/dockpanelsuite.git

‎Intersect.Editor/Intersect.Editor.csproj‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@
6767
</ItemGroup>
6868

6969
<ItemGroup>
70-
<PackageReference Include="DockPanelSuite" Version="3.1.0" />
71-
<PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" />
7270
<PackageReference Include="Mono.Data.Sqlite.Portable" Version="1.0.3.5" />
7371
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
7472
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
@@ -79,6 +77,9 @@
7977
<ItemGroup>
8078
<ProjectReference Include="..\Intersect (Core)\Intersect.Core.csproj" />
8179
<ProjectReference Include="..\Intersect.Network\Intersect.Network.csproj" />
80+
<ProjectReference Include="..\vendor\dockpanelsuite\WinFormsUI\ThemeVS2015.csproj" />
81+
<ProjectReference Include="..\vendor\dockpanelsuite\WinFormsUI\WinFormsUI.csproj" />
82+
<ProjectReference Include="..\vendor\LiteNetLib\LiteNetLib\LiteNetLib.csproj" />
8283
</ItemGroup>
8384

8485
<ItemGroup Label="Form Compile Updates">
@@ -180,33 +181,23 @@
180181
<Compile Update="Forms\Controls\MapTreeList.Designer.cs">
181182
<DependentUpon>MapTreeList.cs</DependentUpon>
182183
</Compile>
183-
<Compile Update="Forms\DockingElements\frmMapEditor.cs">
184-
<SubType>Form</SubType>
185-
</Compile>
184+
<Compile Update="Forms\DockingElements\frmMapEditor.cs" />
186185
<Compile Update="Forms\DockingElements\frmMapEditor.Designer.cs">
187186
<DependentUpon>frmMapEditor.cs</DependentUpon>
188187
</Compile>
189-
<Compile Update="Forms\DockingElements\frmMapGrid.cs">
190-
<SubType>Form</SubType>
191-
</Compile>
188+
<Compile Update="Forms\DockingElements\frmMapGrid.cs" />
192189
<Compile Update="Forms\DockingElements\frmMapGrid.Designer.cs">
193190
<DependentUpon>frmMapGrid.cs</DependentUpon>
194191
</Compile>
195-
<Compile Update="Forms\DockingElements\frmMapLayers.cs">
196-
<SubType>Form</SubType>
197-
</Compile>
192+
<Compile Update="Forms\DockingElements\frmMapLayers.cs" />
198193
<Compile Update="Forms\DockingElements\frmMapLayers.Designer.cs">
199194
<DependentUpon>frmMapLayers.cs</DependentUpon>
200195
</Compile>
201-
<Compile Update="Forms\DockingElements\frmMapList.cs">
202-
<SubType>Form</SubType>
203-
</Compile>
196+
<Compile Update="Forms\DockingElements\frmMapList.cs" />
204197
<Compile Update="Forms\DockingElements\frmMapList.Designer.cs">
205198
<DependentUpon>frmMapList.cs</DependentUpon>
206199
</Compile>
207-
<Compile Update="Forms\DockingElements\frmMapProperties.cs">
208-
<SubType>Form</SubType>
209-
</Compile>
200+
<Compile Update="Forms\DockingElements\frmMapProperties.cs" />
210201
<Compile Update="Forms\DockingElements\frmMapProperties.Designer.cs">
211202
<DependentUpon>frmMapProperties.cs</DependentUpon>
212203
</Compile>

‎Intersect.sln‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
43
VisualStudioVersion = 17.1.32228.430
@@ -59,18 +58,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{91D46B09
5958
EndProject
6059
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{31380BF9-EC1C-4ABE-8A1A-A715B6DF024A}"
6160
EndProject
62-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiteNetLib", "vendor\LiteNetLib\LiteNetLib\LiteNetLib.csproj", "{03C1FB5D-DFB0-414D-831F-BD14DEE49B6A}"
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiteNetLib", "vendor\LiteNetLib\LiteNetLib\LiteNetLib.csproj", "{03C1FB5D-DFB0-414D-831F-BD14DEE49B6A}"
6362
EndProject
6463
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{D89EF539-3EC6-4D07-9E98-65BC55F1DAA4}"
6564
ProjectSection(SolutionItems) = preProject
6665
Utilities\Directory.Build.props = Utilities\Directory.Build.props
6766
EndProjectSection
6867
EndProject
69-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intersect.OpenPortChecker", "Utilities\Intersect.OpenPortChecker\Intersect.OpenPortChecker.csproj", "{8BA9007B-9707-46F3-9836-F93C99F8C0C7}"
68+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intersect.OpenPortChecker", "Utilities\Intersect.OpenPortChecker\Intersect.OpenPortChecker.csproj", "{8BA9007B-9707-46F3-9836-F93C99F8C0C7}"
7069
EndProject
71-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intersect.Server.Core", "Intersect.Server.Core\Intersect.Server.Core.csproj", "{C62BA88C-C3D8-476B-87CA-3D968B82E19B}"
70+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intersect.Server.Core", "Intersect.Server.Core\Intersect.Server.Core.csproj", "{C62BA88C-C3D8-476B-87CA-3D968B82E19B}"
7271
EndProject
73-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intersect.SinglePlayer", "Intersect.SinglePlayer\Intersect.SinglePlayer.csproj", "{999025E8-C034-4A91-8166-5C2D95E9C9C3}"
72+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intersect.SinglePlayer", "Intersect.SinglePlayer\Intersect.SinglePlayer.csproj", "{999025E8-C034-4A91-8166-5C2D95E9C9C3}"
7473
EndProject
7574
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Single Player", "Single Player", "{F990372C-0580-4D69-89DC-A46A86396BBD}"
7675
EndProject
@@ -79,7 +78,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{
7978
Framework\Directory.Build.props = Framework\Directory.Build.props
8079
EndProjectSection
8180
EndProject
82-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intersect.Framework", "Framework\Intersect.Framework\Intersect.Framework.csproj", "{1E87D2A5-7E36-4583-A533-064C97E330EE}"
81+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intersect.Framework", "Framework\Intersect.Framework\Intersect.Framework.csproj", "{1E87D2A5-7E36-4583-A533-064C97E330EE}"
82+
EndProject
83+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormsUI", "vendor\dockpanelsuite\WinFormsUI\WinFormsUI.csproj", "{D831728A-6328-4F96-9692-8FE64E0B0AAD}"
84+
EndProject
85+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThemeVS2015", "vendor\dockpanelsuite\WinFormsUI\ThemeVS2015.csproj", "{B9678B78-A00D-4765-9380-B1DC4EFD642D}"
8386
EndProject
8487
Global
8588
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -178,6 +181,18 @@ Global
178181
{1E87D2A5-7E36-4583-A533-064C97E330EE}.NoFody|Any CPU.Build.0 = Debug|Any CPU
179182
{1E87D2A5-7E36-4583-A533-064C97E330EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
180183
{1E87D2A5-7E36-4583-A533-064C97E330EE}.Release|Any CPU.Build.0 = Release|Any CPU
184+
{D831728A-6328-4F96-9692-8FE64E0B0AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
185+
{D831728A-6328-4F96-9692-8FE64E0B0AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
186+
{D831728A-6328-4F96-9692-8FE64E0B0AAD}.NoFody|Any CPU.ActiveCfg = Debug|Any CPU
187+
{D831728A-6328-4F96-9692-8FE64E0B0AAD}.NoFody|Any CPU.Build.0 = Debug|Any CPU
188+
{D831728A-6328-4F96-9692-8FE64E0B0AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
189+
{D831728A-6328-4F96-9692-8FE64E0B0AAD}.Release|Any CPU.Build.0 = Release|Any CPU
190+
{B9678B78-A00D-4765-9380-B1DC4EFD642D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
191+
{B9678B78-A00D-4765-9380-B1DC4EFD642D}.Debug|Any CPU.Build.0 = Debug|Any CPU
192+
{B9678B78-A00D-4765-9380-B1DC4EFD642D}.NoFody|Any CPU.ActiveCfg = Debug|Any CPU
193+
{B9678B78-A00D-4765-9380-B1DC4EFD642D}.NoFody|Any CPU.Build.0 = Debug|Any CPU
194+
{B9678B78-A00D-4765-9380-B1DC4EFD642D}.Release|Any CPU.ActiveCfg = Release|Any CPU
195+
{B9678B78-A00D-4765-9380-B1DC4EFD642D}.Release|Any CPU.Build.0 = Release|Any CPU
181196
EndGlobalSection
182197
GlobalSection(SolutionProperties) = preSolution
183198
HideSolutionNode = FALSE
@@ -194,6 +209,8 @@ Global
194209
{8BA9007B-9707-46F3-9836-F93C99F8C0C7} = {D89EF539-3EC6-4D07-9E98-65BC55F1DAA4}
195210
{999025E8-C034-4A91-8166-5C2D95E9C9C3} = {F990372C-0580-4D69-89DC-A46A86396BBD}
196211
{1E87D2A5-7E36-4583-A533-064C97E330EE} = {1ABC3725-EB8C-494E-8BA8-A991CE7BD7A1}
212+
{D831728A-6328-4F96-9692-8FE64E0B0AAD} = {31380BF9-EC1C-4ABE-8A1A-A715B6DF024A}
213+
{B9678B78-A00D-4765-9380-B1DC4EFD642D} = {31380BF9-EC1C-4ABE-8A1A-A715B6DF024A}
197214
EndGlobalSection
198215
GlobalSection(ExtensibilityGlobals) = postSolution
199216
SolutionGuid = {06095334-0BBD-4FDA-A230-272D08AFB221}

‎vendor/dockpanelsuite‎

Submodule dockpanelsuite added at b881680

0 commit comments

Comments
 (0)