Update to GitExtensions v5.0

+ GitHub Actions: Update .net version to 8

Author: pmiossec

.github/workflows/build_plugin.yml

@@ -18,10 +18,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Setup .net6
+    - name: Setup .net8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.401
+        dotnet-version: 8.0.401
 
     - name: Build & package with `dotnet`
       run: |

.github/workflows/release_plugin.yml

@@ -29,10 +29,10 @@ jobs:
         files: 'src/${{ github.event.repository.name }}/${{ github.event.repository.name }}.csproj'
         replacements: '<VersionPrefix>0.0.0</VersionPrefix>=<VersionPrefix>${{ steps.extract_version.outputs.version }}</VersionPrefix>'
 
-    - name: Setup .net6
+    - name: Setup .net8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.401
+        dotnet-version: 8.0.401
 
     - name: Build & package with `dotnet`
       run: |

.gitignore

@@ -328,11 +328,10 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
-
-references/
-
-# Git Extensions specific files
-GitExtensions.settings.backup
-
-[Gg]itextensions.[Ss]hared/GitExtensions/*
-[Gg]itextensions.[Ss]hared/GitExtensions-*.zip
+
+references/
+
+# Git Extensions specific files
+GitExtensions.settings.backup
+
+[Gg]it[Ee]xtensions.[Ss]hared/*

Gitextensions.AzureDevOpsCommitMessageTests/Gitextensions.AzureDevOpsCommitMessageTests.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -27,8 +27,12 @@
 
   <ItemGroup>
     <Reference Include="ResourceManager">
-      <HintPath>..\..\gitextensions.shared\ResourceManager.dll</HintPath>
+      <HintPath>..\gitextensions.shared\ResourceManager.dll</HintPath>
     </Reference>
+    <Reference Include="GitExtensions.Extensibility">
+      <HintPath>..\gitextensions.shared\GitExtensions.Extensibility.dll</HintPath>
+    </Reference>
+
   </ItemGroup>
 
 </Project>

src/GitExtensions.AzureDevOpsCommitMessage/GitExtensions.AzureDevOpsCommitMessage.csproj

@@ -1,12 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <!--Value useless because will be overwritten by release GitHub action. Keep '0.0.0' so that the release process work well!-->
     <VersionPrefix>0.0.0</VersionPrefix>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <UseWindowsForms>true</UseWindowsForms>
+    <!-- Source: 'GitHub' or 'AppVeyor' -->
+    <!--<GitExtensionsReferenceSource Condition="$(GitExtensionsReferenceSource) == ''">AppVeyor</GitExtensionsReferenceSource>-->
+    <!-- Version: 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
+    <!--<GitExtensionsReferenceVersion>v5.1.0.17907</GitExtensionsReferenceVersion>-->
+    <!--<GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion>-->
+    <!-- Binaries path for local builds (no download if folder exists) -->
+    <!--<GitExtensionsPath Condition="$(GitExtensionsPath) == ''">$([System.IO.Path]::Combine('$(ProjectDir)', '$(GitExtensionsDownloadPath)'))</GitExtensionsPath>-->
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -20,25 +28,32 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
-	<PackageReference Include="GitExtensions.Extensibility" Version="0.3.0.57" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.0.64" />
+    <PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
+    <PackageReference Include="GitExtensions.Extensibility" Version="0.3.2.72" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.4.27" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <!-- Reference to GitExtensions dlls. -->
   <ItemGroup>
+    <Reference Include="GitCommands">
+      <HintPath>$(GitExtensionsPath)\GitCommands.dll</HintPath>
+    </Reference>
     <Reference Include="GitUIPluginInterfaces">
-      <HintPath>$(GitExtensionsPath)\..\GitUIPluginInterfaces.dll</HintPath>
+      <HintPath>$(GitExtensionsPath)\GitUIPluginInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="GitExtensions.Extensibility">
+      <HintPath>$(GitExtensionsPath)\GitExtensions.Extensibility.dll</HintPath>
     </Reference>
     <Reference Include="GitExtUtils">
-      <HintPath>$(GitExtensionsPath)\..\GitExtUtils.dll</HintPath>
+      <HintPath>$(GitExtensionsPath)\GitExtUtils.dll</HintPath>
     </Reference>
     <Reference Include="ResourceManager">
-      <HintPath>$(GitExtensionsPath)\..\ResourceManager.dll</HintPath>
+      <HintPath>$(GitExtensionsPath)\ResourceManager.dll</HintPath>
     </Reference>
   </ItemGroup>
+  
 
   <!-- Pack as .nupkg with dependency on GitExtensions.Extensibility -->
   <PropertyGroup>
@@ -49,6 +64,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/pmiossec/GitExtensions.AzureDevOpsCommitMessage/master/assets/IconAzureDevOps.png</PackageIconUrl>
     <PackageTags>GitExtensions</PackageTags>
   </PropertyGroup>
+  
   <Target Name="SetPackageProperties" BeforeTargets="GenerateNuspec">
     <PropertyGroup>
       <NuspecProperties>

src/GitExtensions.AzureDevOpsCommitMessage/Plugin.cs

@@ -10,20 +10,26 @@
 using System.Threading.Tasks;
 using System.Web;
 using System.Windows.Forms;
+using GitCommands;
 using GitExtensions.AzureDevOpsCommitMessage.Properties;
 using GitExtUtils.GitUI;
 using GitUI;
 using GitUIPluginInterfaces;
-using GitUIPluginInterfaces.UserControls;
+using GitExtensions.Extensibility.Plugins;
+using GitExtensions.Extensibility.Settings; 
 using Newtonsoft.Json.Linq;
 using ResourceManager;
+using GitExtensions.Extensibility.Git;
+using GitExtensions.Extensibility.Settings.UserControls;
 
 [assembly: InternalsVisibleTo("Gitextensions.AzureDevOpsCommitMessageTests")]
 
 namespace GitExtensions.AzureDevOpsCommitMessage
 {
     [Export(typeof(IGitPlugin))]
-    public class Plugin : GitPluginBase, IGitPluginForRepository
+    [Export(typeof(IGitPluginForCommit))]
+    [Export(typeof(IGitPluginForRepository))]
+    public class Plugin : GitPluginBase, IGitPluginForRepository, IGitPluginForCommit
     {
         private static readonly TranslationString AzureDevOpsCredentialsLabel = new TranslationString("Azure DevOps credentials");
         private static readonly TranslationString AzureDevOpsQueryLabel = new TranslationString("Work items Query (WIQL)");
@@ -91,7 +97,7 @@ public class Plugin : GitPluginBase, IGitPluginForRepository
         public Plugin() : base(true)
         {
             SetNameAndDescription("AzureDevOps Commit Message");
-            Translate();
+            Translate(AppSettings.CurrentTranslation);
             Icon = Resources.Icon;
 
             _credentialsSettings = new CredentialsSetting("AzureDevOpsCredentials", AzureDevOpsCredentialsLabel.Text, () => _gitModule?.WorkingDir);
@@ -259,7 +265,7 @@ private async Task DisplayQueryResultAsync(HttpClient httpClient, string project
         public override void Register(IGitUICommands gitUiCommands)
         {
             base.Register(gitUiCommands);
-            _gitModule = gitUiCommands.GitModule;
+            _gitModule = gitUiCommands.Module;
             gitUiCommands.PostSettings += gitUiCommands_PostSettings;
             gitUiCommands.PreCommit += gitUiCommands_PreCommit;
             gitUiCommands.PostCommit += gitUiCommands_PostRepositoryChanged;