Use GitExtensions.Extensibility 1.0

gitextensions · Dec 7, 2023 · a2aff39 · RussKie · Dec 7, 2023 · maraf
1 parent 0b54bcb
commit a2aff39
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 30 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="local" value="D:\Development\gitextensions\Externals\GitExtensions.Extensibility\artifacts\Release\publish\" />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
diff --git a/Packages.props b/Packages.props
@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Update="GitExtensions.Extensibility" Version="0.3.*" />
+    <PackageReference Update="GitExtensions.Extensibility" Version="1.0.*" />
     <PackageReference Update="Neptuo" Version="6.0.2" />
     <PackageReference Update="Neptuo.Exceptions" Version="1.2.2" />
     <PackageReference Update="Neptuo.Observables" Version="2.1.1" />

diff --git a/src/GitExtensions.PluginManager/ArgsFix.cs b/src/GitExtensions.PluginManager/ArgsFix.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Neptuo
+namespace Neptuo
 {
     public interface ICloneable<T>
     {

diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj
@@ -27,18 +27,6 @@
     <Compile Include="..\PackageManager.UI\Args.cs" Link="Args.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="GitUI">
-      <HintPath>$(GitExtensionsPath)\GitUI.dll</HintPath>
-    </Reference>
-    <Reference Include="GitUIPluginInterfaces">
-      <HintPath>$(GitExtensionsPath)\GitUIPluginInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="ResourceManager">
-      <HintPath>$(GitExtensionsPath)\ResourceManager.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PackageManager.UI\PackageManager.UI.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>

diff --git a/src/GitExtensions.PluginManager/Plugin.cs b/src/GitExtensions.PluginManager/Plugin.cs
@@ -1,7 +1,8 @@
-using GitExtensions.PluginManager.Properties;
-using GitUIPluginInterfaces;
+using GitExtensions.Extensibility.Git;
+using GitExtensions.Extensibility.Plugins;
+using GitExtensions.Extensibility.Settings;
+using GitExtensions.PluginManager.Properties;
 using PackageManager;
-using ResourceManager;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -46,7 +47,9 @@ public override IEnumerable<ISetting> GetSettings()
         public override bool Execute(GitUIEventArgs gitUiCommands)
         {
             string basePath = AppDomain.CurrentDomain.BaseDirectory;
-            string pluginsPath = ManagedExtensibility.UserPluginsPath;
+
+            // TODO: how to provide this?
+            string pluginsPath = ""; // ManagedExtensibility.UserPluginsPath;
 
             Args args = new Args();
             args.Path = pluginsPath;

diff --git a/src/GitExtensions.PluginManager/PluginSettings.cs b/src/GitExtensions.PluginManager/PluginSettings.cs
@@ -1,11 +1,7 @@
-using GitUIPluginInterfaces;
-using GitUIPluginInterfaces.Settings;
+using GitExtensions.Extensibility.Settings;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GitExtensions.PluginManager
 {

diff --git a/src/PackageManager.UI/Args.cs b/src/PackageManager.UI/Args.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace PackageManager
 {