Cleanup

teoadal · Apr 26, 2024 · 9a92f00 · 9a92f00
1 parent 0203a02
commit 9a92f00
Show file tree

Hide file tree

Showing 17 changed files with 539 additions and 544 deletions.
diff --git a/src/Storage.Benchmark/S3Benchmark.cs b/src/Storage.Benchmark/S3Benchmark.cs
@@ -5,11 +5,12 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using Minio;
+using Minio.DataModel.Args;
 using Storage.Benchmark.Utils;
 
 namespace Storage.Benchmark;
 
-[SimpleJob(RuntimeMoniker.Net70)]
+[SimpleJob(RuntimeMoniker.Net80)]
 [MeanColumn]
 [MemoryDiagnoser]
 public class S3Benchmark
@@ -22,7 +23,7 @@ public class S3Benchmark
 
 	private IAmazonS3 _amazonClient = null!;
 	private TransferUtility _amazonTransfer = null!;
-	private MinioClient _minioClient = null!;
+	private IMinioClient _minioClient = null!;
 	private S3Client _s3Client = null!;
 
 	[GlobalSetup]

diff --git a/src/Storage.Benchmark/Storage.Benchmark.csproj b/src/Storage.Benchmark/Storage.Benchmark.csproj
@@ -10,18 +10,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-        <PackageReference Include="Minio" Version="4.0.7" />
-        <PackageReference Include="AWSSDK.S3" Version="3.7.103.35" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Minio" Version="6.0.2" />
+        <PackageReference Include="AWSSDK.S3" Version="3.7.307.23" />
     </ItemGroup>
 
 

diff --git a/src/Storage.Benchmark/Utils/BenchmarkHelper.cs b/src/Storage.Benchmark/Utils/BenchmarkHelper.cs
@@ -26,7 +26,7 @@ public static AmazonS3Client CreateAWSClient(S3Settings settings)
 			});
 	}
 
-	public static MinioClient CreateMinioClient(S3Settings settings)
+	public static IMinioClient CreateMinioClient(S3Settings settings)
 	{
 		var builder = new MinioClient();
 		var port = settings.Port;

diff --git a/src/Storage.Tests/Storage.Tests.csproj b/src/Storage.Tests/Storage.Tests.csproj
@@ -9,25 +9,25 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AutoFixture.Xunit2" Version="4.18.0" />
-        <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
         <PackageReference Include="Moq" Version="4.18.4" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="JunitXml.TestLogger" Version="3.0.124" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit" Version="2.7.1" />
+        <PackageReference Include="JunitXml.TestLogger" Version="3.1.12" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.2.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/Storage/GlobalUsings.cs b/src/Storage/GlobalUsings.cs
@@ -0,0 +1,4 @@
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Net;
+global using System.Runtime.CompilerServices;