Fixed UI packages still being on 6.0.0 RDMP dependency

HicServices · Oct 18, 2021 · e8b0445 · e8b0445
1 parent f8eb304
commit e8b0445
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/DrsPlugin/DrsPlugin.csproj b/DrsPlugin/DrsPlugin.csproj
@@ -13,7 +13,7 @@
     <Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin" Version="6.0.0" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.0" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="SharpZipLib" Version="1.1.0" />
   </ItemGroup>

diff --git a/GoDartsPlugin/GoDartsPlugin.csproj b/GoDartsPlugin/GoDartsPlugin.csproj
@@ -58,6 +58,6 @@
     <Folder Include="Commands\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin" Version="6.0.0" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.0" />
   </ItemGroup>
 </Project>
diff --git a/GoDartsPluginUI/CommandExecution/GoDartsPluginMenu.cs b/GoDartsPluginUI/CommandExecution/GoDartsPluginMenu.cs
@@ -1,8 +1,9 @@
 using GoDartsPluginUI.CommandExecution.AtomicCommands;
+using Rdmp.Core;
+using Rdmp.Core.CommandExecution.AtomicCommands;
 using Rdmp.Core.Providers.Nodes;
 using Rdmp.UI.ItemActivation;
-using Rdmp.UI.PluginChildProvision;
-using System.Windows.Forms;
+using System.Collections.Generic;
 
 namespace GoDartsPluginUI.CommandExecution
 {
@@ -12,13 +13,17 @@ public GoDartsPluginMenu(IActivateItems itemActivator) : base(itemActivator)
         {
         }
 
-        public override ToolStripMenuItem[] GetAdditionalRightClickMenuItems(object o)
+        public override IEnumerable<IAtomicCommand> GetAdditionalRightClickMenuItems(object o)
         {
             var serverNode = o as AllServersNode;
             if (serverNode == null)
                 return null;
 
-            return GetMenuArray(new ExecuteCommandSetupGoFusionFromDatabase(ItemActivator));
+            if(BasicActivator is IActivateItems a)
+            {
+                return new[] { new ExecuteCommandSetupGoFusionFromDatabase(a) };
+            }
+            return base.GetAdditionalRightClickMenuItems(o);
         }
     }
 }
diff --git a/GoDartsPluginUI/GoDartsPluginUI.csproj b/GoDartsPluginUI/GoDartsPluginUI.csproj
@@ -12,7 +12,8 @@
     <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin" Version="6.0.0" />
-    <PackageReference Include="HIC.RDMP.Plugin.UI" Version="6.0.0" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.0" />
+    <PackageReference Include="HIC.RDMP.Plugin.UI" Version="7.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.7.21377.19" />
   </ItemGroup>
 </Project>
diff --git a/HICPluginInteractive/HICPluginInteractive.csproj b/HICPluginInteractive/HICPluginInteractive.csproj
@@ -11,8 +11,9 @@
     <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin" Version="6.0.0" />
-    <PackageReference Include="HIC.RDMP.Plugin.UI" Version="6.0.0" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.0" />
+    <PackageReference Include="HIC.RDMP.Plugin.UI" Version="7.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.7.21377.19" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="UIComponents\ExtractDataTableViewer.cs" />

diff --git a/HICPluginTests/HICPluginTests.csproj b/HICPluginTests/HICPluginTests.csproj
@@ -14,7 +14,7 @@
     <None Remove="TestData\report-with-multiple-descriptions.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin.Test" Version="6.0.0" />
+    <PackageReference Include="HIC.RDMP.Plugin.Test" Version="7.0.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="2.1.36" />
     <PackageReference Include="RhinoMocks" Version="3.6.1" />