Skip to content

Commit 24c2657

Browse files
WardenGnawWardenGnaw
authored
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
1 parent 9072ed8 commit 24c2657

30 files changed

+1210
-1546
lines changed

‎IL/Microsoft.Internal.VisualStudio.Interop.il

Lines changed: 921 additions & 0 deletions
Large diffs are not rendered by default.

‎IL/Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime.il

Lines changed: 0 additions & 1279 deletions
This file was deleted.

‎MIEngine.UnixPortSupplier.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>VS.Redist.Debugger.MDD.UnixPortSupplier</id>
5-
<version>0.0.0.0</version>
5+
<version>$version$</version>
66
<authors>VSEng</authors>
77
<owners>VSEng</owners>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎MIEngine.mdd.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>VS.Redist.Debugger.MDD.MIEngine</id>
5-
<version>0.0.0.0</version>
5+
<version>$version$</version>
66
<authors>VSEng</authors>
77
<owners>VSEng</owners>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎build/Debugger.PIAs.NonPortable.Packages.settings.targets

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- 'package_versions.settings.targets' must have been imported before importing this file. -->
3+
4+
<ItemGroup Label="Debugger.PIAs.NonPortable.Packages.props Package References">
5+
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.10.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_10_0_Version)" />
6+
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.11.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_11_0_Version)" />
7+
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.12.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_12_0_Version)" />
8+
<PackageReference Include="Microsoft.VisualStudio.Debugger.InteropA" Version="$(Microsoft_VisualStudio_Debugger_InteropA_Version)" />
9+
10+
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(Microsoft_VisualStudio_Interop_Version)" />
11+
</ItemGroup>
12+
</Project>

‎build/Debugger.PIAs.Portable.Packages.settings.targets

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- If you add this file to a project, make sure you add a dependency to MakePIAPortable -->
2+
3+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
<!-- 'package_versions.settings.targets' must have been imported before importing this file. -->
5+
6+
<ItemGroup Label="Debugger.PIAs.Portable.Packages.props Package References">
7+
<Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.Interop.10.0.dll" />
8+
<Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.Interop.11.0.dll" />
9+
<Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.Interop.12.0.dll" />
10+
<Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Debugger.InteropA.dll" />
11+
<Reference Include="$(MIDefaultOutputPath)\PIA\Microsoft.VisualStudio.Interop.dll" />
12+
</ItemGroup>
13+
</Project>

‎build/package_versions.settings.targets

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
4-
<Microsoft_VisualStudio_Debugger_Interop_15_0_Version>15.8.28010</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
5-
<Microsoft_VisualStudio_Debugger_Interop_16_0_Version>16.8.30322.176</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
6-
<Microsoft_VisualStudio_OLE_Interop_Version>16.7.30328.74</Microsoft_VisualStudio_OLE_Interop_Version>
4+
<Microsoft_VisualStudio_Interop_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Interop_Version>
75
<Newtonsoft_Json_VSCode_Version>9.0.1</Newtonsoft_Json_VSCode_Version>
8-
<Newtonsoft_Json_VS_Version>6.0.8</Newtonsoft_Json_VS_Version>
6+
<Newtonsoft_Json_VS_Version>12.0.2</Newtonsoft_Json_VS_Version>
97
<Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>16.7.40526.2</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
108

119
<!-- Test Packages -->
@@ -20,30 +18,22 @@
2018
</PropertyGroup>
2119

2220
<PropertyGroup>
23-
<Microsoft_VisualStudio_ComponentModelHost_Version>15.0.26606</Microsoft_VisualStudio_ComponentModelHost_Version>
24-
<Microsoft_VisualStudio_Debugger_Engine_Version>15.0.26606</Microsoft_VisualStudio_Debugger_Engine_Version>
25-
<Microsoft_VisualStudio_Debugger_Interop_10_0_Version>10.0.30320</Microsoft_VisualStudio_Debugger_Interop_10_0_Version>
26-
<Microsoft_VisualStudio_Debugger_Interop_11_0_Version>11.0.50728</Microsoft_VisualStudio_Debugger_Interop_11_0_Version>
27-
<Microsoft_VisualStudio_Debugger_Interop_12_0_Version>12.0.21006</Microsoft_VisualStudio_Debugger_Interop_12_0_Version>
28-
<Microsoft_VisualStudio_Debugger_InteropA_Version>9.0.21023</Microsoft_VisualStudio_Debugger_InteropA_Version>
29-
<Microsoft_VisualStudio_Shell_15_0_Version>15.0.26606</Microsoft_VisualStudio_Shell_15_0_Version>
30-
<Microsoft_VisualStudio_Shell_Framework_Version>15.0.26606</Microsoft_VisualStudio_Shell_Framework_Version>
31-
<Microsoft_VisualStudio_Shell_Immutable_10_0_Version>15.0.25415</Microsoft_VisualStudio_Shell_Immutable_10_0_Version>
32-
<Microsoft_VisualStudio_Shell_Immutable_11_0_Version>15.0.25415</Microsoft_VisualStudio_Shell_Immutable_11_0_Version>
33-
<Microsoft_VisualStudio_Shell_Immutable_12_0_Version>15.0.25415</Microsoft_VisualStudio_Shell_Immutable_12_0_Version>
34-
<Microsoft_VisualStudio_Shell_Interop_10_0_Version>10.0.30320</Microsoft_VisualStudio_Shell_Interop_10_0_Version>
35-
<Microsoft_VisualStudio_Shell_Interop_11_0_Version>11.0.61031</Microsoft_VisualStudio_Shell_Interop_11_0_Version>
36-
<Microsoft_VisualStudio_Shell_Interop_12_0_Version>12.0.30111</Microsoft_VisualStudio_Shell_Interop_12_0_Version>
37-
<Microsoft_VisualStudio_Shell_Interop_8_0_Version>8.0.50728</Microsoft_VisualStudio_Shell_Interop_8_0_Version>
38-
<Microsoft_VisualStudio_Shell_Interop_9_0_Version>9.0.30730</Microsoft_VisualStudio_Shell_Interop_9_0_Version>
39-
<Microsoft_VisualStudio_Shell_Interop_Version>7.10.6072</Microsoft_VisualStudio_Shell_Interop_Version>
40-
<Microsoft_VisualStudio_Threading_Version>15.3.23</Microsoft_VisualStudio_Threading_Version>
41-
<Microsoft_VisualStudio_Utilities_Version>15.0.26606</Microsoft_VisualStudio_Utilities_Version>
21+
<Microsoft_VisualStudio_ComponentModelHost_Version>17.0.28-g439d20ddd3</Microsoft_VisualStudio_ComponentModelHost_Version>
22+
<Microsoft_VisualStudio_Debugger_Engine_Version>17.0.1051901-preview</Microsoft_VisualStudio_Debugger_Engine_Version>
23+
<Microsoft_VisualStudio_Debugger_Interop_10_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_10_0_Version>
24+
<Microsoft_VisualStudio_Debugger_Interop_11_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_11_0_Version>
25+
<Microsoft_VisualStudio_Debugger_Interop_12_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_12_0_Version>
26+
<Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
27+
<Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
28+
<Microsoft_VisualStudio_Debugger_InteropA_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_InteropA_Version>
29+
<Microsoft_VisualStudio_Shell_15_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Shell_15_0_Version>
30+
<Microsoft_VisualStudio_Shell_Framework_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Shell_Framework_Version>
31+
<Microsoft_VisualStudio_Threading_Version>17.0.17-alpha</Microsoft_VisualStudio_Threading_Version>
32+
<Microsoft_VisualStudio_Utilities_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Utilities_Version>
4233
<Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
4334
<Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
4435
<Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
45-
<Microsoft_VisualStudio_TextManager_Interop_Version>16.7.30328.74</Microsoft_VisualStudio_TextManager_Interop_Version>
46-
<Microsoft_VSSDK_BuildTools_Version>16.8.3038</Microsoft_VSSDK_BuildTools_Version>
47-
<envDTE_Version>8.0.2</envDTE_Version>
36+
<Microsoft_VisualStudio_TextManager_Interop_Version>16.9.31023.347</Microsoft_VisualStudio_TextManager_Interop_Version>
37+
<Microsoft_VSSDK_BuildTools_Version>17.0.1619-preview1</Microsoft_VSSDK_BuildTools_Version>
4838
</PropertyGroup>
4939
</Project>

‎build/version.settings.targets

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<PropertyGroup>
33
<!--SxS: These three properties should be changed at the start of a new version, VersionZeroYear should be the year
44
before the start of the project. When updating the version, also update MIEngine\metadata.json.-->
5-
<MajorVersion>16</MajorVersion>
6-
<MinorVersion>5</MinorVersion>
7-
<VersionZeroYear>2019</VersionZeroYear>
5+
<MajorVersion>17</MajorVersion>
6+
<MinorVersion>0</MinorVersion>
7+
<VersionZeroYear>2020</VersionZeroYear>
88
<!-- Note: for compatibility, we leave the default assembly version of the repo at 14.0.
99
If we ever decide to change this, make sure that you notify partner teams such as C++ IOT -->
1010
<AssemblyVersion Condition="'$(AssemblyVersion)'==''">14.0.0.0</AssemblyVersion>
@@ -26,4 +26,9 @@
2626
<BuildVersionExtended>$(BuildVersion)</BuildVersionExtended>
2727
<BuildVersionExtended Condition="'$(BUILD_SOURCEVERSION)'!=''">$(BuildVersionExtended) commit:$(BUILD_SOURCEVERSION)</BuildVersionExtended>
2828
</PropertyGroup>
29+
30+
<Target Name="WriteFileVersionTxt" AfterTargets="Build">
31+
<WriteLinesToFile Lines="$(BuildVersion)" File="$(IntermediateOutputPath)\..\NugetPackageVersion.txt" Overwrite="true"/>
32+
</Target>
33+
2934
</Project>

‎eng/pipelines/steps/BuildSolution.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
parameters:
1111
Command: 'restore'
1212
solution: ${{ parameters.Solution }}
13-
FeedsToUse: 'config'
13+
selectOrConfig: 'config'
1414
NugetConfigPath: '$(Build.SourcesDirectory)\src\.nuget\NuGet.config'
1515

1616
- template: ../tasks/MSBuild.yml

‎eng/pipelines/steps/PackAndPublishVSPackages.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,24 @@ parameters:
77
BasePath: $(Build.StagingDirectory)
88

99
steps:
10+
- script: |
11+
for /f "delims=" %%f in ($(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt) do set NugetPackageVersion=%%f
12+
echo ##vso[task.setvariable variable=NugetPackageVersion;]%NugetPackageVersion%
13+
displayName: 'Get NuGet Version'
14+
15+
- template: ../tasks/PublishPipelineArtifact.yml
16+
parameters:
17+
displayName: 'Publish File Version'
18+
path: '$(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt'
19+
artifactName: 'PackageVersion'
20+
1021
- template: ../tasks/NuGetCommand.yml
1122
parameters:
1223
displayName: 'NuGet pack'
1324
command: pack
1425
searchPatternPack: '$(Build.SourcesDirectory)\MIEngine.mdd.nuspec;$(Build.SourcesDirectory)\MIEngine.UnixPortSupplier.nuspec'
1526
configurationToPack: Release
16-
versioningScheme: byEnvVar
17-
versionEnvVar: 'BUILD_BUILDNUMBER'
27+
buildProperties: 'version=$(NugetPackageVersion)'
1828
basePath: ${{ parameters.BasePath }}
1929

2030
- template: ../tasks/NuGetCommand.yml

‎metadata.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/.nuget/NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
<clear />
55
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
66
</packageSources>
7-
</configuration>
7+
</configuration>

‎src/DebugEngineHost.Stub/DebugEngineHost.Stub.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@
4949
<WarningLevel>4</WarningLevel>
5050
</PropertyGroup>
5151

52+
<Import Project="..\..\build\Debugger.PIAs.Portable.Packages.settings.targets" />
53+
5254
<ItemGroup Label="NuGet Packages">
53-
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.Portable" Version="$(Microsoft_VisualStudio_Debugger_Interop_Portable_Version)" />
5455
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true"/>
5556
</ItemGroup>
5657

‎src/DebugEngineHost.VSCode/DebugEngineHost.VSCode.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@
6666
</EmbeddedResource>
6767
</ItemGroup>
6868

69+
<Import Project="..\..\build\Debugger.PIAs.Portable.Packages.settings.targets" />
70+
6971
<ItemGroup Label="NuGet Packages">
70-
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.Portable" Version="$(Microsoft_VisualStudio_Debugger_Interop_Portable_Version)" />
7172
<!-- This will pull in the net45 newtonsoft.json, we want the portable-net45+wp80+win8+wpa81 version. Use this to get the install path. -->
7273
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" GeneratePathProperty="true">
7374
<IncludeAssets>none</IncludeAssets>

‎src/DebugEngineHost/DebugEngineHost.csproj

Lines changed: 11 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Microsoft.DebugEngineHost</RootNamespace>
1515
<AssemblyName>Microsoft.DebugEngineHost</AssemblyName>
16-
<TargetFramework>net462</TargetFramework>
16+
<TargetFramework>net472</TargetFramework>
1717
<FileAlignment>512</FileAlignment>
1818
<TargetFrameworkProfile />
1919
<OutputPath>$(MIDefaultOutputPath)</OutputPath>
@@ -59,79 +59,17 @@
5959
</EmbeddedResource>
6060
</ItemGroup>
6161

62+
<Import Project="..\..\build\Debugger.PIAs.NonPortable.Packages.settings.targets" />
63+
6264
<ItemGroup Label="NuGet Packages">
63-
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(Microsoft_VisualStudio_ComponentModelHost_Version)">
64-
<IncludeAssets>compile</IncludeAssets>
65-
<PrivateAssets>all</PrivateAssets>
66-
</PackageReference>
65+
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(Microsoft_VisualStudio_Shell_15_0_Version)" />
66+
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="$(Microsoft_VisualStudio_Shell_Framework_Version)" />
67+
6768
<PackageReference Include="Microsoft.VisualStudio.Debugger.Engine" Version="$(Microsoft_VisualStudio_Debugger_Engine_Version)">
6869
<IncludeAssets>compile</IncludeAssets>
6970
<PrivateAssets>all</PrivateAssets>
7071
</PackageReference>
71-
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.10.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_10_0_Version)">
72-
<IncludeAssets>compile</IncludeAssets>
73-
<PrivateAssets>all</PrivateAssets>
74-
</PackageReference>
75-
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.11.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_11_0_Version)">
76-
<IncludeAssets>compile</IncludeAssets>
77-
<PrivateAssets>all</PrivateAssets>
78-
</PackageReference>
79-
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.12.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_12_0_Version)">
80-
<IncludeAssets>compile</IncludeAssets>
81-
<PrivateAssets>all</PrivateAssets>
82-
</PackageReference>
83-
<PackageReference Include="Microsoft.VisualStudio.Debugger.InteropA" Version="$(Microsoft_VisualStudio_Debugger_InteropA_Version)">
84-
<IncludeAssets>compile</IncludeAssets>
85-
<PrivateAssets>all</PrivateAssets>
86-
</PackageReference>
87-
<PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="$(Microsoft_VisualStudio_OLE_Interop_Version)">
88-
<IncludeAssets>compile</IncludeAssets>
89-
<PrivateAssets>all</PrivateAssets>
90-
</PackageReference>
91-
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="$(Microsoft_VisualStudio_Shell_Framework_Version)">
92-
<IncludeAssets>compile</IncludeAssets>
93-
<PrivateAssets>all</PrivateAssets>
94-
</PackageReference>
95-
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(Microsoft_VisualStudio_Shell_15_0_Version)">
96-
<IncludeAssets>compile</IncludeAssets>
97-
<PrivateAssets>all</PrivateAssets>
98-
</PackageReference>
99-
<PackageReference Include="Microsoft.VisualStudio.Shell.Immutable.12.0" Version="$(Microsoft_VisualStudio_Shell_Immutable_12_0_Version)">
100-
<IncludeAssets>compile</IncludeAssets>
101-
<PrivateAssets>all</PrivateAssets>
102-
</PackageReference>
103-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="$(Microsoft_VisualStudio_Shell_Interop_Version)">
104-
<IncludeAssets>compile</IncludeAssets>
105-
<PrivateAssets>all</PrivateAssets>
106-
</PackageReference>
107-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="$(Microsoft_VisualStudio_Shell_Interop_10_0_Version)">
108-
<IncludeAssets>compile</IncludeAssets>
109-
<PrivateAssets>all</PrivateAssets>
110-
</PackageReference>
111-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="$(Microsoft_VisualStudio_Shell_Interop_11_0_Version)">
112-
<IncludeAssets>compile</IncludeAssets>
113-
<PrivateAssets>all</PrivateAssets>
114-
</PackageReference>
115-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="$(Microsoft_VisualStudio_Shell_Interop_12_0_Version)">
116-
<IncludeAssets>compile</IncludeAssets>
117-
<PrivateAssets>all</PrivateAssets>
118-
</PackageReference>
119-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="$(Microsoft_VisualStudio_Shell_Interop_8_0_Version)">
120-
<IncludeAssets>compile</IncludeAssets>
121-
<PrivateAssets>all</PrivateAssets>
122-
</PackageReference>
123-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="$(Microsoft_VisualStudio_Shell_Interop_9_0_Version)">
124-
<IncludeAssets>compile</IncludeAssets>
125-
<PrivateAssets>all</PrivateAssets>
126-
</PackageReference>
127-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime" Version="$(Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version)">
128-
<IncludeAssets>compile</IncludeAssets>
129-
<PrivateAssets>all</PrivateAssets>
130-
</PackageReference>
131-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(Microsoft_VisualStudio_Threading_Version)">
132-
<IncludeAssets>compile</IncludeAssets>
133-
<PrivateAssets>all</PrivateAssets>
134-
</PackageReference>
72+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(Microsoft_VisualStudio_Threading_Version)" />
13573
<PackageReference Include="Microsoft.VisualStudio.Workspace" Version="$(Microsoft_VisualStudio_Workspace_Version)">
13674
<IncludeAssets>compile</IncludeAssets>
13775
<PrivateAssets>all</PrivateAssets>
@@ -143,14 +81,13 @@
14381
</ItemGroup>
14482

14583
<ItemGroup Label="Assembly to Generate">
146-
<GenerateAssembly Include="$(ILDir)Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime.il" />
84+
<GenerateAssembly Include="$(ILDir)Microsoft.Internal.VisualStudio.Interop.il" />
14785
</ItemGroup>
148-
86+
14987
<ItemGroup Label="References">
15088
<Reference Include="System.ComponentModel.Composition" />
151-
<Reference Include="Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime">
152-
<HintPath>$(GeneratedAssembliesDir)Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime.dll</HintPath>
153-
<EmbedInteropTypes>True</EmbedInteropTypes>
89+
<Reference Include="Microsoft.Internal.VisualStudio.Interop">
90+
<HintPath>$(GeneratedAssembliesDir)Microsoft.Internal.VisualStudio.Interop.dll</HintPath>
15491
</Reference>
15592
</ItemGroup>
15693

‎src/DebugEngineHost/HostTelemetry.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
using System.Collections.Generic;
66
using System.Diagnostics;
77
using System.Linq;
8-
using Microsoft.Internal.VisualStudio.Shell;
9-
using Microsoft.Internal.VisualStudio.Shell.Interop;
108
using Microsoft.VisualStudio.Shell;
9+
using Microsoft.VisualStudio.Shell.Interop;
1110
using System.Globalization;
11+
using Microsoft.Internal.VisualStudio.Shell;
1212

1313
namespace Microsoft.DebugEngineHost
1414
{

0 commit comments

Comments
 (0)