Merge pull request #45 from lekhmanrus/net48

Upgrade dependencies

Author: lekhmanrus

Directory.Build.props

@@ -13,7 +13,7 @@
     <PackageVersion>0.0.0.1</PackageVersion>
     <PackageTags>GitExtensions</PackageTags>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
     <VersionPrefix>1.0.0</VersionPrefix>

UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
   </ItemGroup>
 
   <ItemGroup>

UnitTests/GitExtensions.GerritPlugin.Tests/Server/CommandBuilderWithDraftSupportTests.cs

@@ -35,7 +35,7 @@ public static string Build_with_all_values_on_default_builds_expected_command()
         {
             var sut = new CommandBuilderWithDraftSupport();
             return sut.WithReviewers(string.Empty)
-                .WithCC(string.Empty)
+                .WithCc(string.Empty)
                 .WithTopic(string.Empty)
                 .WithPublishType(string.Empty)
                 .WithHashTag(string.Empty)
@@ -47,7 +47,7 @@ public static string Build_with_values_for_all_options_builds_expected_command()
         {
             var sut = new CommandBuilderWithDraftSupport();
             return sut.WithReviewers("mygroup")
-                .WithCC("team2")
+                .WithCc("team2")
                 .WithTopic("ABC-123")
                 .WithPublishType(string.Empty)
                 .WithHashTag("what")

src/GitExtensions.GerritPlugin/FormGerritBase.cs

@@ -7,8 +7,8 @@ namespace GitExtensions.GerritPlugin
     public class FormGerritBase : GitExtensionsForm
     {
         protected GerritSettings Settings { get; private set; }
-        protected readonly IGitUICommands UICommands;
-        protected IGitModule Module => UICommands.GitModule;
+        protected readonly IGitUICommands UiCommands;
+        protected IGitModule Module => UiCommands.GitModule;
 
         private FormGerritBase()
             : this(null)
@@ -18,7 +18,7 @@ private FormGerritBase()
         protected FormGerritBase(IGitUICommands uiCommands)
             : base(true)
         {
-            UICommands = uiCommands;
+            UiCommands = uiCommands;
         }
 
         protected override void OnLoad(EventArgs e)

src/GitExtensions.GerritPlugin/FormGerritDownload.cs

@@ -112,7 +112,7 @@ private async Task<bool> DownloadChangeAsync(IWin32Window owner)
             string branchName = "review/" + author + "/" + topic;
             var refSpec = (string)((JValue)patchSetInfo["ref"]).Value;
 
-            var fetchCommand = UICommands.CreateRemoteCommand();
+            var fetchCommand = UiCommands.CreateRemoteCommand();
 
             fetchCommand.CommandText = FetchCommand(_NO_TRANSLATE_Remotes.Text, refSpec);
 
@@ -121,37 +121,34 @@ private async Task<bool> DownloadChangeAsync(IWin32Window owner)
                 return false;
             }
 
-            var checkoutCommand = UICommands.CreateRemoteCommand();
+            var checkoutCommand = UiCommands.CreateRemoteCommand();
 
             checkoutCommand.CommandText = GitCommandHelpers.BranchCmd(branchName, "FETCH_HEAD", true);
             checkoutCommand.Completed += (s, e) =>
             {
-                if (e.IsError)
+                if (e.IsError && e.Command.CommandText.Contains("already exists"))
                 {
-                    if (e.Command.CommandText.Contains("already exists"))
-                    {
-                        // Recycle the current review branch.
-
-                        var recycleCommand = UICommands.CreateRemoteCommand();
+                    // Recycle the current review branch.
 
-                        recycleCommand.CommandText = "checkout " + branchName;
+                    var recycleCommand = UiCommands.CreateRemoteCommand();
 
-                        if (!RunCommand(recycleCommand, change))
-                        {
-                            return;
-                        }
+                    recycleCommand.CommandText = "checkout " + branchName;
 
-                        var resetCommand = UICommands.CreateRemoteCommand();
+                    if (!RunCommand(recycleCommand, change))
+                    {
+                        return;
+                    }
 
-                        resetCommand.CommandText = GitCommandHelpers.ResetCmd(ResetMode.Hard, "FETCH_HEAD");
+                    var resetCommand = UiCommands.CreateRemoteCommand();
 
-                        if (!RunCommand(resetCommand, change))
-                        {
-                            return;
-                        }
+                    resetCommand.CommandText = GitCommandHelpers.ResetCmd(ResetMode.Hard, "FETCH_HEAD");
 
-                        e = new GitRemoteCommandCompletedEventArgs(e.Command, false, e.Handled);
+                    if (!RunCommand(resetCommand, change))
+                    {
+                        return;
                     }
+
+                    e = new GitRemoteCommandCompletedEventArgs(e.Command, false, e.Handled);
                 }
             };
 
@@ -253,7 +250,7 @@ private void FormGerritDownloadLoad(object sender, EventArgs e)
 
         private void AddRemoteClick(object sender, EventArgs e)
         {
-            UICommands.StartRemotesDialog(this);
+            UiCommands.StartRemotesDialog(this);
             _NO_TRANSLATE_Remotes.DataSource = Module.GetRemoteNames();
         }
     }

src/GitExtensions.GerritPlugin/FormGerritPublish.cs

@@ -86,12 +86,12 @@ private bool PublishChange(IWin32Window owner)
 
             var builder = _capabilities.NewBuilder()
                 .WithReviewers(_NO_TRANSLATE_Reviewers.Text)
-                .WithCC(_NO_TRANSLATE_Cc.Text)
+                .WithCc(_NO_TRANSLATE_Cc.Text)
                 .WithTopic(_NO_TRANSLATE_Topic.Text)
                 .WithHashTag(_NO_TRANSLATE_Hashtag.Text)
                 .WithPublishType(((KeyValuePair<string, string>)PublishType.SelectedItem).Value);
 
-            var pushCommand = UICommands.CreateRemoteCommand();
+            var pushCommand = UiCommands.CreateRemoteCommand();
             pushCommand.CommandText = PushCmd(
                 remote,
                 builder.Build(branch));
@@ -201,7 +201,7 @@ private void FormGerritPublishLoad(object sender, EventArgs e)
 
         private void AddRemoteClick(object sender, EventArgs e)
         {
-            UICommands.StartRemotesDialog(this);
+            UiCommands.StartRemotesDialog(this);
             _NO_TRANSLATE_Remotes.DataSource = Module.GetRemoteNames();
         }
     }