Upgrade dependencies

lekhmanrus · lekhmanrus · commit c646ae46d4a6 · 2021-10-22T23:40:27.000-06:00
diff --git a/Directory.Build.props b/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>
diff --git a/UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj b/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>
diff --git a/src/GitExtensions.GerritPlugin/FormGitReview.cs b/src/GitExtensions.GerritPlugin/FormGitReview.cs
@@ -64,13 +64,18 @@ public FormGitReview(IGitUICommands uiCommands)
             }
         }
 
-        private void LoadGitReview()
+        private void LoadGitReview()
         {
             try
             {
-                if (File.Exists(Module.WorkingDir + ".gitreview"))
+                string gitreviewPath = $"{Module.WorkingDir}.gitreview";
+                if (File.Exists(gitreviewPath))
                 {
-                    _NO_TRANSLATE_GitReviewEdit.ViewFileAsync(Module.WorkingDir + ".gitreview");
+                    ThreadHelper.JoinableTaskContext.Factory.Run(async () =>
+                    {
+                        await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+                        await _NO_TRANSLATE_GitReviewEdit.ViewFileAsync(gitreviewPath);
+                    });
                 }
             }
             catch (Exception ex)
diff --git a/src/GitExtensions.GerritPlugin/GerritPlugin.cs b/src/GitExtensions.GerritPlugin/GerritPlugin.cs
@@ -104,7 +104,7 @@ private void UpdateGerritMenuItems(object sender, GitUIEventArgs e)
                 }
                 else if (!isEnabled)
                 {
-                    UninstallCommitMsgHookAsync(gitModule);
+                    UninstallCommitMsgHook(gitModule);
                 }
             }
 
@@ -386,7 +386,7 @@ private async Task InstallCommitMsgHookAsync()
             }
         }
 
-        private void UninstallCommitMsgHookAsync([NotNull] IGitModule gitModule)
+        private void UninstallCommitMsgHook([NotNull] IGitModule gitModule)
         {
             string hookPath = GetCommitMessageHookPath(gitModule);
             string bakHookPath = $"{hookPath}.bak";
diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj
@@ -10,22 +10,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
+    <PackageReference Include="JetBrains.Annotations" Version="2021.2.0">
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.5.132">
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.0.63">
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3">
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1">
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </PackageReference>
-    <PackageReference Include="NUnit" Version="3.12.0">
+    <PackageReference Include="NUnit" Version="3.13.2">
         <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitExtensions.Extensibility" Version="0.1.*" />
+    <PackageReference Include="GitExtensions.Extensibility" Version="0.2.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec
@@ -8,12 +8,20 @@
     <license type="file">LICENSE.md</license>
     <projectUrl>$projectUrl$</projectUrl>
     <tags>$tags$</tags>
+    <icon>Resources\IconGerrit.png</icon>
     <dependencies>
-      <dependency id="GitExtensions.Extensibility" version="[0.1.0, 1.0.0)" />
+      <group>
+        <dependency id="GitExtensions.Extensibility" version="[0.1.0, 1.0.0)" />
+      </group>
+      <!-- To fix Warning	NU5128	Add a dependency group for .NETFramework4.6.1 to the nuspec	GitExtensions.GerritPlugin -->
+      <group targetFramework=".NETFramework4.6.1">
+        <dependency id="GitExtensions.Extensibility" version="[0.1.0, 1.0.0)" />
+      </group>
     </dependencies>
   </metadata>
   <files>
     <file src="..\..\LICENSE.md" target="\" />
     <file src="bin\$configuration$\net461\GitExtensions.GerritPlugin.dll" target="\lib\net461\" />
+    <file src="Resources\IconGerrit.png" target="\Resources\" />
   </files>
 </package>
diff --git a/src/GitExtensions.GerritPlugin/app.config b/src/GitExtensions.GerritPlugin/app.config
@@ -1,3 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,18 @@ public FormGitReview(IGitUICommands uiCommands)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- private void LoadGitReview()`
	`67`	`+ private void LoadGitReview()`
`68`	`68`	`{`
`69`	`69`	`try`
`70`	`70`	`{`
`71`		`- if (File.Exists(Module.WorkingDir + ".gitreview"))`
	`71`	`+ string gitreviewPath = $"{Module.WorkingDir}.gitreview";`
	`72`	`+ if (File.Exists(gitreviewPath))`
`72`	`73`	`{`
`73`		`- _NO_TRANSLATE_GitReviewEdit.ViewFileAsync(Module.WorkingDir + ".gitreview");`
	`74`	`+ ThreadHelper.JoinableTaskContext.Factory.Run(async () =>`
	`75`	`+ {`
	`76`	`+ await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();`
	`77`	`+ await _NO_TRANSLATE_GitReviewEdit.ViewFileAsync(gitreviewPath);`
	`78`	`+ });`
`74`	`79`	`}`
`75`	`80`	`}`
`76`	`81`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private void UpdateGerritMenuItems(object sender, GitUIEventArgs e)`
`104`	`104`	`}`
`105`	`105`	`else if (!isEnabled)`
`106`	`106`	`{`
`107`		`- UninstallCommitMsgHookAsync(gitModule);`
	`107`	`+ UninstallCommitMsgHook(gitModule);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`@@ -386,7 +386,7 @@ private async Task InstallCommitMsgHookAsync()`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
`389`		`- private void UninstallCommitMsgHookAsync([NotNull] IGitModule gitModule)`
	`389`	`+ private void UninstallCommitMsgHook([NotNull] IGitModule gitModule)`
`390`	`390`	`{`
`391`	`391`	`string hookPath = GetCommitMessageHookPath(gitModule);`
`392`	`392`	`string bakHookPath = $"{hookPath}.bak";`