Merge pull request #31 from Umplify/issue_30

Issue 30

Author: Arash-Sabet

src/Abstracts/TestBed.cs

@@ -1,9 +1,10 @@
 using System;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 
 namespace Xunit.Microsoft.DependencyInjection.Abstracts
 {
-    public abstract class TestBed<TFixture> : IDisposable, IClassFixture<TFixture>
+    public abstract class TestBed<TFixture> : IDisposable, IClassFixture<TFixture>, IAsyncDisposable
 		where TFixture: class
 	{	
 		protected readonly ITestOutputHelper _testOutputHelper;
@@ -43,6 +44,14 @@ public void Dispose()
 			GC.SuppressFinalize(this);
 		}
 
-		protected abstract void Clear();
+		protected abstract void Clear();
+
+		public async ValueTask DisposeAsync()
+		{
+			await DisposeAsyncCore();
+			GC.SuppressFinalize(this);
+		}
+
+		protected abstract ValueTask DisposeAsyncCore();
 	}
 }

src/Abstracts/TestBedFixture.cs

@@ -3,12 +3,13 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 using Xunit.Microsoft.DependencyInjection.Logging;
 
 namespace Xunit.Microsoft.DependencyInjection.Abstracts
 {
-    public abstract class TestBedFixture : IDisposable
+    public abstract class TestBedFixture : IDisposable, IAsyncDisposable
 	{
 		private readonly IServiceCollection _services;
 		private IServiceProvider _serviceProvider;
@@ -94,6 +95,14 @@ public void Dispose()
 			// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
 			Dispose(disposing: true);
 			GC.SuppressFinalize(this);
-		}
+		}
+
+        public async ValueTask DisposeAsync()
+        {
+			await DisposeAsyncCore();
+			GC.SuppressFinalize(this);
+        }
+
+		protected abstract ValueTask DisposeAsyncCore();
 	}
 }

src/Xunit.Microsoft.DependencyInjection.csproj

@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.9" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.10" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.10" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.10" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.10" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>