Upgrade to .NET 8 (#281)

* Upgrade to .NET 8 Signed-off-by: Victor Chang <[email protected]>
Project-MONAI · Jan 2, 2024 · 347c2ab · 347c2ab
1 parent e6d1220
commit 347c2ab
Show file tree

Hide file tree

Showing 28 changed files with 1,595 additions and 4,130 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: "6.0.x"
+        dotnet-version: "8.0.x"
 
     - name: Enable NuGet cache
       uses: actions/[email protected]
@@ -81,7 +81,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: "6.0.x"
+        dotnet-version: "8.0.x"
 
     - name: Enable Homebrew
       run: echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
@@ -123,11 +123,11 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Enable NuGet cache
         uses: actions/[email protected]
@@ -168,7 +168,7 @@ jobs:
         working-directory: ./src/Plugins/MinIO/Tests
 
       - name: Test
-        run: find ~+ -type f -name "*.Test.csproj" | xargs -L1 dotnet test -c ${{ env.BUILD_CONFIG }} -v=minimal -r "${{ env.TEST_RESULTS }}" --collect:"XPlat Code Coverage" --settings coverlet.runsettings
+        run: find ~+ -type f -name "*.Tests.csproj" | xargs -L1 dotnet test -c ${{ env.BUILD_CONFIG }} -v=minimal --results-directory "${{ env.TEST_RESULTS }}" --collect:"XPlat Code Coverage" --settings coverlet.runsettings
         working-directory: ./src
 
       - name: End SonarScanner
@@ -188,7 +188,7 @@ jobs:
       - uses: codecov/[email protected]
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: "src/${{ env.TEST_RESULTS }}"
+          directory: "src/"
           files: "**/coverage.opencover.xml"
           flags: unittests
           name: codecov-umbrella
@@ -220,7 +220,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Enable NuGet cache
         uses: actions/[email protected]
@@ -308,7 +308,7 @@ jobs:
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
           source-url: https://nuget.pkg.github.com/Project-MONAI/index.json
 
       - name: Publish to GitHub
@@ -333,7 +333,7 @@ jobs:
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
           source-url: https://nuget.pkg.github.com/Project-MONAI/index.json
 
       - name: Publish to GitHub

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj b/src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj
@@ -13,22 +13,18 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <RootNamespace>Monai.Deploy.Storage.AWSS3</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
     <None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
   </ItemGroup>
-
   <PropertyGroup>
     <PackageId>Monai.Deploy.Storage.AWSS3</PackageId>
     <Version>0.1.0</Version>
@@ -42,18 +38,14 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.7.201.11" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.304.11" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
     <ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/src/Plugins/MinIO/IMinIoClientFactory.cs b/src/Plugins/MinIO/IMinIoClientFactory.cs
@@ -16,16 +16,17 @@
 
 using Amazon.SecurityToken.Model;
 using Minio;
+using Minio.ApiEndpoints;
 
 namespace Monai.Deploy.Storage.MinIO
 {
     public interface IMinIoClientFactory
     {
-        MinioClient GetClient();
+        IMinioClient GetClient();
 
-        MinioClient GetClient(Credentials credentials);
+        IMinioClient GetClient(Credentials credentials);
 
-        MinioClient GetClient(Credentials credentials, string region);
+        IMinioClient GetClient(Credentials credentials, string region);
 
         IObjectOperations GetObjectOperationsClient();
 

diff --git a/src/Plugins/MinIO/MinIoClientFactory.cs b/src/Plugins/MinIO/MinIoClientFactory.cs
@@ -19,6 +19,7 @@
 using Ardalis.GuardClauses;
 using Microsoft.Extensions.Options;
 using Minio;
+using Minio.ApiEndpoints;
 using Monai.Deploy.Storage.Configuration;
 
 namespace Monai.Deploy.Storage.MinIO
@@ -27,7 +28,7 @@ public class MinIoClientFactory : IMinIoClientFactory
     {
         private static readonly string DefaultClient = "_DEFAULT_";
         internal static readonly int DefaultTimeout = 2500;
-        private readonly ConcurrentDictionary<string, MinioClient> _clients;
+        private readonly ConcurrentDictionary<string, IMinioClient> _clients;
 
         private StorageServiceConfiguration Options { get; }
 
@@ -40,10 +41,10 @@ public MinIoClientFactory(IOptions<StorageServiceConfiguration> options)
 
             Options = configuration;
 
-            _clients = new ConcurrentDictionary<string, MinioClient>();
+            _clients = new ConcurrentDictionary<string, IMinioClient>();
         }
 
-        public MinioClient GetClient()
+        public IMinioClient GetClient()
         {
             return _clients.GetOrAdd(DefaultClient, _ =>
             {
@@ -55,12 +56,12 @@ public MinioClient GetClient()
             });
         }
 
-        public MinioClient GetClient(Credentials credentials)
+        public IMinioClient GetClient(Credentials credentials)
         {
             return GetClient(credentials, string.Empty);
         }
 
-        public MinioClient GetClient(Credentials credentials, string region)
+        public IMinioClient GetClient(Credentials credentials, string region)
         {
             return GetClientInternal(credentials, region);
         }
@@ -109,7 +110,7 @@ public IObjectOperations GetObjectOperationsClient(Credentials credentials, stri
             return GetClientInternal(credentials, region);
         }
 
-        private MinioClient CreateClient(string accessKey, string accessToken)
+        private IMinioClient CreateClient(string accessKey, string accessToken)
         {
             var endpoint = Options.Settings[ConfigurationKeys.EndPoint];
             var securedConnection = Options.Settings[ConfigurationKeys.SecuredConnection];
@@ -133,7 +134,7 @@ private MinioClient CreateClient(string accessKey, string accessToken)
             return client;
         }
 
-        private MinioClient GetClientInternal(Credentials credentials, string region)
+        private IMinioClient GetClientInternal(Credentials credentials, string region)
         {
             Guard.Against.Null(credentials, nameof(credentials));
             Guard.Against.NullOrWhiteSpace(credentials.AccessKeyId, nameof(credentials.AccessKeyId));

diff --git a/src/Plugins/MinIO/MinIoStartup.cs b/src/Plugins/MinIO/MinIoStartup.cs
@@ -18,7 +18,8 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Minio;
+using Minio.ApiEndpoints;
+using Minio.DataModel.Args;
 using Monai.Deploy.Storage.Configuration;
 
 namespace Monai.Deploy.Storage.MinIO

diff --git a/src/Plugins/MinIO/MinIoStorageService.cs b/src/Plugins/MinIO/MinIoStorageService.cs
@@ -19,7 +19,8 @@
 using Ardalis.GuardClauses;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Minio;
+using Minio.ApiEndpoints;
+using Minio.DataModel.Args;
 using Minio.Exceptions;
 using Monai.Deploy.Storage.API;
 using Monai.Deploy.Storage.Configuration;

diff --git a/src/Plugins/MinIO/Monai.Deploy.Storage.MinIO.csproj b/src/Plugins/MinIO/Monai.Deploy.Storage.MinIO.csproj
@@ -13,11 +13,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Monai.Deploy.Storage.MinIO</RootNamespace>
@@ -26,12 +24,10 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
     <None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
   </ItemGroup>
-
   <PropertyGroup>
     <PackageId>Monai.Deploy.Storage.MinIO</PackageId>
     <Version>0.1.0</Version>
@@ -45,24 +41,19 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Minio" Version="5.0.0" />
+    <PackageReference Include="Minio" Version="6.0.1" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
     <ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="Tests\**" />
     <EmbeddedResource Remove="Tests\**" />
     <None Remove="Tests\**" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/src/Plugins/MinIO/Tests/Integration/MinIoHealthCheckTest.cs b/src/Plugins/MinIO/Tests/Integration/MinIoHealthCheckTest.cs
@@ -45,7 +45,7 @@ public async Task CheckHealthAsync_WhenListBucketSucceeds_ReturnHealthy()
 
             _minIoClientFactory.Setup(p => p.GetBucketOperationsClient()).Returns(minioClient);
             var healthCheck = new MinIoHealthCheck(_minIoClientFactory.Object, _logger.Object);
-            var results = await healthCheck.CheckHealthAsync(new HealthCheckContext()).ConfigureAwait(false);
+            var results = await healthCheck.CheckHealthAsync(new HealthCheckContext());
 
             Assert.Equal(HealthStatus.Healthy, results.Status);
             Assert.Null(results.Exception);

diff --git a/src/Plugins/MinIO/Tests/Integration/MinIoStorageFixture.cs b/src/Plugins/MinIO/Tests/Integration/MinIoStorageFixture.cs
@@ -15,7 +15,8 @@
  */
 
 using Microsoft.Extensions.Options;
-using Minio;
+using Minio.ApiEndpoints;
+using Minio.DataModel.Args;
 using Monai.Deploy.Storage.Configuration;
 using Xunit;