Merge pull request #266 from Umplify/264-the-coverlet-collection-nuge…

…t-package-has-been-defined-twice 264 the coverlet collection nuget package has been defined twice
Umplify · Aug 30, 2024 · 7e23730 · 7e23730
2 parents 9e5a0ad + 6766f44
commit 7e23730
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/azure-pipeline-PR.yml b/azure-pipeline-PR.yml
@@ -17,7 +17,7 @@ steps:
   displayName: 'Use .NET 8.0 sdk'
   inputs:
     packageType: sdk
-    version: 8.0.300
+    version: 8.0.401
     installationPath: $(Agent.ToolsDirectory)/dotnet
 - script: echo Started restoring the source code
 - task: DotNetCoreCLI@2

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,7 +25,7 @@ steps:
   displayName: 'Use .NET 8.0 sdk'
   inputs:
     packageType: sdk
-    version: 8.0.302
+    version: 8.0.401
     installationPath: $(Agent.ToolsDirectory)/dotnet
 - script: echo Started restoring the source code
 - task: DotNetCoreCLI@2

diff --git a/....DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj b/....DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj
@@ -11,7 +11,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
 		<PackageReference Include="xunit" Version="2.9.0" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 		  <PrivateAssets>all</PrivateAssets>
@@ -21,7 +21,6 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />

diff --git a/src/Abstracts/TestBedFixture.cs b/src/Abstracts/TestBedFixture.cs
@@ -4,7 +4,7 @@ namespace Xunit.Microsoft.DependencyInjection.Abstracts;
 
 public abstract class TestBedFixture : IDisposable, IAsyncDisposable
 {
-	private readonly IServiceCollection _services;
+	private readonly ServiceCollection _services;
 	private ServiceProvider? _serviceProvider;
 	private bool _disposedValue;
 	private bool _disposedAsync;
@@ -79,6 +79,7 @@ public async ValueTask DisposeAsync()
 			Dispose();
 			_disposedAsync = true;
 		}
+		GC.SuppressFinalize(this);
 	}
 
 	protected abstract void AddServices(IServiceCollection services, IConfiguration? configuration);

diff --git a/src/Logging/OutputLoggerProvider.cs b/src/Logging/OutputLoggerProvider.cs
@@ -7,7 +7,5 @@ public class OutputLoggerProvider(ITestOutputHelper testOutputHelper) : ILoggerP
 	public ILogger CreateLogger(string categoryName)
 		=> new OutputLogger(categoryName, _testOutputHelper);
 
-	public void Dispose()
-	{
-	}
+	public void Dispose() => GC.SuppressFinalize(this);
 }