NuGet VSIX uses hybrid VisualStudio.Extensibility SDK and VSSDK to fix F5 Debugging Flakiness (#6982)

Author: donnie-msft

Directory.Packages.props

@@ -69,6 +69,8 @@
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="17.4.221-pre" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.Managed.VS" Version="17.2.0-beta1-20502-01" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.VS" Version="17.4.221-pre" />
+    <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.14.40177" />
+    <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Build" Version=" 17.14.40177" />
     <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="18.0.2345-preview.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" Version="17.11.8" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.4.2244" />

NuGet.sln

@@ -351,6 +351,7 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3B96F91B-3B58-40ED-B06E-5CD133A79A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B96F91B-3B58-40ED-B06E-5CD133A79A63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B96F91B-3B58-40ED-B06E-5CD133A79A63}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{3B96F91B-3B58-40ED-B06E-5CD133A79A63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B96F91B-3B58-40ED-B06E-5CD133A79A63}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ECEA066F-F40D-4397-B2CE-8CA24AC22638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixignore

@@ -72,7 +72,13 @@ Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll
 Microsoft.TeamFoundation.WorkItemTracking.Proxy.resources.dll
 Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll
 Microsoft.VisualStudio.Debugger.UI.Interfaces.dll
+Microsoft.VisualStudio.Extensibility.dll
+Microsoft.VisualStudio.Extensibility.resources.dll
+Microsoft.VisualStudio.Extensibility.Contracts.dll
+Microsoft.VisualStudio.Extensibility.Contracts.resources.dll
 Microsoft.VisualStudio.Extensibility.Editor.Contracts.dll
+Microsoft.VisualStudio.Extensibility.Framework.dll
+Microsoft.VisualStudio.Extensibility.Framework.resources.dll
 Microsoft.VisualStudio.ExtensionEngineContract.dll
 Microsoft.VisualStudio.HotReload.Components.dll
 Microsoft.VisualStudio.Linux.ConnectionManager.Store.dll
@@ -92,9 +98,11 @@ Microsoft.VisualStudio.Shell.Styles.dll
 Microsoft.VisualStudio.Shell.Styles.resources.dll
 System.Drawing.Common.dll
 System.IdentityModel.Tokens.Jwt.dll
+System.IO.FileSystem.AccessControl.dll
 System.Management.Automation.dll
 System.Memory.Data.dll
 System.Net.Http.Formatting.dll
+System.Security.Cryptography.ProtectedData.dll
 System.Text.Encodings.Web.dll
 System.Web.Http.dll
 

src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixinclude

@@ -58,6 +58,8 @@ NuGet.Versioning.dll
 NuGet.Versioning.resources.dll
 
 # 3rd party dlls to keep
+Microsoft.Extensions.DependencyInjection.dll
+Microsoft.Extensions.DependencyInjection.Abstractions.dll
 Microsoft.Extensions.FileProviders.Abstractions.dll
 Microsoft.Extensions.FileSystemGlobbing.dll
 Microsoft.Extensions.Primitives.dll

src/NuGet.Clients/NuGet.VisualStudio.Client/NuGet.VisualStudio.Client.csproj

@@ -20,6 +20,7 @@
     <ExtensionInstallationFolder>Microsoft\NuGet</ExtensionInstallationFolder>
     <NgenApplicationDefault>[INSTALLDIR]\Common7\IDE\vsn.exe</NgenApplicationDefault>
     <NgenPriorityDefault>3</NgenPriorityDefault>
+    <VssdkCompatibleExtension>true</VssdkCompatibleExtension>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == 'True'">
@@ -28,6 +29,7 @@
     <StartArguments>/rootsuffix Exp /log</StartArguments>
     <CreateVsixContainer>True</CreateVsixContainer>
     <DeployExtension>True</DeployExtension>
+    <VsixDeployOnDebug>True</VsixDeployOnDebug>
   </PropertyGroup>
 
   <ItemGroup>
@@ -289,6 +291,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" PrivateAssets="all" />
+
     <!-- This is important because otherwise the VSSDK will include the unsigned version coming from the global packages folder instead of the in-place signed one from the bootstrapped packages folder -->
     <PackageReference Include="Lucene.Net" ExcludeAssets="all" GeneratePathProperty="true" />
     <!-- dependency of Lucene.net. Can delete when Lucene.net has an update with a newer dependency on sharpziplib -->

src/NuGet.Clients/NuGet.VisualStudio.Client/NuGetExtension.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.VisualStudio.Extensibility;
+
+namespace NuGet.VisualStudio.Client
+{
+    [VisualStudioContribution]
+    public class NuGetExtension : Extension
+    {
+        public override ExtensionConfiguration ExtensionConfiguration => new()
+        {
+            RequiresInProcessHosting = true,
+        };
+    }
+}

src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vsixmanifest

@@ -7,10 +7,13 @@
         <PackageId>Microsoft.VisualStudio.NuGet.Core</PackageId>
         <AllowClientRole>true</AllowClientRole>
     </Metadata>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
     <Prerequisites>
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
-    <Installation SystemComponent="true" InstalledByMsi="false" AllUsers="true">
+    <Installation ExtensionType="VSSDK+VisualStudio.Extensibility" SystemComponent="true" InstalledByMsi="false" AllUsers="true">
         <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,)">
             <ProductArchitecture>amd64</ProductArchitecture>
         </InstallationTarget>