#71, #72

sboulema · Aug 10, 2021 · 30cdee9 · 30cdee9
1 parent 0d875b7
commit 30cdee9
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 36 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,3 +11,6 @@ dotnet_diagnostic.IDE0022.severity = none
 
 # IDE0008: Use explicit type
 dotnet_diagnostic.IDE0008.severity = none
+
+# VSTHRD111: Use ConfigureAwait(bool)
+dotnet_diagnostic.VSTHRD111.severity = none
diff --git a/TSVN.Shared/Commands/AddFileCommand.cs b/TSVN.Shared/Commands/AddFileCommand.cs
@@ -11,6 +11,7 @@ internal sealed class AddFileCommand : BaseCommand<AddFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();   
             await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
             await CommandHelper.RunTortoiseSvnFileCommand("add");
         }

diff --git a/TSVN.Shared/Commands/CommitCommand.cs b/TSVN.Shared/Commands/CommitCommand.cs
@@ -11,8 +11,9 @@ internal sealed class CommitCommand : BaseCommand<CommitCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveAll.ExecuteAsync().ConfigureAwait(false);
-            await CommandHelper.RunTortoiseSvnCommand("commit").ConfigureAwait(false);
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
+            await CommandHelper.RunTortoiseSvnCommand("commit");
         }
     }
 }
diff --git a/TSVN.Shared/Commands/CommitFileCommand.cs b/TSVN.Shared/Commands/CommitFileCommand.cs
@@ -11,6 +11,7 @@ internal sealed class CommitFileCommand : BaseCommand<CommitFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
             await CommandHelper.RunTortoiseSvnFileCommand("commit");
         }

diff --git a/TSVN.Shared/Commands/RenameFileCommand.cs b/TSVN.Shared/Commands/RenameFileCommand.cs
@@ -11,6 +11,7 @@ internal sealed class RenameFileCommand : BaseCommand<RenameFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await KnownCommands.File_SaveAll.ExecuteAsync();
             await CommandHelper.RunTortoiseSvnFileCommand("rename");
         }

diff --git a/TSVN.Shared/Commands/UpdateCommand.cs b/TSVN.Shared/Commands/UpdateCommand.cs
@@ -11,6 +11,7 @@ internal sealed class UpdateCommand : BaseCommand<UpdateCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await KnownCommands.File_SaveAll.ExecuteAsync();
             await CommandHelper.RunTortoiseSvnCommand("update");
         }

diff --git a/TSVN.Shared/Commands/UpdateFileCommand.cs b/TSVN.Shared/Commands/UpdateFileCommand.cs
@@ -11,6 +11,7 @@ internal sealed class UpdateFileCommand : BaseCommand<UpdateFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
             await CommandHelper.RunTortoiseSvnFileCommand("update");
         }

diff --git a/TSVN.Shared/Commands/UpdateToRevisionCommand.cs b/TSVN.Shared/Commands/UpdateToRevisionCommand.cs
@@ -11,6 +11,7 @@ internal sealed class UpdateToRevisionCommand : BaseCommand<UpdateToRevisionComm
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await KnownCommands.File_SaveAll.ExecuteAsync();
             await CommandHelper.RunTortoiseSvnCommand("update", "/rev");
         }

diff --git a/TSVN.Shared/Commands/UpdateToRevisionFileCommand.cs b/TSVN.Shared/Commands/UpdateToRevisionFileCommand.cs
@@ -11,6 +11,7 @@ internal sealed class UpdateToRevisionFileCommand : BaseCommand<UpdateToRevision
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
             await CommandHelper.RunTortoiseSvnFileCommand("update", "/rev");
         }

diff --git a/TSVN.Shared/Helpers/FileHelper.cs b/TSVN.Shared/Helpers/FileHelper.cs
@@ -33,7 +33,7 @@ public static async Task OpenFile(string filePath)
                 return;
             }
 
-            await VS.Commands.ExecuteAsync("File.OpenFile", filePath).ConfigureAwait(false);
+            await VS.Commands.ExecuteAsync("File.OpenFile", filePath);
         }
 
         /// <summary>
@@ -60,7 +60,7 @@ public static async Task<string> GetPath()
             }
 
             // Context menu in the Code Editor
-            var documentView = await VS.Documents.GetActiveDocumentViewAsync().ConfigureAwait(false);
+            var documentView = await VS.Documents.GetActiveDocumentViewAsync();
             return documentView?.Document?.FilePath;
         }
 

diff --git a/TSVN.Shared/Options/OptionsDialog.cs b/TSVN.Shared/Options/OptionsDialog.cs
@@ -27,12 +27,12 @@ private void OptionsDialog_Load(object sender, EventArgs e)
 
         private async Task LoadDialog()
         {
-            var solution = await VS.Solutions.GetCurrentSolutionAsync().ConfigureAwait(false);
+            var solution = await VS.Solutions.GetCurrentSolutionAsync();
             var solutionFilePath = solution?.FullPath;
 
             if (File.Exists(solutionFilePath))
             {
-                options = await OptionsHelper.GetOptions().ConfigureAwait(false);
+                options = await OptionsHelper.GetOptions();
                 rootFolderTextBox.Text = options.RootFolder;
                 onItemAddedAddToSVNCheckBox.Checked = options.OnItemAddedAddToSVN;
                 onItemRenamedRenameInSVNCheckBox.Checked = options.OnItemRenamedRenameInSVN;
@@ -52,7 +52,7 @@ private async Task LoadDialog()
 
             if (string.IsNullOrEmpty(rootFolderTextBox.Text))
             {
-                rootFolderTextBox.Text = await CommandHelper.GetRepositoryRoot().ConfigureAwait(false);
+                rootFolderTextBox.Text = await CommandHelper.GetRepositoryRoot();
             }
         }
 
@@ -71,7 +71,7 @@ private async Task Save()
             options.OnItemRenamedRenameInSVN = onItemRenamedRenameInSVNCheckBox.Checked;
             options.OnItemRemovedRemoveFromSVN = onItemRemovedRemoveFromSVNCheckBox.Checked;
             options.CloseOnEnd = closeOnEndCheckBox.Checked;
-            await OptionsHelper.SaveOptions(options).ConfigureAwait(false);
+            await OptionsHelper.SaveOptions(options);
             Close();
         }
 

diff --git a/TSVN.Shared/Options/OptionsHelper.cs b/TSVN.Shared/Options/OptionsHelper.cs
@@ -45,7 +45,7 @@ public static async Task SaveOptions(Options options)
         {
             var json = JsonConvert.SerializeObject(options);
 
-            var solution = await VS.Solutions.GetCurrentSolutionAsync().ConfigureAwait(false);
+            var solution = await VS.Solutions.GetCurrentSolutionAsync();
             var solutionFilePath = solution?.FullPath;
 
             if (!File.Exists(solutionFilePath))

diff --git a/TSVN.Shared/TSVNPackage.cs b/TSVN.Shared/TSVNPackage.cs
@@ -80,7 +80,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         #region Events
         private async Task ProjectItemsEvents_ItemRenamedAsync(string[] oldFilePaths, string[] newFilePaths)
         {
-            var options = await OptionsHelper.GetOptions().ConfigureAwait(false);
+            var options = await OptionsHelper.GetOptions();
 
             if (!options.OnItemRenamedRenameInSVN)
             {
@@ -93,13 +93,13 @@ private async Task ProjectItemsEvents_ItemRenamedAsync(string[] oldFilePaths, st
                 File.Move(newFilePaths[i], oldFilePaths[i]);
 
                 // So that we can svn rename it properly
-                await CommandHelper.StartProcess(FileHelper.GetSvnExec(), $"mv {oldFilePaths[i]} {newFilePaths[i]}").ConfigureAwait(false);
+                await CommandHelper.StartProcess(FileHelper.GetSvnExec(), $"mv {oldFilePaths[i]} {newFilePaths[i]}");
             }
         }
 
         private async Task ProjectItemsEvents_ItemAdded_Async(string[] filePaths)
         {
-            var options = await OptionsHelper.GetOptions().ConfigureAwait(false);
+            var options = await OptionsHelper.GetOptions();
 
             if (!options.OnItemAddedAddToSVN)
             {
@@ -108,13 +108,13 @@ private async Task ProjectItemsEvents_ItemAdded_Async(string[] filePaths)
 
             foreach (var filePath in filePaths)
             {
-                await CommandHelper.RunTortoiseSvnFileCommand("add", filePath: filePath).ConfigureAwait(false);
+                await CommandHelper.RunTortoiseSvnFileCommand("add", filePath: filePath);
             }
         }
 
         private async Task ProjectItemsEvents_ItemRemoved_Async(string[] filePaths)
         {
-            var options = await OptionsHelper.GetOptions().ConfigureAwait(false);
+            var options = await OptionsHelper.GetOptions();
 
             if (!options.OnItemRemovedRemoveFromSVN)
             {
@@ -123,7 +123,7 @@ private async Task ProjectItemsEvents_ItemRemoved_Async(string[] filePaths)
 
             foreach (var filePath in filePaths)
             {
-                await CommandHelper.RunTortoiseSvnFileCommand("remove", filePath: filePath).ConfigureAwait(false);
+                await CommandHelper.RunTortoiseSvnFileCommand("remove", filePath: filePath);
             }
         }
 

diff --git a/TSVN.Shared/TSVNToolWindowControl.xaml.cs b/TSVN.Shared/TSVNToolWindowControl.xaml.cs
@@ -257,7 +257,7 @@ private static ImageSource ToImageSource(Icon icon)
 
         private void RefreshButton_Click(object sender, RoutedEventArgs e) => Refresh().FireAndForget();
 
-        private async Task Refresh() => Update(await CommandHelper.GetPendingChanges(), await CommandHelper.GetRepositoryRoot().ConfigureAwait(false));
+        private async Task Refresh() => Update(await CommandHelper.GetPendingChanges(), await CommandHelper.GetRepositoryRoot());
 
         private void HideUnversionedButton_OnChecked(object sender, RoutedEventArgs e) => ToggleUnversioned(true).FireAndForget();
 
@@ -267,7 +267,7 @@ private async Task ToggleUnversioned(bool hide)
         {
             Settings.Default.HideUnversioned = hide;
             Settings.Default.Save();
-            Update(await CommandHelper.GetPendingChanges(), await CommandHelper.GetRepositoryRoot().ConfigureAwait(false));
+            Update(await CommandHelper.GetPendingChanges(), await CommandHelper.GetRepositoryRoot());
         }
 
         private void TreeView_Collapsed(object sender, RoutedEventArgs e)

diff --git a/TSVN.VS2019/TSVN.VS2019.csproj b/TSVN.VS2019/TSVN.VS2019.csproj
@@ -153,7 +153,7 @@
       <Version>4.0.173</Version>
     </PackageReference>
     <PackageReference Include="Community.VisualStudio.Toolkit">
-      <Version>16.0.76.257-pre</Version>
+      <Version>15.0.76.257-pre</Version>
     </PackageReference>
     <PackageReference Include="Community.VisualStudio.VSCT">
       <Version>16.0.29.6</Version>

diff --git a/TSVN.sln b/TSVN.sln
@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		azure-pipelines.yml = azure-pipelines.yml
-		publish-manifest.VS2017.json = publish-manifest.VS2017.json
 		publish-manifest.VS2019.json = publish-manifest.VS2019.json
 		publish-manifest.VS2022.json = publish-manifest.VS2022.json
 		README.md = README.md
@@ -19,13 +18,10 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TSVN.Shared", "TSVN.Shared\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TSVN.VS2019", "TSVN.VS2019\TSVN.VS2019.csproj", "{1C161366-D879-43BB-AC85-D7F5C82B9880}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TSVN.VS2017", "TSVN.VS2017\TSVN.VS2017.csproj", "{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		TSVN.Shared\TSVN.Shared.projitems*{1c161366-d879-43bb-ac85-d7f5c82b9880}*SharedItemsImports = 4
 		TSVN.Shared\TSVN.Shared.projitems*{81ad421f-adcc-41fb-bd06-23a6cfeb1d65}*SharedItemsImports = 4
-		TSVN.Shared\TSVN.Shared.projitems*{8b7b2ab8-91b0-4cb2-87a0-eae2a637c55e}*SharedItemsImports = 4
 		TSVN.Shared\TSVN.Shared.projitems*{900c73f3-67f8-428d-84d6-a29d91d10cea}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,14 +47,6 @@ Global
 		{1C161366-D879-43BB-AC85-D7F5C82B9880}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1C161366-D879-43BB-AC85-D7F5C82B9880}.Release|x86.ActiveCfg = Release|x86
 		{1C161366-D879-43BB-AC85-D7F5C82B9880}.Release|x86.Build.0 = Release|x86
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Debug|x86.ActiveCfg = Debug|x86
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Debug|x86.Build.0 = Debug|x86
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Release|x86.ActiveCfg = Release|x86
-		{8B7B2AB8-91B0-4CB2-87A0-EAE2A637C55E}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,12 +25,6 @@ steps:
     FileVersionNumber: '$(Build.BuildNumber)'
     InformationalVersion: '$(Build.BuildNumber)'
 
-- task: VsixToolsUpdateVersion@1
-  displayName: 'Update Vsix Version (VS2017)'
-  inputs:
-    FileName: $(Build.SourcesDirectory)\TSVN.VS2017\source.extension.vsixmanifest
-    VersionNumber: '$(Build.BuildNumber)'
-
 - task: VsixToolsUpdateVersion@1
   displayName: 'Update Vsix Version (VS2019)'
   inputs: