Embed EnvDTE

Author: josetr

src/VsixTesting/Vs/VisualStudioUtil.cs

@@ -23,8 +23,7 @@ internal static partial class VisualStudioUtil
 
         public static DTE GetDTE(Process process)
         {
-            string namePattern = $@"!VisualStudio\.DTE\.(\d+\.\d+):{process.Id.ToString()}";
-            return (DTE)RunningObjectTable.GetRunningObjects(namePattern).FirstOrDefault();
+            return (DTE)GetDTEObject(process);
         }
 
         public static async Task<DTE> GetDTE(Process process, TimeSpan timeout)
@@ -164,6 +163,12 @@ internal static bool IsValidInstallationDirectory(string installationPath)
         internal static string GetApplicationPath(string installationPath)
             => Path.Combine(installationPath, "Common7", "IDE", ProcessName + ".exe");
 
+        internal static object GetDTEObject(Process process)
+        {
+            string namePattern = $@"!VisualStudio\.DTE\.(\d+\.\d+):{process.Id.ToString()}";
+            return RunningObjectTable.GetRunningObjects(namePattern).FirstOrDefault();
+        }
+
         private static string GetRootSuffixAsArgument(string rootSuffix)
             => string.IsNullOrWhiteSpace(rootSuffix) ? string.Empty : $"/rootSuffix {rootSuffix}";
     }

src/VsixTesting/VsixTesting.csproj

@@ -21,6 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="WindowsBase" />
@@ -31,4 +32,12 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
   </ItemGroup>
+
+  <Target Name="EmbedEnvDTE" AfterTargets="ResolveReferences" BeforeTargets="FindReferenceAssembliesForReferences">
+    <ItemGroup>
+      <ReferencePath Condition="'%(FileName)' == 'EnvDTE'">
+        <EmbedInteropTypes>true</EmbedInteropTypes>
+      </ReferencePath>
+    </ItemGroup>
+  </Target>
 </Project>

test/VsixTesting.Xunit.Tests/VsFactTests.cs

@@ -26,7 +26,7 @@ void FactWorks()
 
         [VsFact]
         void FactRunningInsideVisualStudio()
-            => Assert.NotNull(VisualStudioUtil.GetDTE(Process.GetCurrentProcess()));
+            => Assert.NotNull(VisualStudioUtil.GetDTEObject(Process.GetCurrentProcess()));
 
         [VsFact(Skip = "Fact Skip works.")]
         void FactSkipWorks()

test/VsixTesting.Xunit.Tests/VsTheoryTests.cs

@@ -33,7 +33,7 @@ void TheoryWorks(int number)
         [InlineData(0)]
         void TheoryRunningInsideVisualStudio(int zero)
         {
-            Assert.NotNull(VisualStudioUtil.GetDTE(Process.GetCurrentProcess()));
+            Assert.NotNull(VisualStudioUtil.GetDTEObject(Process.GetCurrentProcess()));
             Assert.Equal(0, zero);
         }