Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit e52bd67

Browse files
committed
Use service provider from StartPagePackage
1 parent 23aa307 commit e52bd67

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/GitHub.VisualStudio.16/ExtensionServicesFactory.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public ExtensionServicesFactory(IServiceProvider serviceProvider)
1616

1717
public IExtensionServices Create()
1818
{
19+
ThreadHelper.ThrowIfNotOnUIThread();
20+
1921
var package = FindGitHubPackage();
2022
if(package != null)
2123
{

src/GitHub.VisualStudio.16/StartPagePackage.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,28 @@ namespace GitHub.StartPage
2020
[ProvideCodeContainerProvider("GitHub Container", Guids.StartPagePackageId, Images.ImageMonikerGuid, Images.Logo, "#110", "#111", typeof(GitHubContainerProvider))]
2121
public sealed class StartPagePackage : ExtensionPointPackage
2222
{
23+
protected override void Initialize()
24+
{
25+
base.Initialize();
26+
ServiceProvider = this;
27+
}
28+
29+
internal static IServiceProvider ServiceProvider { get; private set; }
2330
}
2431

2532
[Guid(Guids.CodeContainerProviderId)]
2633
public class GitHubContainerProvider : ICodeContainerProvider
2734
{
2835
readonly ICodeContainerProvider provider;
2936

30-
public GitHubContainerProvider() : this(null)
37+
public GitHubContainerProvider() : this(StartPagePackage.ServiceProvider)
3138
{
3239
}
3340

3441
public GitHubContainerProvider(IServiceProvider serviceProvider)
3542
{
3643
ThreadHelper.ThrowIfNotOnUIThread();
3744

38-
serviceProvider = serviceProvider ?? ServiceProvider.GlobalProvider;
3945
var factory = new ExtensionServicesFactory(serviceProvider);
4046
var services = factory.Create();
4147
provider = services.GetGitHubContainerProvider();

0 commit comments

Comments
 (0)