Merge pull request #17 from Lombiq/issue/VSIX-38

VSIX-38: VS 2022 upgrade
Lombiq · Feb 23, 2022 · 8859f14 · 8859f14
2 parents 8feda54 + 8db0670
commit 8859f14
Show file tree

Hide file tree

Showing 23 changed files with 886 additions and 868 deletions.
diff --git a/Lombiq.Vsix.Orchard.sln b/Lombiq.Vsix.Orchard.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29905.134
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.Vsix.Orchard", "Lombiq.Vsix.Orchard\Lombiq.Vsix.Orchard.csproj", "{EF02401B-9EB3-4E06-8C34-8411700E4B58}"
 EndProject
@@ -14,13 +14,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Debug|x86.ActiveCfg = Debug|x86
+		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Debug|x86.Build.0 = Debug|x86
 		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Release|x86.ActiveCfg = Release|x86
+		{EF02401B-9EB3-4E06-8C34-8411700E4B58}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Lombiq.Vsix.Orchard/Commands/InjectDependencyCommand.cs b/Lombiq.Vsix.Orchard/Commands/InjectDependencyCommand.cs
@@ -60,6 +60,7 @@ private void MenuItemCallback(object sender, EventArgs e) =>
 
         private async Task MenuItemCallbackAsync()
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             const string injectDependencyCaption = "Inject Dependency";
             var dte = await _package.GetDteAsync().ConfigureAwait(true);
 

diff --git a/Lombiq.Vsix.Orchard/Commands/OpenErrorLogCommand.cs b/Lombiq.Vsix.Orchard/Commands/OpenErrorLogCommand.cs
@@ -150,6 +150,7 @@ private void LogWatcherSettingsUpdatedCallback(object sender, LogWatcherSettings
 
         private async Task LogWatcherSettingsUpdatedCallbackAsync(LogWatcherSettingsUpdatedEventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             var isEnabled = e.Settings.LogWatcherEnabled;
             var orchardLogWatcherToolbar = ((CommandBars)(await _package.GetDteAsync()
                 .ConfigureAwait(true)).CommandBars)[CommandBarNames.OrchardLogWatcherToolbarName];
@@ -178,6 +179,7 @@ await Task.Run(() =>
 
         private async Task UpdateOpenErrorLogCommandAccessibilityAndTextAsync(ILogFileStatus logFileStatus = null)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             var logWatcherSettings = await _logWatcherSettingsAccessor.GetSettingsAsync().ConfigureAwait(true);
 
             if (!(await _package.GetDteAsync().ConfigureAwait(true)).SolutionIsOpen())

diff --git a/Lombiq.Vsix.Orchard/Constants/DependencyInjectorErrorCodes.cs b/Lombiq.Vsix.Orchard/Constants/DependencyInjectorErrorCodes.cs
@@ -1,4 +1,4 @@
-namespace Lombiq.Vsix.Orchard.Constants
+namespace Lombiq.Vsix.Orchard.Constants
 {
     internal static class DependencyInjectorErrorCodes
     {

diff --git a/Lombiq.Vsix.Orchard/Constants/ExtensionVersion.cs b/Lombiq.Vsix.Orchard/Constants/ExtensionVersion.cs
@@ -1,7 +1,7 @@
-namespace Lombiq.Vsix.Orchard.Constants
+namespace Lombiq.Vsix.Orchard.Constants
 {
     internal static class ExtensionVersion
     {
-        public const string Current = "1.5.4";
+        public const string Current = "1.5.40";
     }
 }
diff --git a/Lombiq.Vsix.Orchard/Extensions/DTEExtensions.cs b/Lombiq.Vsix.Orchard/Extensions/DTEExtensions.cs
@@ -1,7 +1,13 @@
-namespace EnvDTE
-{
-    public static class DteExtensions
-    {
-        public static bool SolutionIsOpen(this DTE dte) => dte.Solution.IsOpen;
-    }
-}
+namespace EnvDTE
+{
+    public static class DteExtensions
+    {
+        public static bool SolutionIsOpen(this DTE dte)
+        {
+            // We should never get an exception here. This is just to ensure we access DTE on the main thread and get
+            // rid of the VSTHRD010 violation.
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+            return dte.Solution.IsOpen;
+        }
+    }
+}
diff --git a/Lombiq.Vsix.Orchard/Forms/InjectDependencyDialog.Designer.cs b/Lombiq.Vsix.Orchard/Forms/InjectDependencyDialog.Designer.cs
diff --git a/Lombiq.Vsix.Orchard/Forms/InjectDependencyDialog.resx b/Lombiq.Vsix.Orchard/Forms/InjectDependencyDialog.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,4 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-</root>
+</root>
diff --git a/Lombiq.Vsix.Orchard/Helpers/DialogHelpers.cs b/Lombiq.Vsix.Orchard/Helpers/DialogHelpers.cs
@@ -1,4 +1,4 @@
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace Lombiq.Vsix.Orchard.Helpers
 {

diff --git a/Lombiq.Vsix.Orchard/Licence.md b/Lombiq.Vsix.Orchard/Licence.md
@@ -10,4 +10,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.