Skip to content

Commit 3741f36

Browse files
loop8ackloop8ack
committed
Dynamic Visual Studio DLL handling: Implement initial adapter architecture
1 parent 2fe2438 commit 3741f36

File tree

70 files changed

+683
-193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+683
-193
lines changed

‎ExtensionManager.sln‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
6868
.github\workflows\Release.yml = .github\workflows\Release.yml
6969
EndProjectSection
7070
EndProject
71+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtensionManager.VisualStudio.Adapter.Abstractions", "src\ExtensionManager.VisualStudio.Adapter.Abstractions\ExtensionManager.VisualStudio.Adapter.Abstractions.csproj", "{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}"
72+
EndProject
73+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtensionManager.VisualStudio.Adapter.Generator", "src\ExtensionManager.VisualStudio.Adapter.Generator\ExtensionManager.VisualStudio.Adapter.Generator.csproj", "{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}"
74+
EndProject
75+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionManager.VisualStudio.Adapter.V17_Preview", "src\ExtensionManager.VisualStudio.Adapter.V17_Preview\ExtensionManager.VisualStudio.Adapter.V17_Preview.csproj", "{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}"
76+
EndProject
77+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionManager.VisualStudio.Adapter.V17", "src\ExtensionManager.VisualStudio.Adapter.V17\ExtensionManager.VisualStudio.Adapter.V17.csproj", "{CDDBC413-C87D-4904-984C-A7CE50DABC47}"
78+
EndProject
79+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionManager.VisualStudio.Adapter.V16", "src\ExtensionManager.VisualStudio.Adapter.V16\ExtensionManager.VisualStudio.Adapter.V16.csproj", "{C23A4298-86D2-4275-89ED-197E891A793D}"
80+
EndProject
81+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionManager.VisualStudio.Adapter.V15", "src\ExtensionManager.VisualStudio.Adapter.V15\ExtensionManager.VisualStudio.Adapter.V15.csproj", "{72F85167-78BC-4F94-B850-326A8A224674}"
82+
EndProject
83+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adapter", "Adapter", "{F180C738-5477-4CE7-9D4A-247BB4E5C1DF}"
84+
EndProject
7185
Global
7286
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7387
Debug|Any CPU = Debug|Any CPU
@@ -210,6 +224,78 @@ Global
210224
{6468E392-1C88-4F3C-B8D7-E61F942ADBFC}.Release|arm64.Build.0 = Release|Any CPU
211225
{6468E392-1C88-4F3C-B8D7-E61F942ADBFC}.Release|x86.ActiveCfg = Release|Any CPU
212226
{6468E392-1C88-4F3C-B8D7-E61F942ADBFC}.Release|x86.Build.0 = Release|Any CPU
227+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
228+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
229+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Debug|arm64.ActiveCfg = Debug|Any CPU
230+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Debug|arm64.Build.0 = Debug|Any CPU
231+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Debug|x86.ActiveCfg = Debug|Any CPU
232+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Debug|x86.Build.0 = Debug|Any CPU
233+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
234+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Release|Any CPU.Build.0 = Release|Any CPU
235+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Release|arm64.ActiveCfg = Release|Any CPU
236+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Release|arm64.Build.0 = Release|Any CPU
237+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Release|x86.ActiveCfg = Release|Any CPU
238+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F}.Release|x86.Build.0 = Release|Any CPU
239+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
240+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Debug|Any CPU.Build.0 = Debug|Any CPU
241+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Debug|arm64.ActiveCfg = Debug|Any CPU
242+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Debug|arm64.Build.0 = Debug|Any CPU
243+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Debug|x86.ActiveCfg = Debug|Any CPU
244+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Debug|x86.Build.0 = Debug|Any CPU
245+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Release|Any CPU.ActiveCfg = Release|Any CPU
246+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Release|Any CPU.Build.0 = Release|Any CPU
247+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Release|arm64.ActiveCfg = Release|Any CPU
248+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Release|arm64.Build.0 = Release|Any CPU
249+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Release|x86.ActiveCfg = Release|Any CPU
250+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12}.Release|x86.Build.0 = Release|Any CPU
251+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
252+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Debug|Any CPU.Build.0 = Debug|Any CPU
253+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Debug|arm64.ActiveCfg = Debug|Any CPU
254+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Debug|arm64.Build.0 = Debug|Any CPU
255+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Debug|x86.ActiveCfg = Debug|Any CPU
256+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Debug|x86.Build.0 = Debug|Any CPU
257+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Release|Any CPU.ActiveCfg = Release|Any CPU
258+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Release|Any CPU.Build.0 = Release|Any CPU
259+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Release|arm64.ActiveCfg = Release|Any CPU
260+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Release|arm64.Build.0 = Release|Any CPU
261+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Release|x86.ActiveCfg = Release|Any CPU
262+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E}.Release|x86.Build.0 = Release|Any CPU
263+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
264+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Debug|Any CPU.Build.0 = Debug|Any CPU
265+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Debug|arm64.ActiveCfg = Debug|Any CPU
266+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Debug|arm64.Build.0 = Debug|Any CPU
267+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Debug|x86.ActiveCfg = Debug|Any CPU
268+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Debug|x86.Build.0 = Debug|Any CPU
269+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Release|Any CPU.ActiveCfg = Release|Any CPU
270+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Release|Any CPU.Build.0 = Release|Any CPU
271+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Release|arm64.ActiveCfg = Release|Any CPU
272+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Release|arm64.Build.0 = Release|Any CPU
273+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Release|x86.ActiveCfg = Release|Any CPU
274+
{CDDBC413-C87D-4904-984C-A7CE50DABC47}.Release|x86.Build.0 = Release|Any CPU
275+
{C23A4298-86D2-4275-89ED-197E891A793D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
276+
{C23A4298-86D2-4275-89ED-197E891A793D}.Debug|Any CPU.Build.0 = Debug|Any CPU
277+
{C23A4298-86D2-4275-89ED-197E891A793D}.Debug|arm64.ActiveCfg = Debug|Any CPU
278+
{C23A4298-86D2-4275-89ED-197E891A793D}.Debug|arm64.Build.0 = Debug|Any CPU
279+
{C23A4298-86D2-4275-89ED-197E891A793D}.Debug|x86.ActiveCfg = Debug|Any CPU
280+
{C23A4298-86D2-4275-89ED-197E891A793D}.Debug|x86.Build.0 = Debug|Any CPU
281+
{C23A4298-86D2-4275-89ED-197E891A793D}.Release|Any CPU.ActiveCfg = Release|Any CPU
282+
{C23A4298-86D2-4275-89ED-197E891A793D}.Release|Any CPU.Build.0 = Release|Any CPU
283+
{C23A4298-86D2-4275-89ED-197E891A793D}.Release|arm64.ActiveCfg = Release|Any CPU
284+
{C23A4298-86D2-4275-89ED-197E891A793D}.Release|arm64.Build.0 = Release|Any CPU
285+
{C23A4298-86D2-4275-89ED-197E891A793D}.Release|x86.ActiveCfg = Release|Any CPU
286+
{C23A4298-86D2-4275-89ED-197E891A793D}.Release|x86.Build.0 = Release|Any CPU
287+
{72F85167-78BC-4F94-B850-326A8A224674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
288+
{72F85167-78BC-4F94-B850-326A8A224674}.Debug|Any CPU.Build.0 = Debug|Any CPU
289+
{72F85167-78BC-4F94-B850-326A8A224674}.Debug|arm64.ActiveCfg = Debug|Any CPU
290+
{72F85167-78BC-4F94-B850-326A8A224674}.Debug|arm64.Build.0 = Debug|Any CPU
291+
{72F85167-78BC-4F94-B850-326A8A224674}.Debug|x86.ActiveCfg = Debug|Any CPU
292+
{72F85167-78BC-4F94-B850-326A8A224674}.Debug|x86.Build.0 = Debug|Any CPU
293+
{72F85167-78BC-4F94-B850-326A8A224674}.Release|Any CPU.ActiveCfg = Release|Any CPU
294+
{72F85167-78BC-4F94-B850-326A8A224674}.Release|Any CPU.Build.0 = Release|Any CPU
295+
{72F85167-78BC-4F94-B850-326A8A224674}.Release|arm64.ActiveCfg = Release|Any CPU
296+
{72F85167-78BC-4F94-B850-326A8A224674}.Release|arm64.Build.0 = Release|Any CPU
297+
{72F85167-78BC-4F94-B850-326A8A224674}.Release|x86.ActiveCfg = Release|Any CPU
298+
{72F85167-78BC-4F94-B850-326A8A224674}.Release|x86.Build.0 = Release|Any CPU
213299
EndGlobalSection
214300
GlobalSection(SolutionProperties) = preSolution
215301
HideSolutionNode = FALSE
@@ -233,6 +319,13 @@ Global
233319
{6468E392-1C88-4F3C-B8D7-E61F942ADBFC} = {C8C286F7-7669-402E-8F06-2C47A05FE372}
234320
{431E1523-840F-473A-8592-2BB32332911E} = {AF4F860B-CBFE-4136-BFA4-4B51B64FC796}
235321
{5C6EB350-6BEE-4D5A-B02F-7B331D6D8FE8} = {431E1523-840F-473A-8592-2BB32332911E}
322+
{78E14F78-6B4A-4E64-95C1-7CC4E91D4A9F} = {F180C738-5477-4CE7-9D4A-247BB4E5C1DF}
323+
{9BACA2E2-713C-42FC-9AA0-A128D48E2D12} = {F180C738-5477-4CE7-9D4A-247BB4E5C1DF}
324+
{36B75BDB-ADA8-4F9A-B0DC-7C96081AE33E} = {F180C738-5477-4CE7-9D4A-247BB4E5C1DF}
325+
{CDDBC413-C87D-4904-984C-A7CE50DABC47} = {F180C738-5477-4CE7-9D4A-247BB4E5C1DF}
326+
{C23A4298-86D2-4275-89ED-197E891A793D} = {F180C738-5477-4CE7-9D4A-247BB4E5C1DF}
327+
{72F85167-78BC-4F94-B850-326A8A224674} = {F180C738-5477-4CE7-9D4A-247BB4E5C1DF}
328+
{F180C738-5477-4CE7-9D4A-247BB4E5C1DF} = {DD63B191-4457-40BA-984A-0C1D6B95D197}
236329
EndGlobalSection
237330
GlobalSection(ExtensibilityGlobals) = postSolution
238331
SolutionGuid = {1BD96434-7B7A-4183-ABA0-CA3DC2FCD23B}

‎src/ExtensionManager.VisualStudio.Abstractions/Extensions/IVSExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public interface IVSExtensions
99
/// <summary>
1010
/// Retrieves the IDs of all installed extensions.
1111
/// </summary>
12-
Task<IReadOnlyCollection<string>> GetInstalledExtensionIdsAsync();
12+
Task<IReadOnlyCollection<IVSExtension>> GetInstalledExtensionsAsync();
1313

1414
/// <summary>
1515
/// Downloads extension data based on the specified extension IDs

‎src/ExtensionManager.VisualStudio.Abstractions/IVSFacade.cs‎

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

‎src/ExtensionManager.VisualStudio.Abstractions/IVSServiceFactory.cs‎

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

‎src/ExtensionManager.VisualStudio.Abstractions/IVSServicesRegistrar.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
using Microsoft.Extensions.DependencyInjection;
2+
namespace ExtensionManager.VisualStudio;
3+
4+
public interface IVSServicesRegistrar
5+
{
6+
void AddServices(IServiceCollection services);
7+
}

‎src/ExtensionManager.VisualStudio.Abstractions/ServiceCollectionExtensions.cs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,9 @@ namespace ExtensionManager.VisualStudio;
44

55
public static class ServiceCollectionExtensions
66
{
7-
public static IServiceCollection ConfigureVSFacade(this IServiceCollection services, IVSServiceFactory serviceFactory)
7+
public static IServiceCollection ConfigureVSServices(this IServiceCollection services, IVSServicesRegistrar registrar)
88
{
9-
services.AddSingleton<IVSFacade>(new VSFacade(serviceFactory));
10-
11-
services.AddTransient(s => s.GetRequiredService<IVSFacade>().Themes);
12-
services.AddTransient(s => s.GetRequiredService<IVSFacade>().Threads);
13-
services.AddTransient(s => s.GetRequiredService<IVSFacade>().Solutions);
14-
services.AddTransient(s => s.GetRequiredService<IVSFacade>().StatusBar);
15-
services.AddTransient(s => s.GetRequiredService<IVSFacade>().Documents);
16-
services.AddTransient(s => s.GetRequiredService<IVSFacade>().MessageBox);
17-
services.AddTransient(s => s.GetRequiredService<IVSFacade>().Extensions);
18-
9+
registrar.AddServices(services);
1910
return services;
2011
}
2112
}

‎src/ExtensionManager.VisualStudio.Abstractions/VSFacade.cs‎

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

‎src/ExtensionManager.VisualStudio.Adapter.Abstractions/ExtensionManager.VisualStudio.Adapter.Abstractions.csproj‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<RootNamespace>ExtensionManager.VisualStudio.Adapter</RootNamespace>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\ExtensionManager.VisualStudio.Abstractions\ExtensionManager.VisualStudio.Abstractions.csproj" />
9+
</ItemGroup>
10+
11+
</Project>

‎src/ExtensionManager.VisualStudio.Adapter.Abstractions/Extensions/IVSExtensionManagerAdapter.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System.Collections.Generic;
2+
using System.Threading.Tasks;
3+
4+
namespace ExtensionManager.VisualStudio.Adapter.Extensions;
5+
6+
public interface IVSExtensionManagerAdapter
7+
{
8+
Task<IReadOnlyList<IVSInstalledExtensionInfo>> GetInstalledExtensionsAsync();
9+
}
10+
11+
public interface IVSExtensionManagerAdapter<TManager, TInstalledExtension>
12+
where TManager : class
13+
where TInstalledExtension : class
14+
{
15+
Task<TManager> GetManagerAsync();
16+
IEnumerable<TInstalledExtension> GetInstalledExtensions(TManager manager);
17+
IVSInstalledExtensionInfo CreateInstalledExtensionInfo(TInstalledExtension extension);
18+
}

‎src/ExtensionManager.VisualStudio.Adapter.Abstractions/Extensions/IVSExtensionRepositoryAdapter.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System.Collections.Generic;
2+
using System.Threading.Tasks;
3+
4+
using ExtensionManager.VisualStudio.Extensions;
5+
6+
namespace ExtensionManager.VisualStudio.Adapter.Extensions;
7+
8+
public interface IVSExtensionRepositoryAdapter
9+
{
10+
Task<IReadOnlyList<IVSExtension>> GetVSGalleryExtensionsAsync(List<string> extensionIds, int lcid, bool forAutoupdate);
11+
}
12+
13+
14+
public interface IVSExtensionRepositoryAdapter<TRepository>
15+
where TRepository : class
16+
{
17+
Task<TRepository> GetRepositoryAsync();
18+
IEnumerable<IVSExtension> GetVSGalleryExtensions(TRepository repository, List<string> extensionIds, int lcid, bool forAutoupdate);
19+
}

0 commit comments

Comments
 (0)