Fix VsCredentialProviderAdapterTests and skip failing FSharp E2E tests

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/IDE/VSSolutionManager.cs

@@ -331,6 +331,8 @@ private static bool IsRestoredOnSolutionLoad(NuGetProject nuGetProject)
             return false;
         }
 
+        public CancellationToken VsShutdownToken => VsShellUtilities.ShutdownToken;
+
         /// <summary>
         /// IsSolutionOpen is true, if the dte solution is open
         /// and is saved as required

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/VsCredentialProviderAdapter.cs

@@ -5,7 +5,6 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 using NuGet.Configuration;
 using NuGet.Credentials;
@@ -20,15 +19,12 @@ namespace NuGet.PackageManagement.VisualStudio
     public class VsCredentialProviderAdapter : ICredentialProvider
     {
         private readonly IVsCredentialProvider _provider;
+        private readonly IVsSolutionManager _solutionManager;
 
-        public VsCredentialProviderAdapter(IVsCredentialProvider provider)
+        public VsCredentialProviderAdapter(IVsCredentialProvider provider, IVsSolutionManager solutionManager)
         {
-            if (provider == null)
-            {
-                throw new ArgumentNullException(nameof(provider));
-            }
-
-            _provider = provider;
+            _provider = provider ?? throw new ArgumentNullException(nameof(provider));
+            _solutionManager = solutionManager ?? throw new ArgumentNullException(nameof(solutionManager));
         }
 
         public string Id => _provider.GetType().FullName;
@@ -59,7 +55,7 @@ public async Task<CredentialResponse> GetAsync(
                 isProxyRequest: type == CredentialRequestType.Proxy,
                 isRetry: isRetry,
                 nonInteractive: nonInteractive,
-                cancellationToken: VsShellUtilities.ShutdownToken);
+                cancellationToken: _solutionManager.VsShutdownToken);
 
             // Since the above task will only cancel when VS is shutting down, we can abandon the task when our own cancellation token
             // requests cancellation and we're not in interactive mode. This lets us free resources (like concurrent requests per host limits)

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/VsCredentialProviderImporter.cs

@@ -57,6 +57,9 @@ public VsCredentialProviderImporter(
         [ImportMany(typeof(IVsCredentialProvider))]
         public IEnumerable<Lazy<IVsCredentialProvider>> ImportedProviders { get; set; }
 
+        [Import]
+        public IVsSolutionManager SolutionManager { get; set; }
+
         /// <summary>
         /// Plugin providers are entered loaded the same way as other nuget extensions,
         /// matching any extension named CredentialProvider.*.exe.
@@ -88,7 +91,7 @@ private void TryImportCredentialProviders(
                     try
                     {
                         var credentialProvider = credentialProviderFactory.Value;
-                        importedProviders.Add(new VsCredentialProviderAdapter(credentialProvider));
+                        importedProviders.Add(new VsCredentialProviderAdapter(credentialProvider, SolutionManager));
                     }
                     catch (Exception exception)
                     {

src/NuGet.Clients/NuGet.VisualStudio.Common/IDE/IVsSolutionManager.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using NuGet.ProjectManagement;
 using NuGet.VisualStudio;
@@ -101,5 +102,8 @@ public interface IVsSolutionManager : ISolutionManager
         /// Gets the current open solution directory. <see cref="null"/> if the there's no open solution.
         /// </summary>
         Task<string> GetSolutionDirectoryAsync();
+
+        /// <summary>Mockable indirection for <see cref="Microsoft.VisualStudio.Shell.VsShellUtilities.ShutdownToken"/></summary>
+        CancellationToken VsShutdownToken { get; }
     }
 }

test/EndToEnd/tests/InstallPackageTest.ps1

@@ -458,7 +458,8 @@ function Test-AddBindingRedirectToWebsiteWithNonExistingOutputPath {
 }
 
 function Test-InstallCanPipeToFSharpProjects {
-    param($context)    
+    [SkipTest('https://github.com/NuGet/Home/issues/11982')]
+    param($context)
     # Arrange
     $p = New-FSharpLibrary
     Build-Solution # wait for project nomination

test/EndToEnd/tests/UninstallPackageTest.ps1

@@ -120,6 +120,7 @@ function Test-UninstallPackageWithNestedContentFiles {
 }
 
 function Test-SimpleFSharpUninstall {
+    [SkipTest('https://github.com/NuGet/Home/issues/11982')]
     param($context)
 
     # Arrange

test/EndToEnd/tests/UpdatePackageTest.ps1

@@ -632,9 +632,8 @@ function Test-UpdateAllPackagesInSolution {
 }
 
 function Test-UpdatePackageOnAnFSharpProjectWithMultiplePackages {
-    param(
-        $context
-    )
+    [SkipTest('https://github.com/NuGet/Home/issues/11982')]
+    param($context)
 
     # Arrange
     $p = New-FSharpLibrary

test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/Services/NuGetProjectManagerServiceTests.cs

@@ -1755,6 +1755,8 @@ private sealed class TestVsSolutionManager : IVsSolutionManager, IDisposable
 
             public string SolutionDirectory => _directory.Path;
 
+            public CancellationToken VsShutdownToken => CancellationToken.None;
+
             public bool IsSolutionOpen => throw new NotImplementedException();
 
             public INuGetProjectContext NuGetProjectContext { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/VsCredentialProviderAdapterTests.cs

@@ -5,6 +5,7 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using Moq;
 using NuGet.Configuration;
 using NuGet.Credentials;
 using NuGet.VisualStudio;
@@ -14,6 +15,15 @@ namespace NuGet.PackageManagement.VisualStudio.Test
 {
     public class VsCredentialProviderAdapterTests
     {
+        private Mock<IVsSolutionManager> _solutionManager;
+
+        public VsCredentialProviderAdapterTests()
+        {
+            _solutionManager = new Mock<IVsSolutionManager>();
+            _solutionManager.SetupGet(sm => sm.VsShutdownToken)
+                .Returns(CancellationToken.None);
+        }
+
         private class TestVsCredentialProvider : IVsCredentialProvider
         {
             private readonly ICredentials _testResponse;
@@ -35,7 +45,7 @@ public async Task WhenCredsNull_ThenReturnProviderNotApplicable()
         {
             // Arrange
             var provider = new TestVsCredentialProvider(null);
-            var adapter = new VsCredentialProviderAdapter(provider);
+            var adapter = new VsCredentialProviderAdapter(provider, _solutionManager.Object);
 
             // Act
             var result = await adapter.GetAsync(
@@ -58,7 +68,7 @@ public async Task WhenAnyValidVsCredentialResponse_Ok()
             // Arrange
             var expected = new NetworkCredential("foo", "bar");
             var provider = new TestVsCredentialProvider(expected);
-            var adapter = new VsCredentialProviderAdapter(provider);
+            var adapter = new VsCredentialProviderAdapter(provider, _solutionManager.Object);
 
             // Act
             var result = await adapter.GetAsync(