From 96416baf5dcd6b8716abd485f0421c8d02fcb8cb Mon Sep 17 00:00:00 2001
From: Ruslan Lekhman <lekhman112@gmail.com>
Date: Thu, 15 Dec 2022 17:50:23 -0700
Subject: [PATCH] Support GitExtensions 4.0.1 and upgrade to .NET6 (#55)

---
 Directory.Build.props                            |  4 ++--
 .../GitExtensions.GerritPlugin.Tests.csproj      |  8 ++++----
 appveyor.yml                                     |  4 ++--
 src/GitExtensions.GerritPlugin/GerritUtil.cs     | 16 +++++-----------
 .../GitExtensions.GerritPlugin.csproj            |  9 ++++-----
 .../GitExtensions.GerritPlugin.nuspec            |  6 +++---
 6 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 108caf5..fad4229 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
 
   <PropertyGroup>
     <UseWindowsForms>true</UseWindowsForms>
-    <TargetFramework>net5.0-windows7.0</TargetFramework>
-    <VersionPrefix>2.0.1</VersionPrefix>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <VersionPrefix>2.0.2</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj b/UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj
index 5b21f18..b431a2a 100644
--- a/UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj
+++ b/UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj
@@ -3,10 +3,10 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/appveyor.yml b/appveyor.yml
index 5afe27c..3b5741c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,7 @@
 #---------------------------------#
 
 # version format
-version: 2.0.1.{build}
+version: 2.0.2.{build}
 
 # version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
 environment:
@@ -17,7 +17,7 @@ nuget:
   disable_publish_on_pr: true
 
 # Build worker image (VM template)
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 # enable patching of Directory.Build.props
 dotnet_csproj:
diff --git a/src/GitExtensions.GerritPlugin/GerritUtil.cs b/src/GitExtensions.GerritPlugin/GerritUtil.cs
index 67904e4..6fe33e3 100644
--- a/src/GitExtensions.GerritPlugin/GerritUtil.cs
+++ b/src/GitExtensions.GerritPlugin/GerritUtil.cs
@@ -7,6 +7,7 @@
 using GitCommands;
 using GitExtUtils;
 using GitUI;
+using GitUI.Infrastructure;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 
@@ -79,7 +80,7 @@ public static Uri GetFetchUrl(IGitModule module, string remote)
 
             StartAgent(owner, module, remote);
 
-            var sshCmd = GitSshHelpers.Plink()
+            var sshCmd = GitSshHelpers.IsPlink
                 ? AppSettings.Plink
                 : SshPathLocatorInstance.GetSshFromGitDir(AppSettings.GitBinDir);
 
@@ -90,7 +91,7 @@ public static Uri GetFetchUrl(IGitModule module, string remote)
 
             string hostname = fetchUrl.Host;
             string username = fetchUrl.UserInfo;
-            string portFlag = GitSshHelpers.Plink() ? " -P " : " -p ";
+            string portFlag = GitSshHelpers.IsPlink ? " -P " : " -p ";
             int port = fetchUrl.Port;
 
             if (port == -1 && fetchUrl.Scheme == "ssh")
@@ -139,16 +140,9 @@ public static void StartAgent([NotNull] IWin32Window owner, [NotNull] IGitModule
                 throw new ArgumentNullException(nameof(remote));
             }
 
-            if (GitSshHelpers.Plink())
+            if (GitSshHelpers.IsPlink)
             {
-                if (!File.Exists(AppSettings.Pageant))
-                {
-                    MessageBoxes.PAgentNotFound(owner);
-                }
-                else
-                {
-                    module.StartPageantForRemote(remote);
-                }
+                PuttyHelpers.StartPageantIfConfigured(() => ((GitModule)module).GetPuttyKeyFileForRemote(remote));
             }
         }
     }
diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj
index 8bcb0bd..c973395 100644
--- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj
+++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj
@@ -1,29 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0">
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1">
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.9.20">
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.10.56">
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.0.64">
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1">
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </PackageReference>
-    <PackageReference Include="NUnit" Version="3.13.2">
+    <PackageReference Include="NUnit" Version="3.13.3">
         <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitExtensions.Extensibility" Version="0.2.*" />
+    <PackageReference Include="GitExtensions.Extensibility" Version="0.3.0.57" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec
index 73ec96f..e968942 100644
--- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec
+++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec
@@ -13,15 +13,15 @@
       <group>
         <dependency id="GitExtensions.Extensibility" version="[0.2.0, 0.3.0)" />
       </group>
-      <!-- To fix Warning NU5128 Add a dependency group for net5.0-windows7.0 to the nuspec -->
-      <group targetFramework="net5.0-windows7.0">
+      <!-- To fix Warning NU5128 Add a dependency group for net6.0-windows7.0 to the nuspec -->
+      <group targetFramework="net6.0-windows7.0">
         <dependency id="GitExtensions.Extensibility" version="[0.2.0, 0.3.0)" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="..\..\LICENSE.md" target="\" />
-    <file src="bin\$configuration$\net5.0-windows7.0\GitExtensions.GerritPlugin.dll" target="\lib\" />
+    <file src="bin\$configuration$\net6.0-windows7.0\GitExtensions.GerritPlugin.dll" target="\lib\" />
     <file src="Resources\IconGerrit.png" target="\Resources\" />
   </files>
 </package>
\ No newline at end of file