Major change:

lukka · lukka · commit e845aeac424c · 2025-12-19T16:34:44.000-08:00
prevent StackOverflow exceptions in Visual Studio 2026 for users who have ExtensionManager installed: fixed the assembly resolver to prevent recursion and version mismatches

Minor changes: update dependencies, error handling, and code clarity
- Add Community.VisualStudio.Toolkit.15, MessagePack, Microsoft.IO.Redist, and update System.Text.Json to 8.0.5 in all projects
- Refactor generator method names for clarity and consistency
- Wrap InstallExportDialogViewModel.OnOk in try-catch; suppress VSTHRD100 warning
- Update VSIX project files for consistent package versions
diff --git a/src/ExtensionManager.Manifest/ExtensionManager.Manifest.csproj b/src/ExtensionManager.Manifest/ExtensionManager.Manifest.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15" Version="15.0.507" />
+    <PackageReference Include="MessagePack" Version="2.5.187" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
     <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ExtensionManager.UI/ExtensionManager.UI.csproj b/src/ExtensionManager.UI/ExtensionManager.UI.csproj
@@ -5,9 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15" Version="15.0.507" />
+    <PackageReference Include="MessagePack" Version="2.5.187" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
     <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ExtensionManager.UI/GlobalSuppressions.cs b/src/ExtensionManager.UI/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "<Pending>", Scope = "member", Target = "~M:ExtensionManager.UI.ViewModels.InstallExportDialogViewModel`1.OnOk")]
diff --git a/src/ExtensionManager.UI/ViewModels/InstallExportDialogViewModel.cs b/src/ExtensionManager.UI/ViewModels/InstallExportDialogViewModel.cs
@@ -24,10 +24,18 @@ protected override bool CanOk()
     }
     protected override async void OnOk()
     {
-        await RunWorkAsync();
+        try
+        {
+            await RunWorkAsync();
 
-        RequestClose();
+            RequestClose();
+        }
+        catch
+        {
+            // Safely show error to user
+        }
     }
+
     private async Task RunWorkAsync()
     {
         using var cts = new CancellationTokenSource();
diff --git a/src/ExtensionManager.VisualStudio.Abstractions/ExtensionManager.VisualStudio.Abstractions.csproj b/src/ExtensionManager.VisualStudio.Abstractions/ExtensionManager.VisualStudio.Abstractions.csproj
@@ -6,7 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15" Version="15.0.507" />
+    <PackageReference Include="MessagePack" Version="2.5.187" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
   
 </Project>
diff --git a/src/ExtensionManager.VisualStudio.Adapter.Abstractions/ExtensionManager.VisualStudio.Adapter.Abstractions.csproj b/src/ExtensionManager.VisualStudio.Adapter.Abstractions/ExtensionManager.VisualStudio.Adapter.Abstractions.csproj
@@ -4,6 +4,13 @@
     <RootNamespace>ExtensionManager.VisualStudio.Adapter</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15" Version="15.0.507" />
+    <PackageReference Include="MessagePack" Version="2.5.187" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\ExtensionManager.VisualStudio.Abstractions\ExtensionManager.VisualStudio.Abstractions.csproj" />
   </ItemGroup>
diff --git a/src/ExtensionManager.VisualStudio.Adapter.Generator/ExtensionManager.VisualStudio.Adapter.Generator.csproj b/src/ExtensionManager.VisualStudio.Adapter.Generator/ExtensionManager.VisualStudio.Adapter.Generator.csproj
@@ -10,8 +10,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15" Version="15.0.507" />
+    <PackageReference Include="MessagePack" Version="2.5.187" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ExtensionManager.VisualStudio.Adapter.Generator/Internal/GeneratorReflector.cs b/src/ExtensionManager.VisualStudio.Adapter.Generator/Internal/GeneratorReflector.cs
@@ -48,7 +48,7 @@ private MemberInfo GetMember(Type type, MemberTypes memberType, string name)
     public Type IVsExtensionRepository() => GetType("Microsoft.VisualStudio.ExtensionManager.IVsExtensionRepository");
     public Type SVsExtensionRepository() => GetType("Microsoft.VisualStudio.ExtensionManager.SVsExtensionRepository");
 
-    public MethodInfo VS_GetRequiredServiceAsync(Type serviceType, Type interfaceType)
+    public MethodInfo VS_GetRequiredService(Type serviceType, Type interfaceType)
     {
         return GetType("Community.VisualStudio.Toolkit.VS")
             .GetMethodOrThrow("GetRequiredServiceAsync")
diff --git a/src/ExtensionManager.VisualStudio.Adapter.Generator/Types/Extensions/ExtensionManagerAdapterGenerator.cs b/src/ExtensionManager.VisualStudio.Adapter.Generator/Types/Extensions/ExtensionManagerAdapterGenerator.cs
@@ -18,10 +18,10 @@ public Type Emit(GeneratorContext context)
             {
                 emit.Implement(context.Reflect.AdapterInterface());
 
-                emit.ImplementMethod(context.Reflect.Adapter_GetManagerAsync())
+                emit.ImplementMethod(context.Reflect.Adapter_GetManager())
                     .EmitIL(il =>
                     {
-                        il.Emit(OpCodes.Call, context.Reflect.VS_GetManagerServiceAsync());
+                        il.Emit(OpCodes.Call, context.Reflect.VS_GetManagerService());
                         il.Emit(OpCodes.Ret);
                     });
 
@@ -50,11 +50,11 @@ file static class Extensions
 {
     public static Type AdapterInterface(this GeneratorReflector reflect) => typeof(IVSExtensionManagerAdapter<,>).MakeGenericType(reflect.IVsExtensionManager(), reflect.IInstalledExtension());
 
-    public static MethodInfo Adapter_GetManagerAsync(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.GetManagerAsync));
+    public static MethodInfo Adapter_GetManager(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.GetManagerAsync));
     public static MethodInfo Adapter_GetInstalledExtensions(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.GetInstalledExtensions));
     public static MethodInfo Adapter_CreateInstalledExtensionInfo(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.CreateInstalledExtensionInfo));
 
-    public static MethodInfo VS_GetManagerServiceAsync(this GeneratorReflector reflect) => reflect.VS_GetRequiredServiceAsync(reflect.SVsExtensionManager(), reflect.IVsExtensionManager());
+    public static MethodInfo VS_GetManagerService(this GeneratorReflector reflect) => reflect.VS_GetRequiredService(reflect.SVsExtensionManager(), reflect.IVsExtensionManager());
 
     public static MethodInfo Manager_GetInstalledExtensions(this GeneratorReflector reflect) => reflect.IVsExtensionManager().GetMethodOrThrow("GetInstalledExtensions");
 }
diff --git a/src/ExtensionManager.VisualStudio.Adapter.Generator/Types/Extensions/ExtensionRepositoryAdapterGenerator.cs b/src/ExtensionManager.VisualStudio.Adapter.Generator/Types/Extensions/ExtensionRepositoryAdapterGenerator.cs
@@ -45,10 +45,14 @@ file static class Extensions
 {
     public static Type AdapterInterface(this GeneratorReflector reflect) => typeof(IVSExtensionRepositoryAdapter<>).MakeGenericType(reflect.IVsExtensionRepository());
 
+#pragma warning disable VSTHRD200 // Use "Async" suffix for async methods
     public static MethodInfo Adapter_GetRepositoryAsync(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionRepositoryAdapter<int>.GetRepositoryAsync));
+#pragma warning restore VSTHRD200 // Use "Async" suffix for async methods
     public static MethodInfo Adapter_GetVSGalleryExtensions(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionRepositoryAdapter<int>.GetVSGalleryExtensions));
 
-    public static MethodInfo VS_GetRepositoryServiceAsync(this GeneratorReflector reflect) => reflect.VS_GetRequiredServiceAsync(reflect.SVsExtensionRepository(), reflect.IVsExtensionRepository());
+#pragma warning disable VSTHRD200 // Use "Async" suffix for async methods
+    public static MethodInfo VS_GetRepositoryServiceAsync(this GeneratorReflector reflect) => reflect.VS_GetRequiredService(reflect.SVsExtensionRepository(), reflect.IVsExtensionRepository());
+#pragma warning restore VSTHRD200 // Use "Async" suffix for async methods
 
     public static MethodInfo Repository_GetVSGalleryExtensions(this GeneratorReflector reflect, Type extensionType) => reflect.IVsExtensionRepository().GetMethodOrThrow("GetVSGalleryExtensions").MakeGenericMethod(extensionType);
 }
diff --git a/src/ExtensionManager.Vsix.Shared/ExtensionManagerPackage.cs b/src/ExtensionManager.Vsix.Shared/ExtensionManagerPackage.cs
@@ -127,18 +127,47 @@ async void OnHandleCommand(object sender, EventArgs e)
 
 file static class AssemblyResolver
 {
+    [ThreadStatic]
+    private static int _nestingCount;
+
     public static void Initialize()
         => AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;
 
     private static Assembly? OnAssemblyResolve(object sender, ResolveEventArgs e)
     {
-        var assemblyName = new AssemblyName(e.Name).Name;
-        var currentFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-        var assemblyPath = Path.Combine(currentFolder, assemblyName + ".dll");
+        // Prevent infinite recursion by checking if we're already inside this resolver
+        if (_nestingCount > 0)
+            return null;
 
-        if (File.Exists(assemblyPath))
-            return Assembly.LoadFile(assemblyPath);
+        _nestingCount++;
+        try
+        {
+            var requestedAssembly = new AssemblyName(e.Name);
+            var assemblyName = requestedAssembly.Name;
+            var currentFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            var assemblyPath = Path.Combine(currentFolder, assemblyName + ".dll");
 
-        return null;
+            if (!File.Exists(assemblyPath))
+                return null;
+
+            var onDiskAssembly = AssemblyName.GetAssemblyName(assemblyPath);
+            
+            // Only load if versions match - return null if they don't to allow other resolvers to try
+            if (requestedAssembly.Version != null && 
+                onDiskAssembly.Version != requestedAssembly.Version)
+                return null;
+
+            return Assembly.LoadFile(assemblyPath);
+        }
+        catch
+        {
+            // Swallow all exceptions and return null to allow other resolvers to try
+            // or to let the CLR handle the failure in the standard way
+            return null;
+        }
+        finally
+        {
+            _nestingCount--;
+        }
     }
 }
diff --git a/src/ExtensionManager.Vsix.VS2017/ExtensionManager.Vsix.VS2017.csproj b/src/ExtensionManager.Vsix.VS2017/ExtensionManager.Vsix.VS2017.csproj
@@ -104,11 +104,20 @@
       <ExcludeAssets>runtime</ExcludeAssets>
       <Version>15.7.81-pre</Version>
     </PackageReference>
+    <PackageReference Include="MessagePack">
+      <Version>2.5.187</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.IO.Redist">
+      <Version>6.0.1</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
       <Version>17.0.1619-preview1</Version>
     </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>8.0.5</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExtensionManager.Manifest\ExtensionManager.Manifest.csproj">
@@ -141,4 +150,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\ExtensionManager.Vsix.props" />
-</Project>
+</Project>
diff --git a/src/ExtensionManager.Vsix.VS2019/ExtensionManager.Vsix.VS2019.csproj b/src/ExtensionManager.Vsix.VS2019/ExtensionManager.Vsix.VS2019.csproj
@@ -96,9 +96,18 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15">
+      <Version>15.0.507</Version>
+    </PackageReference>
     <PackageReference Include="Community.VisualStudio.Toolkit.16">
       <Version>16.0.507</Version>
     </PackageReference>
+    <PackageReference Include="MessagePack">
+      <Version>2.5.187</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.IO.Redist">
+      <Version>6.0.1</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
@@ -109,6 +118,9 @@
       <PrivateAssets>all</PrivateAssets>
       <Version>17.0.1619-preview1</Version>
     </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>8.0.5</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExtensionManager.Manifest\ExtensionManager.Manifest.csproj">
@@ -141,4 +153,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\ExtensionManager.Vsix.props" />
-</Project>
+</Project>
diff --git a/src/ExtensionManager.Vsix.VS2022/ExtensionManager.Vsix.VS2022.csproj b/src/ExtensionManager.Vsix.VS2022/ExtensionManager.Vsix.VS2022.csproj
@@ -98,9 +98,18 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15">
+      <Version>15.0.507</Version>
+    </PackageReference>
     <PackageReference Include="Community.VisualStudio.Toolkit.17">
       <Version>17.0.507</Version>
     </PackageReference>
+    <PackageReference Include="MessagePack">
+      <Version>2.5.187</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.IO.Redist">
+      <Version>6.0.1</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
@@ -117,6 +126,9 @@
     <PackageReference Include="System.Collections.Immutable">
       <Version>8.0.0</Version>
     </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>8.0.5</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExtensionManager.Manifest\ExtensionManager.Manifest.csproj">
@@ -149,4 +161,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\ExtensionManager.Vsix.props" />
-</Project>
+</Project>
diff --git a/src/ExtensionManager/ExtensionManager.csproj b/src/ExtensionManager/ExtensionManager.csproj
@@ -1,10 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit.15" Version="15.0.507" />
+    <PackageReference Include="MessagePack" Version="2.5.187" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
     <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,18 @@ protected override bool CanOk()`
`24`	`24`	`}`
`25`	`25`	`protected override async void OnOk()`
`26`	`26`	`{`
`27`		`- await RunWorkAsync();`
	`27`	`+ try`
	`28`	`+ {`
	`29`	`+ await RunWorkAsync();`
`28`	`30`
`29`		`- RequestClose();`
	`31`	`+ RequestClose();`
	`32`	`+ }`
	`33`	`+ catch`
	`34`	`+ {`
	`35`	`+ // Safely show error to user`
	`36`	`+ }`
`30`	`37`	`}`
	`38`	`+`
`31`	`39`	`private async Task RunWorkAsync()`
`32`	`40`	`{`
`33`	`41`	`using var cts = new CancellationTokenSource();`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private MemberInfo GetMember(Type type, MemberTypes memberType, string name)`
`48`	`48`	`public Type IVsExtensionRepository() => GetType("Microsoft.VisualStudio.ExtensionManager.IVsExtensionRepository");`
`49`	`49`	`public Type SVsExtensionRepository() => GetType("Microsoft.VisualStudio.ExtensionManager.SVsExtensionRepository");`
`50`	`50`
`51`		`- public MethodInfo VS_GetRequiredServiceAsync(Type serviceType, Type interfaceType)`
	`51`	`+ public MethodInfo VS_GetRequiredService(Type serviceType, Type interfaceType)`
`52`	`52`	`{`
`53`	`53`	`return GetType("Community.VisualStudio.Toolkit.VS")`
`54`	`54`	`.GetMethodOrThrow("GetRequiredServiceAsync")`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ public Type Emit(GeneratorContext context)`
`18`	`18`	`{`
`19`	`19`	`emit.Implement(context.Reflect.AdapterInterface());`
`20`	`20`
`21`		`- emit.ImplementMethod(context.Reflect.Adapter_GetManagerAsync())`
	`21`	`+ emit.ImplementMethod(context.Reflect.Adapter_GetManager())`
`22`	`22`	`.EmitIL(il =>`
`23`	`23`	`{`
`24`		`- il.Emit(OpCodes.Call, context.Reflect.VS_GetManagerServiceAsync());`
	`24`	`+ il.Emit(OpCodes.Call, context.Reflect.VS_GetManagerService());`
`25`	`25`	`il.Emit(OpCodes.Ret);`
`26`	`26`	`});`
`27`	`27`
`@@ -50,11 +50,11 @@ file static class Extensions`
`50`	`50`	`{`
`51`	`51`	`public static Type AdapterInterface(this GeneratorReflector reflect) => typeof(IVSExtensionManagerAdapter<,>).MakeGenericType(reflect.IVsExtensionManager(), reflect.IInstalledExtension());`
`52`	`52`
`53`		`- public static MethodInfo Adapter_GetManagerAsync(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.GetManagerAsync));`
	`53`	`+ public static MethodInfo Adapter_GetManager(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.GetManagerAsync));`
`54`	`54`	`public static MethodInfo Adapter_GetInstalledExtensions(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.GetInstalledExtensions));`
`55`	`55`	`public static MethodInfo Adapter_CreateInstalledExtensionInfo(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionManagerAdapter<int, int>.CreateInstalledExtensionInfo));`
`56`	`56`
`57`		`- public static MethodInfo VS_GetManagerServiceAsync(this GeneratorReflector reflect) => reflect.VS_GetRequiredServiceAsync(reflect.SVsExtensionManager(), reflect.IVsExtensionManager());`
	`57`	`+ public static MethodInfo VS_GetManagerService(this GeneratorReflector reflect) => reflect.VS_GetRequiredService(reflect.SVsExtensionManager(), reflect.IVsExtensionManager());`
`58`	`58`
`59`	`59`	`public static MethodInfo Manager_GetInstalledExtensions(this GeneratorReflector reflect) => reflect.IVsExtensionManager().GetMethodOrThrow("GetInstalledExtensions");`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,14 @@ file static class Extensions`
`45`	`45`	`{`
`46`	`46`	`public static Type AdapterInterface(this GeneratorReflector reflect) => typeof(IVSExtensionRepositoryAdapter<>).MakeGenericType(reflect.IVsExtensionRepository());`
`47`	`47`
	`48`	`+#pragma warning disable VSTHRD200 // Use "Async" suffix for async methods`
`48`	`49`	`public static MethodInfo Adapter_GetRepositoryAsync(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionRepositoryAdapter<int>.GetRepositoryAsync));`
	`50`	`+#pragma warning restore VSTHRD200 // Use "Async" suffix for async methods`
`49`	`51`	`public static MethodInfo Adapter_GetVSGalleryExtensions(this GeneratorReflector reflect) => reflect.AdapterInterface().GetMethod(nameof(IVSExtensionRepositoryAdapter<int>.GetVSGalleryExtensions));`
`50`	`52`
`51`		`- public static MethodInfo VS_GetRepositoryServiceAsync(this GeneratorReflector reflect) => reflect.VS_GetRequiredServiceAsync(reflect.SVsExtensionRepository(), reflect.IVsExtensionRepository());`
	`53`	`+#pragma warning disable VSTHRD200 // Use "Async" suffix for async methods`
	`54`	`+ public static MethodInfo VS_GetRepositoryServiceAsync(this GeneratorReflector reflect) => reflect.VS_GetRequiredService(reflect.SVsExtensionRepository(), reflect.IVsExtensionRepository());`
	`55`	`+#pragma warning restore VSTHRD200 // Use "Async" suffix for async methods`
`52`	`56`
`53`	`57`	`public static MethodInfo Repository_GetVSGalleryExtensions(this GeneratorReflector reflect, Type extensionType) => reflect.IVsExtensionRepository().GetMethodOrThrow("GetVSGalleryExtensions").MakeGenericMethod(extensionType);`
`54`	`58`	`}`