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

Commit 5451416

Browse files
committed
Remove CompositeDisposable from GitHubServiceProvider.
Was causing Rx to get loaded everywhere.
1 parent 8a06659 commit 5451416

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/GitHub.VisualStudio/Services/GitHubServiceProvider.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Diagnostics.CodeAnalysis;
88
using System.Globalization;
99
using System.Linq;
10-
using System.Reactive.Disposables;
1110
using GitHub.Logging;
1211
using GitHub.Models;
1312
using GitHub.Exports;
@@ -89,11 +88,11 @@ class OwnedComposablePart
8988
}
9089

9190
static readonly ILogger log = LogManager.ForContext<GitHubServiceProvider>();
92-
CompositeDisposable disposables = new CompositeDisposable();
9391
readonly IServiceProviderPackage asyncServiceProvider;
9492
readonly IServiceProvider syncServiceProvider;
9593
readonly Dictionary<string, OwnedComposablePart> tempParts;
9694
readonly Version currentVersion;
95+
List<IDisposable> disposables = new List<IDisposable>();
9796
bool initialized = false;
9897

9998
public ExportProvider ExportProvider { get; private set; }
@@ -290,7 +289,13 @@ protected void Dispose(bool disposing)
290289
if (disposed) return;
291290

292291
if (disposables != null)
293-
disposables.Dispose();
292+
{
293+
foreach (var disposable in disposables)
294+
{
295+
disposable.Dispose();
296+
}
297+
}
298+
294299
disposables = null;
295300
if (tempContainer != null)
296301
tempContainer.Dispose();

0 commit comments

Comments
 (0)