Merge VS 2022 changes to GitHub (#1152)

* Merged PR 313583: Use d17 Managed Interop This PR updates the Shell packages for Projects that reference VS assemblies. The ones that are use for VS Code are unchanged. * Merged PR 314109: Fix NuGet Restore task Fix NuGet Restore task * Merged PR 319411: Update dev17 interop packages Update dev17 interop packages * Merged PR 320586: Remove MS.VS.* packages for OpenDebugAD7 VS Remove MS.VS.* packages for OpenDebugAD7 VS Move obtaining binaries into src/SetupPackages/VC/IDE/MDD/core/files.swr instead of publishing them into the nuget package. * Merged PR 324911: Update DebuggerInterop and DebuggerEngine pkg ver Update DebuggerInterop and DebuggerEngine pkg ver - Upgrade MS.VS.Debugger.Interop from `17.0.0-preview-2-31221-277` to `17.0.0-previews-1-31307-300` - Use a d17 debugger engine `17.0.1050604-preview` - Consume self made portable PIAs - Build MakePIA for all configurations Will merge GitHub/MIEngine main in another PR. * Merged PR 325430: Publish Build Artifacts and Version for Release Publish Build Artifacts and Version for Release This enabled the release to grab the correct nuget package version for the VS Insertion * Merged PR 325870: Upgrade interop to 17.0.0-previews-1-31317-048 Upgrade interop to 17.0.0-previews-1-31317-048 With the version of MS.VS.Interop we ship with, EnvDTE.Window.get_HWND that returns an IntPtr instead of int32. This PR updates the packages to build aganist MS.VS.Interop with those changes. Test: ![image.png](https://dev.azure.com/devdiv/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/git/repositories/f211b4ac-249a-4d13-87c9-62a07c124a78/pullRequests/325870/attachments/image.png) Dialog shows up now in VS 2022 * Use public feed * Update packages * Try build with net462 * Address PR issues * Return from EOF failure
microsoft · Jun 29, 2021 · 24c2657 · 24c2657
1 parent 9072ed8
commit 24c2657
Show file tree

Hide file tree

Showing 30 changed files with 1,210 additions and 1,546 deletions.
diff --git a/IL/Microsoft.Internal.VisualStudio.Interop.il b/IL/Microsoft.Internal.VisualStudio.Interop.il
diff --git a/IL/Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime.il b/IL/Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime.il
diff --git a/MIEngine.UnixPortSupplier.nuspec b/MIEngine.UnixPortSupplier.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>VS.Redist.Debugger.MDD.UnixPortSupplier</id>
-    <version>0.0.0.0</version>
+    <version>$version$</version>
     <authors>VSEng</authors>
     <owners>VSEng</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/MIEngine.mdd.nuspec b/MIEngine.mdd.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>VS.Redist.Debugger.MDD.MIEngine</id>
-    <version>0.0.0.0</version>
+    <version>$version$</version>
     <authors>VSEng</authors>
     <owners>VSEng</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/build/Debugger.PIAs.NonPortable.Packages.settings.targets b/build/Debugger.PIAs.NonPortable.Packages.settings.targets
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <!--  'package_versions.settings.targets' must have been imported before importing this file. -->
+
+    <ItemGroup Label="Debugger.PIAs.NonPortable.Packages.props Package References">
+        <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.10.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_10_0_Version)" />
+        <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.11.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_11_0_Version)" />
+        <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.12.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_12_0_Version)" />
+        <PackageReference Include="Microsoft.VisualStudio.Debugger.InteropA" Version="$(Microsoft_VisualStudio_Debugger_InteropA_Version)" />
+
+        <PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(Microsoft_VisualStudio_Interop_Version)" />
+    </ItemGroup>
+</Project>
diff --git a/build/Debugger.PIAs.Portable.Packages.settings.targets b/build/Debugger.PIAs.Portable.Packages.settings.targets
@@ -0,0 +1,13 @@
+<!-- If you add this file to a project, make sure you add a dependency to MakePIAPortable -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <!--  'package_versions.settings.targets' must have been imported before importing this file. -->
+
+    <ItemGroup Label="Debugger.PIAs.Portable.Packages.props Package References">
+        <Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.Interop.10.0.dll" />
+        <Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.Interop.11.0.dll" />
+        <Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.Interop.12.0.dll" />
+        <Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.InteropA.dll" />
+        <Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Interop.dll" />
+    </ItemGroup>
+</Project>
diff --git a/build/package_versions.settings.targets b/build/package_versions.settings.targets
@@ -1,11 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_15_0_Version>15.8.28010</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_16_0_Version>16.8.30322.176</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
-        <Microsoft_VisualStudio_OLE_Interop_Version>16.7.30328.74</Microsoft_VisualStudio_OLE_Interop_Version>
+        <Microsoft_VisualStudio_Interop_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Interop_Version>
         <Newtonsoft_Json_VSCode_Version>9.0.1</Newtonsoft_Json_VSCode_Version>
-        <Newtonsoft_Json_VS_Version>6.0.8</Newtonsoft_Json_VS_Version>
+        <Newtonsoft_Json_VS_Version>12.0.2</Newtonsoft_Json_VS_Version>
         <Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>16.7.40526.2</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
 
         <!-- Test Packages -->
@@ -20,30 +18,22 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <Microsoft_VisualStudio_ComponentModelHost_Version>15.0.26606</Microsoft_VisualStudio_ComponentModelHost_Version>
-        <Microsoft_VisualStudio_Debugger_Engine_Version>15.0.26606</Microsoft_VisualStudio_Debugger_Engine_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_10_0_Version>10.0.30320</Microsoft_VisualStudio_Debugger_Interop_10_0_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_11_0_Version>11.0.50728</Microsoft_VisualStudio_Debugger_Interop_11_0_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_12_0_Version>12.0.21006</Microsoft_VisualStudio_Debugger_Interop_12_0_Version>
-        <Microsoft_VisualStudio_Debugger_InteropA_Version>9.0.21023</Microsoft_VisualStudio_Debugger_InteropA_Version>
-        <Microsoft_VisualStudio_Shell_15_0_Version>15.0.26606</Microsoft_VisualStudio_Shell_15_0_Version>
-        <Microsoft_VisualStudio_Shell_Framework_Version>15.0.26606</Microsoft_VisualStudio_Shell_Framework_Version>
-        <Microsoft_VisualStudio_Shell_Immutable_10_0_Version>15.0.25415</Microsoft_VisualStudio_Shell_Immutable_10_0_Version>
-        <Microsoft_VisualStudio_Shell_Immutable_11_0_Version>15.0.25415</Microsoft_VisualStudio_Shell_Immutable_11_0_Version>
-        <Microsoft_VisualStudio_Shell_Immutable_12_0_Version>15.0.25415</Microsoft_VisualStudio_Shell_Immutable_12_0_Version>
-        <Microsoft_VisualStudio_Shell_Interop_10_0_Version>10.0.30320</Microsoft_VisualStudio_Shell_Interop_10_0_Version>
-        <Microsoft_VisualStudio_Shell_Interop_11_0_Version>11.0.61031</Microsoft_VisualStudio_Shell_Interop_11_0_Version>
-        <Microsoft_VisualStudio_Shell_Interop_12_0_Version>12.0.30111</Microsoft_VisualStudio_Shell_Interop_12_0_Version>
-        <Microsoft_VisualStudio_Shell_Interop_8_0_Version>8.0.50728</Microsoft_VisualStudio_Shell_Interop_8_0_Version>
-        <Microsoft_VisualStudio_Shell_Interop_9_0_Version>9.0.30730</Microsoft_VisualStudio_Shell_Interop_9_0_Version>
-        <Microsoft_VisualStudio_Shell_Interop_Version>7.10.6072</Microsoft_VisualStudio_Shell_Interop_Version>
-        <Microsoft_VisualStudio_Threading_Version>15.3.23</Microsoft_VisualStudio_Threading_Version>
-        <Microsoft_VisualStudio_Utilities_Version>15.0.26606</Microsoft_VisualStudio_Utilities_Version>
+        <Microsoft_VisualStudio_ComponentModelHost_Version>17.0.28-g439d20ddd3</Microsoft_VisualStudio_ComponentModelHost_Version>
+        <Microsoft_VisualStudio_Debugger_Engine_Version>17.0.1051901-preview</Microsoft_VisualStudio_Debugger_Engine_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_10_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_10_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_11_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_11_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_12_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_12_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
+        <Microsoft_VisualStudio_Debugger_InteropA_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_InteropA_Version>
+        <Microsoft_VisualStudio_Shell_15_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Shell_15_0_Version>
+        <Microsoft_VisualStudio_Shell_Framework_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Shell_Framework_Version>
+        <Microsoft_VisualStudio_Threading_Version>17.0.17-alpha</Microsoft_VisualStudio_Threading_Version>
+        <Microsoft_VisualStudio_Utilities_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Utilities_Version>
         <Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
         <Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
         <Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
-        <Microsoft_VisualStudio_TextManager_Interop_Version>16.7.30328.74</Microsoft_VisualStudio_TextManager_Interop_Version>
-        <Microsoft_VSSDK_BuildTools_Version>16.8.3038</Microsoft_VSSDK_BuildTools_Version>
-        <envDTE_Version>8.0.2</envDTE_Version>
+        <Microsoft_VisualStudio_TextManager_Interop_Version>16.9.31023.347</Microsoft_VisualStudio_TextManager_Interop_Version>
+        <Microsoft_VSSDK_BuildTools_Version>17.0.1619-preview1</Microsoft_VSSDK_BuildTools_Version>
     </PropertyGroup>
 </Project>
diff --git a/build/version.settings.targets b/build/version.settings.targets
@@ -2,9 +2,9 @@
   <PropertyGroup>    
     <!--SxS: These three properties should be changed at the start of a new version, VersionZeroYear should be the year
     before the start of the project. When updating the version, also update MIEngine\metadata.json.-->
-    <MajorVersion>16</MajorVersion>
-    <MinorVersion>5</MinorVersion>
-    <VersionZeroYear>2019</VersionZeroYear>
+    <MajorVersion>17</MajorVersion>
+    <MinorVersion>0</MinorVersion>
+    <VersionZeroYear>2020</VersionZeroYear>
     <!-- Note: for compatibility, we leave the default assembly version of the repo at 14.0.
     If we ever decide to change this, make sure that you notify partner teams such as C++ IOT -->
     <AssemblyVersion Condition="'$(AssemblyVersion)'==''">14.0.0.0</AssemblyVersion>
@@ -26,4 +26,9 @@
     <BuildVersionExtended>$(BuildVersion)</BuildVersionExtended>
     <BuildVersionExtended Condition="'$(BUILD_SOURCEVERSION)'!=''">$(BuildVersionExtended) commit:$(BUILD_SOURCEVERSION)</BuildVersionExtended>
   </PropertyGroup>
+
+   <Target Name="WriteFileVersionTxt" AfterTargets="Build">
+    <WriteLinesToFile Lines="$(BuildVersion)" File="$(IntermediateOutputPath)\..\NugetPackageVersion.txt" Overwrite="true"/>
+  </Target>
+
 </Project>
diff --git a/eng/pipelines/steps/BuildSolution.yml b/eng/pipelines/steps/BuildSolution.yml
@@ -10,7 +10,7 @@ steps:
   parameters:
     Command: 'restore'
     solution: ${{ parameters.Solution }}
-    FeedsToUse: 'config'
+    selectOrConfig: 'config'
     NugetConfigPath: '$(Build.SourcesDirectory)\src\.nuget\NuGet.config'
 
 - template: ../tasks/MSBuild.yml

diff --git a/eng/pipelines/steps/PackAndPublishVSPackages.yml b/eng/pipelines/steps/PackAndPublishVSPackages.yml
@@ -7,14 +7,24 @@ parameters:
   BasePath: $(Build.StagingDirectory)
 
 steps:
+- script: |
+    for /f "delims=" %%f in ($(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt) do set NugetPackageVersion=%%f
+    echo ##vso[task.setvariable variable=NugetPackageVersion;]%NugetPackageVersion%
+  displayName: 'Get NuGet Version'
+
+- template: ../tasks/PublishPipelineArtifact.yml
+  parameters:
+    displayName: 'Publish File Version'
+    path: '$(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt' 
+    artifactName: 'PackageVersion'
+
 - template: ../tasks/NuGetCommand.yml
   parameters:
     displayName: 'NuGet pack'
     command: pack
     searchPatternPack: '$(Build.SourcesDirectory)\MIEngine.mdd.nuspec;$(Build.SourcesDirectory)\MIEngine.UnixPortSupplier.nuspec'
     configurationToPack: Release
-    versioningScheme: byEnvVar
-    versionEnvVar: 'BUILD_BUILDNUMBER'
+    buildProperties: 'version=$(NugetPackageVersion)'
     basePath: ${{ parameters.BasePath }}
 
 - template: ../tasks/NuGetCommand.yml

diff --git a/metadata.json b/metadata.json
diff --git a/src/.nuget/NuGet.config b/src/.nuget/NuGet.config
@@ -4,4 +4,4 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
-</configuration>
+</configuration>
diff --git a/src/DebugEngineHost.Stub/DebugEngineHost.Stub.csproj b/src/DebugEngineHost.Stub/DebugEngineHost.Stub.csproj
@@ -49,8 +49,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
 
+  <Import Project="..\..\build\Debugger.PIAs.Portable.Packages.settings.targets" />
+
   <ItemGroup Label="NuGet Packages">
-    <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.Portable" Version="$(Microsoft_VisualStudio_Debugger_Interop_Portable_Version)" />
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true"/>
   </ItemGroup>
 

diff --git a/src/DebugEngineHost.VSCode/DebugEngineHost.VSCode.csproj b/src/DebugEngineHost.VSCode/DebugEngineHost.VSCode.csproj
@@ -66,8 +66,9 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="..\..\build\Debugger.PIAs.Portable.Packages.settings.targets" />
+
   <ItemGroup Label="NuGet Packages">
-    <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.Portable" Version="$(Microsoft_VisualStudio_Debugger_Interop_Portable_Version)" />
     <!-- This will pull in the net45 newtonsoft.json, we want the portable-net45+wp80+win8+wpa81 version. Use this to get the install path.  -->
     <PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" GeneratePathProperty="true">
       <IncludeAssets>none</IncludeAssets>

diff --git a/src/DebugEngineHost/DebugEngineHost.csproj b/src/DebugEngineHost/DebugEngineHost.csproj
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.DebugEngineHost</RootNamespace>
     <AssemblyName>Microsoft.DebugEngineHost</AssemblyName>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <OutputPath>$(MIDefaultOutputPath)</OutputPath>
@@ -59,79 +59,17 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="..\..\build\Debugger.PIAs.NonPortable.Packages.settings.targets" />
+
   <ItemGroup Label="NuGet Packages">
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(Microsoft_VisualStudio_ComponentModelHost_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(Microsoft_VisualStudio_Shell_15_0_Version)" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="$(Microsoft_VisualStudio_Shell_Framework_Version)" />
+
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Engine" Version="$(Microsoft_VisualStudio_Debugger_Engine_Version)">
       <IncludeAssets>compile</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.10.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_10_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.11.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_11_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.12.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_12_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Debugger.InteropA" Version="$(Microsoft_VisualStudio_Debugger_InteropA_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="$(Microsoft_VisualStudio_OLE_Interop_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="$(Microsoft_VisualStudio_Shell_Framework_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(Microsoft_VisualStudio_Shell_15_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Immutable.12.0" Version="$(Microsoft_VisualStudio_Shell_Immutable_12_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="$(Microsoft_VisualStudio_Shell_Interop_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="$(Microsoft_VisualStudio_Shell_Interop_10_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="$(Microsoft_VisualStudio_Shell_Interop_11_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="$(Microsoft_VisualStudio_Shell_Interop_12_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="$(Microsoft_VisualStudio_Shell_Interop_8_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="$(Microsoft_VisualStudio_Shell_Interop_9_0_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime" Version="$(Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(Microsoft_VisualStudio_Threading_Version)">
-      <IncludeAssets>compile</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(Microsoft_VisualStudio_Threading_Version)" />
     <PackageReference Include="Microsoft.VisualStudio.Workspace" Version="$(Microsoft_VisualStudio_Workspace_Version)">
       <IncludeAssets>compile</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -143,14 +81,13 @@
   </ItemGroup>
 
   <ItemGroup Label="Assembly to Generate">
-    <GenerateAssembly Include="$(ILDir)Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime.il" />
+    <GenerateAssembly Include="$(ILDir)Microsoft.Internal.VisualStudio.Interop.il" />
   </ItemGroup>
-
+  
   <ItemGroup Label="References">
     <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime">
-      <HintPath>$(GeneratedAssembliesDir)Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+    <Reference Include="Microsoft.Internal.VisualStudio.Interop">
+      <HintPath>$(GeneratedAssembliesDir)Microsoft.Internal.VisualStudio.Interop.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/src/DebugEngineHost/HostTelemetry.cs b/src/DebugEngineHost/HostTelemetry.cs
@@ -5,10 +5,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.Internal.VisualStudio.Shell;
-using Microsoft.Internal.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 using System.Globalization;
+using Microsoft.Internal.VisualStudio.Shell;
 
 namespace Microsoft.DebugEngineHost
 {