Recompiled with R# SDK 2021.3.0-eap03 and removed explicit DTE dependencies (#83)

* Recompiled with R# SDK 2021.3.0-eap03 and removed explicit DTE dependencies
* Recompiled with R# SDK 2021.3.0-eap05 and migrated to R# DTE wrapper
* Bump Version
* Recompiled with R# SDK 2021.3.0-eap07 and applied api changes
* Fix OptiosPage template selector
* remove unnecessary binding redirects
* Recompiled with R# SDK 2021.3.0-eap08 and resolved dependency issues
* tested only VS2019 and VS2022

Author: rayphi

Project/Src/InstallSupport/TestCop.nuspec

@@ -8,9 +8,12 @@
   <authors>Alcaeus</authors>
   <description>Easily switch between unit tests and code. Create missing associated files. Includes highlightings and test templates to keep test projects neat and tidy. Works with NUnit, MSTest, xUnit ...</description>
   <releaseNotes>
-	  1.10.15.2-EAP BugFix - Fix automatic shortcut assignment
-	  1.10.15.1-EAP Recompiled with R# SDK 2021.3.0-eap01
-	  1.10.14.1 Upgraded to .NET 4.7.2 and Recompiled with R# SDK 2021.2
+    1.10.15.5-EAP Recompiled with R# SDK 2021.3.0-eap07 and applied api changes
+    1.10.15.4-EAP Recompiled with R# SDK 2021.3.0-eap05 and migrated to R# DTE wrapper
+    1.10.15.3-EAP Recompiled with R# SDK 2021.3.0-eap03 and removed explicit DTE dependencies
+    1.10.15.2-EAP BugFix - Fix automatic shortcut assignment
+    1.10.15.1-EAP Recompiled with R# SDK 2021.3.0-eap01
+    1.10.14.1 Upgraded to .NET 4.7.2 and Recompiled with R# SDK 2021.2
     1.10.13.1 R#2021.1 Recompiled
     1.10.12.1 R#2020.3 Recompiled
     1.10.11.2 bug fix for R# option severity screen

Project/Src/TestCop.Plugin.Tests/TestCop.Plugin.Tests.csproj

@@ -2,11 +2,6 @@
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />

Project/Src/TestCop.Plugin.Tests/app.config

@@ -6,43 +6,41 @@
 
 namespace TestCop.Plugin.Helper
 {
-    using System;
-
-    using EnvDTE;
-
-    using EnvDTE80;
-
     using JetBrains;
     using JetBrains.ReSharper.Resources.Shell;
     using JetBrains.Util.Logging;
+    using JetBrains.VsIntegration.Interop.Declarations;
+    using JetBrains.VsIntegration.Shell.EnvDte;
+
+    using System;
 
     public static class DTEHelper
     {
         public static bool VisualStudioIsPresent()
         {
-            return Shell.Instance.HasComponent<DTE2>();
+            return Shell.Instance.HasComponent<IEnvDteWrapper>();
         }
 
         public static void RefreshSolutionExplorerWindow()
         {
-            DTE2 dte = Shell.Instance.GetComponent<DTE2>();
-            dte.Commands.Raise("{1496A755-94DE-11D0-8C3F-00C04FC2AAE2}", 222, null, null);
+            IEnvDteWrapper dte = Shell.Instance.GetComponent<IEnvDteWrapper>();
+            dte.Commands.Raise(VsConstants.VSStd2K.ToString(), (int)VsKnownCommands.VSStd2KCmdID.SLNREFRESH, null, null);
         }
 
         /// <summary>
         /// Must run on main UI thread
         /// </summary>
         public static void PrintoutKeyboardShortcut(bool showOutputPane, string macroName, string keyboardShortcut)
         {
-            DTE2 dte = Shell.Instance.GetComponent<DTE2>();
+            IEnvDteWrapper dte = Shell.Instance.GetComponent<IEnvDteWrapper>();
 
             try
             {
-                Command command = dte.Commands.Item(macroName);
+                IEnvDteCommand command = dte.Commands.TryGetCommand(macroName);
 
                 if (command != null)
                 {
-                    object[] currentBindings = (object[])command.Bindings;
+                    object[] currentBindings = command.Bindings;
 
                     if (currentBindings.Length > 0)
                     {
@@ -73,15 +71,15 @@ public static void PrintoutKeyboardShortcut(bool showOutputPane, string macroNam
         /// </summary>
         public static void AssignKeyboardShortcutIfMissing(bool showOutputPane, string macroName, string keyboardShortcut)
         {
-            DTE2 dte = Shell.Instance.GetComponent<DTE2>();
+            IEnvDteWrapper dte = Shell.Instance.GetComponent<IEnvDteWrapper>();
 
             try
             {
-                Command command = dte.Commands.Item(macroName);
+                IEnvDteCommand command = dte.Commands.TryGetCommand(macroName);
 
                 if (command != null)
                 {
-                    object[] currentBindings = (object[])command.Bindings;
+                    object[] currentBindings = command.Bindings;
 
                     if (currentBindings.Length > 0)
                     {
@@ -115,41 +113,30 @@ public static void AssignKeyboardShortcutIfMissing(bool showOutputPane, string m
             }
         }
 
-        public static OutputWindowPane GetOutputWindowPane(string name, bool show)
+        public static IEnvDteOutputWindowPane GetOutputWindowPane(string name, bool show)
         {
-            DTE2 dte = Shell.Instance.GetComponent<DTE2>();
+            IEnvDteWrapper dte = Shell.Instance.GetComponent<IEnvDteWrapper>();
             return GetOutputWindowPane(dte, name, show);
         }
 
         /// <summary>
         /// Must run on main UI thread
         /// </summary>
-        private static OutputWindowPane GetOutputWindowPane(DTE2 dte, string name, bool show)
+        private static IEnvDteOutputWindowPane GetOutputWindowPane(IEnvDteWrapper dte, string name, bool show)
         {
-            /* If compilation generates:: 'EnvDTE.Constants' can be used only as one of its applicable interfaces
-             * then set DTE assembly reference property Embed Interop Types = false  */
-
-            Window win = dte.Windows.Item(Constants.vsWindowKindOutput);
+            IEnvDteWindow window = dte.Windows.TryGetWindow(VsConstants.StandardToolWindows.Output.ToString("B"));
+            window.Activate();
 
             if (show)
             {
-                win.Visible = true;
+                window.Visible = true;
             }
 
-            OutputWindow ow = (OutputWindow)win.Object;
-            OutputWindowPane owpane;
-
-            try
-            {
-                owpane = ow.OutputWindowPanes.Item(name);
-            }
-            catch (Exception)
-            {
-                owpane = ow.OutputWindowPanes.Add(name);
-            }
+            IEnvDteOutputWindow outputWindow = dte.Windows.Dte.TryCreateOutputWindow(window.Object);
+            IEnvDteOutputWindowPane outputWindowPane = outputWindow?.OutputWindowPanes.TryGetPane(name) ?? outputWindow?.OutputWindowPanes.Add(name);
 
-            owpane.Activate();
-            return owpane;
+            outputWindowPane?.Activate();
+            return outputWindowPane;
         }
     }
 }