Skip to content

Commit af7a86c

Browse files
pmiossecpmiossec
committed
Update to GitExtensions v5.0
+ GitHub Actions: Update .net version to 8
1 parent 9dde196 commit af7a86c

File tree

6 files changed

+51
-26
lines changed

6 files changed

+51
-26
lines changed

‎.github/workflows/build_plugin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v1
2020

21-
- name: Setup .net6
21+
- name: Setup .net8
2222
uses: actions/setup-dotnet@v1
2323
with:
24-
dotnet-version: 6.0.401
24+
dotnet-version: 8.0.401
2525

2626
- name: Build & package with `dotnet`
2727
run: |

‎.github/workflows/release_plugin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
files: 'src/${{ github.event.repository.name }}/${{ github.event.repository.name }}.csproj'
3030
replacements: '<VersionPrefix>0.0.0</VersionPrefix>=<VersionPrefix>${{ steps.extract_version.outputs.version }}</VersionPrefix>'
3131

32-
- name: Setup .net6
32+
- name: Setup .net8
3333
uses: actions/setup-dotnet@v1
3434
with:
35-
dotnet-version: 6.0.401
35+
dotnet-version: 8.0.401
3636

3737
- name: Build & package with `dotnet`
3838
run: |

‎.gitignore‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,10 @@ ASALocalRun/
328328

329329
# MFractors (Xamarin productivity tool) working folder
330330
.mfractor/
331-
332-
references/
333-
334-
# Git Extensions specific files
335-
GitExtensions.settings.backup
336-
337-
[Gg]itextensions.[Ss]hared/GitExtensions/*
338-
[Gg]itextensions.[Ss]hared/GitExtensions-*.zip
331+
332+
references/
333+
334+
# Git Extensions specific files
335+
GitExtensions.settings.backup
336+
337+
[Gg]it[Ee]xtensions.[Ss]hared/*

‎Gitextensions.AzureDevOpsCommitMessageTests/Gitextensions.AzureDevOpsCommitMessageTests.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net8.0-windows</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -27,8 +27,12 @@
2727

2828
<ItemGroup>
2929
<Reference Include="ResourceManager">
30-
<HintPath>..\..\gitextensions.shared\ResourceManager.dll</HintPath>
30+
<HintPath>..\gitextensions.shared\ResourceManager.dll</HintPath>
3131
</Reference>
32+
<Reference Include="GitExtensions.Extensibility">
33+
<HintPath>..\gitextensions.shared\GitExtensions.Extensibility.dll</HintPath>
34+
</Reference>
35+
3236
</ItemGroup>
3337

3438
</Project>

‎src/GitExtensions.AzureDevOpsCommitMessage/GitExtensions.AzureDevOpsCommitMessage.csproj‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net8.0-windows</TargetFramework>
55
<!--Value useless because will be overwritten by release GitHub action. Keep '0.0.0' so that the release process work well!-->
66
<VersionPrefix>0.0.0</VersionPrefix>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<UseWindowsForms>true</UseWindowsForms>
9+
<!-- Source: 'GitHub' or 'AppVeyor' -->
10+
<!--<GitExtensionsReferenceSource Condition="$(GitExtensionsReferenceSource) == ''">AppVeyor</GitExtensionsReferenceSource>-->
11+
<!-- Version: 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
12+
<!--<GitExtensionsReferenceVersion>v5.1.0.17907</GitExtensionsReferenceVersion>-->
13+
<!--<GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion>-->
14+
<!-- Binaries path for local builds (no download if folder exists) -->
15+
<!--<GitExtensionsPath Condition="$(GitExtensionsPath) == ''">$([System.IO.Path]::Combine('$(ProjectDir)', '$(GitExtensionsDownloadPath)'))</GitExtensionsPath>-->
916
</PropertyGroup>
17+
1018
<ItemGroup>
1119
<Compile Update="Properties\Resources.Designer.cs">
1220
<DesignTime>True</DesignTime>
@@ -20,25 +28,32 @@
2028
</ItemGroup>
2129

2230
<ItemGroup>
23-
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
24-
<PackageReference Include="GitExtensions.Extensibility" Version="0.3.0.57" />
25-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.0.64" />
31+
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
32+
<PackageReference Include="GitExtensions.Extensibility" Version="0.3.2.72" />
33+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.4.27" />
2634
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
2735
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
2836
</ItemGroup>
2937

3038
<!-- Reference to GitExtensions dlls. -->
3139
<ItemGroup>
40+
<Reference Include="GitCommands">
41+
<HintPath>$(GitExtensionsPath)\GitCommands.dll</HintPath>
42+
</Reference>
3243
<Reference Include="GitUIPluginInterfaces">
33-
<HintPath>$(GitExtensionsPath)\..\GitUIPluginInterfaces.dll</HintPath>
44+
<HintPath>$(GitExtensionsPath)\GitUIPluginInterfaces.dll</HintPath>
45+
</Reference>
46+
<Reference Include="GitExtensions.Extensibility">
47+
<HintPath>$(GitExtensionsPath)\GitExtensions.Extensibility.dll</HintPath>
3448
</Reference>
3549
<Reference Include="GitExtUtils">
36-
<HintPath>$(GitExtensionsPath)\..\GitExtUtils.dll</HintPath>
50+
<HintPath>$(GitExtensionsPath)\GitExtUtils.dll</HintPath>
3751
</Reference>
3852
<Reference Include="ResourceManager">
39-
<HintPath>$(GitExtensionsPath)\..\ResourceManager.dll</HintPath>
53+
<HintPath>$(GitExtensionsPath)\ResourceManager.dll</HintPath>
4054
</Reference>
4155
</ItemGroup>
56+
4257

4358
<!-- Pack as .nupkg with dependency on GitExtensions.Extensibility -->
4459
<PropertyGroup>
@@ -49,6 +64,7 @@
4964
<PackageIconUrl>https://raw.githubusercontent.com/pmiossec/GitExtensions.AzureDevOpsCommitMessage/master/assets/IconAzureDevOps.png</PackageIconUrl>
5065
<PackageTags>GitExtensions</PackageTags>
5166
</PropertyGroup>
67+
5268
<Target Name="SetPackageProperties" BeforeTargets="GenerateNuspec">
5369
<PropertyGroup>
5470
<NuspecProperties>

‎src/GitExtensions.AzureDevOpsCommitMessage/Plugin.cs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,26 @@
1010
using System.Threading.Tasks;
1111
using System.Web;
1212
using System.Windows.Forms;
13+
using GitCommands;
1314
using GitExtensions.AzureDevOpsCommitMessage.Properties;
1415
using GitExtUtils.GitUI;
1516
using GitUI;
1617
using GitUIPluginInterfaces;
17-
using GitUIPluginInterfaces.UserControls;
18+
using GitExtensions.Extensibility.Plugins;
19+
using GitExtensions.Extensibility.Settings;
1820
using Newtonsoft.Json.Linq;
1921
using ResourceManager;
22+
using GitExtensions.Extensibility.Git;
23+
using GitExtensions.Extensibility.Settings.UserControls;
2024

2125
[assembly: InternalsVisibleTo("Gitextensions.AzureDevOpsCommitMessageTests")]
2226

2327
namespace GitExtensions.AzureDevOpsCommitMessage
2428
{
2529
[Export(typeof(IGitPlugin))]
26-
public class Plugin : GitPluginBase, IGitPluginForRepository
30+
[Export(typeof(IGitPluginForCommit))]
31+
[Export(typeof(IGitPluginForRepository))]
32+
public class Plugin : GitPluginBase, IGitPluginForRepository, IGitPluginForCommit
2733
{
2834
private static readonly TranslationString AzureDevOpsCredentialsLabel = new TranslationString("Azure DevOps credentials");
2935
private static readonly TranslationString AzureDevOpsQueryLabel = new TranslationString("Work items Query (WIQL)");
@@ -91,7 +97,7 @@ public class Plugin : GitPluginBase, IGitPluginForRepository
9197
public Plugin() : base(true)
9298
{
9399
SetNameAndDescription("AzureDevOps Commit Message");
94-
Translate();
100+
Translate(AppSettings.CurrentTranslation);
95101
Icon = Resources.Icon;
96102

97103
_credentialsSettings = new CredentialsSetting("AzureDevOpsCredentials", AzureDevOpsCredentialsLabel.Text, () => _gitModule?.WorkingDir);
@@ -259,7 +265,7 @@ private async Task DisplayQueryResultAsync(HttpClient httpClient, string project
259265
public override void Register(IGitUICommands gitUiCommands)
260266
{
261267
base.Register(gitUiCommands);
262-
_gitModule = gitUiCommands.GitModule;
268+
_gitModule = gitUiCommands.Module;
263269
gitUiCommands.PostSettings += gitUiCommands_PostSettings;
264270
gitUiCommands.PreCommit += gitUiCommands_PreCommit;
265271
gitUiCommands.PostCommit += gitUiCommands_PostRepositoryChanged;

0 commit comments

Comments
 (0)