Skip to content

Commit 6da09cd

Browse files
authored
Add support for 5.0 (#41)
1 parent 8ad0404 commit 6da09cd

4 files changed

Lines changed: 17 additions & 13 deletions

File tree

src/GitExtensions.SolutionRunner/GitExtensions.SolutionRunner.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0-windows</TargetFramework>
4-
<VersionPrefix>7.1.0</VersionPrefix>
3+
<TargetFramework>net8.0-windows</TargetFramework>
4+
<VersionPrefix>8.0.0</VersionPrefix>
55
<PublishRepositoryUrl>true</PublishRepositoryUrl>
66
<UseWindowsForms>true</UseWindowsForms>
77
</PropertyGroup>
@@ -12,13 +12,14 @@
1212
<!-- Reference to GitExtensions dlls. -->
1313
<ItemGroup>
1414
<Reference Include="GitExtUtils" HintPath="$(GitExtensionsPath)\GitExtUtils.dll" />
15+
<Reference Include="GitExtensions.Extensibility" HintPath="$(GitExtensionsPath)\GitExtensions.Extensibility.dll" />
1516
<Reference Include="GitUI" HintPath="$(GitExtensionsPath)\GitUI.dll" />
1617
<Reference Include="GitUIPluginInterfaces" HintPath="$(GitExtensionsPath)\GitUIPluginInterfaces.dll" />
1718
<Reference Include="ResourceManager" HintPath="$(GitExtensionsPath)\ResourceManager.dll" />
1819
<Reference Include="System.ComponentModel.Composition" HintPath="$(GitExtensionsPath)\System.ComponentModel.Composition.dll" />
1920
</ItemGroup>
2021
<PropertyGroup>
21-
<GitExtensionsReferenceVersion>v4.2</GitExtensionsReferenceVersion>
22+
<GitExtensionsReferenceVersion>v5.0</GitExtensionsReferenceVersion>
2223
<GitExtensionsDownloadPath>../../references</GitExtensionsDownloadPath>
2324
</PropertyGroup>
2425

src/GitExtensions.SolutionRunner/Plugin.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
using GitExtensions.SolutionRunner.UI;
44
using GitUI;
55
using GitUI.CommandsDialogs;
6-
using GitUIPluginInterfaces;
7-
using ResourceManager;
86
using System;
97
using System.Collections.Generic;
108
using System.ComponentModel.Composition;
119
using System.Linq;
1210

11+
using GitExtensions.Extensibility.Git;
12+
using GitExtensions.Extensibility.Plugins;
13+
using GitExtensions.Extensibility.Settings;
14+
1315
namespace GitExtensions.SolutionRunner
1416
{
1517
[Export(typeof(IGitPlugin))]
@@ -63,13 +65,12 @@ public override void Register(IGitUICommands commands)
6365
base.Register(commands);
6466

6567
Configuration = new PluginSettings(Settings);
66-
67-
if (commands.GitModule.IsValidGitWorkingDir())
68+
if (commands.Module.IsValidGitWorkingDir())
6869
{
6970
MenuStripEx mainMenu = FindMainMenu(commands);
7071
if (mainMenu != null && FindMainMenuItem(commands, mainMenu) == null)
7172
{
72-
var provider = new GitSolutionFileProvider(commands.GitModule.WorkingDir, commands.GitModule.GitExecutable);
73+
var provider = new GitSolutionFileProvider(commands.Module.WorkingDir, commands.Module.GitExecutable);
7374

7475
mainMenu.Items.Add(new SolutionListMenuItem(provider, Configuration));
7576
}

src/GitExtensions.SolutionRunner/PluginSettings.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using GitUIPluginInterfaces;
2-
using System.Collections;
1+
using System.Collections;
32
using System.Collections.Generic;
43

4+
using GitExtensions.Extensibility.Settings;
5+
56
namespace GitExtensions.SolutionRunner
67
{
78
internal class PluginSettings : IEnumerable<ISetting>
@@ -35,7 +36,7 @@ internal class PluginSettings : IEnumerable<ISetting>
3536
/// </summary>
3637
public static BoolSetting ShouldRunAsAdminProperty { get; } = new BoolSetting("Run as Administrator", "Run as Administrator", false);
3738

38-
private readonly ISettingsSource source;
39+
private readonly SettingsSource source;
3940

4041
/// <summary>
4142
/// Gets current value of <see cref="ExecutablePathProperty"/>.
@@ -63,7 +64,7 @@ internal class PluginSettings : IEnumerable<ISetting>
6364
/// </summary>
6465
public bool ShouldRunAsAdmin => source.GetBool(ShouldRunAsAdminProperty.Name, ShouldRunAsAdminProperty.DefaultValue);
6566

66-
public PluginSettings(ISettingsSource source)
67+
public PluginSettings(SettingsSource source)
6768
{
6869
this.source = source;
6970
}

src/GitExtensions.SolutionRunner/Services/GitSolutionFileProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using System.Collections.Generic;
22
using System.IO;
33
using System.Threading.Tasks;
4-
using GitUIPluginInterfaces;
54
using System.Linq;
65
using System.Text;
76

7+
using GitExtensions.Extensibility;
8+
89
namespace GitExtensions.SolutionRunner.Services
910
{
1011
public class GitSolutionFileProvider : ISolutionFileProvider

0 commit comments

Comments
 (0)