Add double-Dispose guards

Author: bradwilson

src/xunit.runner.visualstudio/Sinks/VsDiscoverySink.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1513 // ObjectDisposedException.ThrowIf is not available in net472
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -28,6 +30,8 @@ internal sealed class VsDiscoverySink : IVsDiscoverySink, IDisposable
 	readonly VsTestCaseDiscoverySink discoverySink;
 	readonly DiscoveryEventSink discoveryEventSink = new();
 	readonly Dictionary<string, string> displayNamesByTestCaseUniqueID = [];
+	readonly object disposalLock = new();
+	bool disposed;
 	readonly LoggerHelper logger;
 	readonly string source;
 	readonly List<ITestCaseDiscovered> testCaseBatch = [];
@@ -59,8 +63,18 @@ public VsDiscoverySink(
 
 	public int TotalTests { get; private set; }
 
-	public void Dispose() =>
+	public void Dispose()
+	{
+		lock (disposalLock)
+		{
+			if (disposed)
+				throw new ObjectDisposedException(nameof(VsDiscoverySink));
+
+			disposed = true;
+		}
+
 		Finished.Dispose();
+	}
 
 	public static VsTestCase? CreateVsTestCase(
 		string source,

src/xunit.runner.visualstudio/Sinks/VsExecutionSink.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1513 // ObjectDisposedException.ThrowIf is not available in net472
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -23,6 +25,8 @@ internal sealed class VsExecutionSink : TestMessageSink, IDisposable
 	static readonly HashSet<char> InvalidFileNameChars = Path.GetInvalidFileNameChars().ToHashSet();
 
 	readonly Func<bool> cancelledThunk;
+	readonly object disposalLock = new();
+	bool disposed;
 	readonly LoggerHelper logger;
 	readonly IMessageSink innerSink;
 	readonly ConcurrentDictionary<string, MessageMetadataCache> metadataCacheByAssemblyID = [];
@@ -95,6 +99,14 @@ public VsExecutionSink(
 
 	public void Dispose()
 	{
+		lock (disposalLock)
+		{
+			if (disposed)
+				throw new ObjectDisposedException(nameof(VsExecutionSink));
+
+			disposed = true;
+		}
+
 		Finished.Dispose();
 	}
 

src/xunit.runner.visualstudio/Utility/AppDomainManager.cs

@@ -13,6 +13,8 @@ namespace Xunit.Runner.VisualStudio;
 class AppDomainManager
 {
 	readonly AppDomain appDomain;
+	readonly object disposalLock = new();
+	bool disposed;
 
 	public AppDomainManager(string assemblyFileName)
 	{
@@ -54,6 +56,14 @@ public AppDomainManager(string assemblyFileName)
 
 	public virtual void Dispose()
 	{
+		lock (disposalLock)
+		{
+			if (disposed)
+				throw new ObjectDisposedException(nameof(AppDomainManager));
+
+			disposed = true;
+		}
+
 		if (appDomain is not null)
 		{
 			try

src/xunit.runner.visualstudio/Utility/DiaSessionWrapper.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CA1513 // ObjectDisposedException.ThrowIf is not available in net472
+
 using System;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
@@ -14,9 +16,11 @@ class DiaSessionWrapper : IDisposable
 #if NETFRAMEWORK
 	readonly AppDomainManager? appDomainManager;
 #endif
+	readonly DiagnosticMessageSink diagnosticMessageSink;
+	readonly object disposalLock = new();
+	bool disposed;
 	readonly DiaSessionWrapperHelper? helper;
 	readonly DiaSession? session;
-	readonly DiagnosticMessageSink diagnosticMessageSink;
 
 	public DiaSessionWrapper(
 		string assemblyFileName,
@@ -73,6 +77,14 @@ public DiaSessionWrapper(
 
 	public void Dispose()
 	{
+		lock (disposalLock)
+		{
+			if (disposed)
+				throw new ObjectDisposedException(nameof(DiaSessionWrapper));
+
+			disposed = true;
+		}
+
 		session?.Dispose();
 #if NETFRAMEWORK
 		appDomainManager?.Dispose();

src/xunit.runner.visualstudio/Utility/VisualStudioSourceInformationProvider.cs

@@ -1,3 +1,6 @@
+#pragma warning disable CA1513 // ObjectDisposedException.ThrowIf is not available in net472
+
+using System;
 using System.Threading.Tasks;
 using Xunit.Runner.Common;
 using Xunit.Sdk;
@@ -17,7 +20,9 @@ internal class VisualStudioSourceInformationProvider(
 {
 	static readonly SourceInformation EmptySourceInformation = new();
 
-	readonly DiaSessionWrapper session = new DiaSessionWrapper(assemblyFileName, diagnosticMessageSink);
+	readonly object disposalLock = new();
+	bool disposed;
+	readonly DiaSessionWrapper session = new(assemblyFileName, diagnosticMessageSink);
 
 	/// <inheritdoc/>
 	public SourceInformation GetSourceInformation(
@@ -37,6 +42,14 @@ public SourceInformation GetSourceInformation(
 	/// <inheritdoc/>
 	public ValueTask DisposeAsync()
 	{
+		lock (session)
+		{
+			if (disposed)
+				throw new ObjectDisposedException(nameof(VisualStudioSourceInformationProvider));
+
+			disposed = true;
+		}
+
 		session.Dispose();
 
 		return default;