Use IAsyncServiceProvider when available

Author: sharwell

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/InProcComponent2.cs

@@ -8,7 +8,10 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
     using System.Windows;
     using System.Windows.Threading;
     using Microsoft.VisualStudio.Threading;
+    using static Microsoft.VisualStudio.Shell.VsTaskLibraryHelper;
     using DTE = EnvDTE.DTE;
+    using IAsyncServiceProvider = Microsoft.VisualStudio.Shell.Interop.IAsyncServiceProvider;
+    using SAsyncServiceProvider = Microsoft.VisualStudio.Shell.Interop.SAsyncServiceProvider;
     using SDTE = Microsoft.VisualStudio.Shell.Interop.SDTE;
     using ServiceProvider = Microsoft.VisualStudio.Shell.ServiceProvider;
 
@@ -29,7 +32,15 @@ protected async Task<TInterface> GetGlobalServiceAsync<TService, TInterface>()
             where TInterface : class
         {
             await JoinableTaskFactory.SwitchToMainThreadAsync();
-            return (TInterface)ServiceProvider.GlobalProvider.GetService(typeof(TService));
+
+            if (ServiceProvider.GlobalProvider.GetService(typeof(SAsyncServiceProvider)) is IAsyncServiceProvider asyncServiceProvider)
+            {
+                return (TInterface)await asyncServiceProvider.QueryServiceAsync(typeof(TService).GUID);
+            }
+            else
+            {
+                return (TInterface)ServiceProvider.GlobalProvider.GetService(typeof(TService));
+            }
         }
 
         protected async Task<DTE> GetDTEAsync()

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Tvl.VisualStudio.MouseFastScroll.IntegrationTests.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="InputSimulatorPlus" Version="1.0.6" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="12.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30111" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="14.3.26929" />
     <PackageReference Include="VSSDK.ComponentModelHost.11" Version="11.0.4" />
     <PackageReference Include="VSSDK.DTE.8" Version="8.0.4" />
     <PackageReference Include="VSSDK.Shell.11" Version="11.0.4" />