From 6e08a0d5360d25acc7a8347a75114880782a0a8e Mon Sep 17 00:00:00 2001 From: Khoa Date: Thu, 15 Jan 2026 03:34:46 +0700 Subject: [PATCH 1/2] ASMO-7538 Update package to .net 10 --- .editorconfig | 1 + .github/workflows/cicd.yaml | 2 +- .../Samhammer.AzureBlobStorage.Test.csproj | 18 +++++++++--------- .../HealthCheckBuilderExtensions.cs | 2 +- .../Samhammer.AzureBlobStorage.csproj | 18 +++++++++--------- .../Services/AzureBlobStorageService.cs | 13 +++++++++++-- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.editorconfig b/.editorconfig index af52bcb..a34c3e0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,7 @@ insert_final_newline = true indent_style = space indent_size = 4 charset = utf-8-bom +dotnet_diagnostic.SA1413.severity = none [*.json] indent_size = 2 diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 3065f12..57ee33a 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -20,7 +20,7 @@ jobs: id: tag - uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - run: echo "::remove-matcher owner=csc::" - uses: reviewdog/action-setup@v1 - run: dotnet --info diff --git a/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj b/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj index 3c55a85..1c894a4 100644 --- a/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj +++ b/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 false ..\stylecop.ruleset @@ -11,24 +11,24 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers - - - + + + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Samhammer.AzureBlobStorage/HealthCheckBuilderExtensions.cs b/src/Samhammer.AzureBlobStorage/HealthCheckBuilderExtensions.cs index a0d4c13..42a84dc 100644 --- a/src/Samhammer.AzureBlobStorage/HealthCheckBuilderExtensions.cs +++ b/src/Samhammer.AzureBlobStorage/HealthCheckBuilderExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Azure.Storage.Blobs; -using HealthChecks.AzureStorage; +using HealthChecks.Azure.Storage.Blobs; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; using Samhammer.AzureBlobStorage.Client; diff --git a/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj b/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj index 4103501..cd6fa5c 100644 --- a/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj +++ b/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj @@ -24,15 +24,15 @@ - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Samhammer.AzureBlobStorage/Services/AzureBlobStorageService.cs b/src/Samhammer.AzureBlobStorage/Services/AzureBlobStorageService.cs index 671a797..c7b8914 100644 --- a/src/Samhammer.AzureBlobStorage/Services/AzureBlobStorageService.cs +++ b/src/Samhammer.AzureBlobStorage/Services/AzureBlobStorageService.cs @@ -65,8 +65,12 @@ public async IAsyncEnumerable ListBlobsInContainerAsync(string { var containerClient = await GetContainerClient(containerName); var folderNamePrefix = GetFolderNamePrefix(folderName); + var getBlobOptions = new GetBlobsOptions + { + Prefix = folderNamePrefix + }; - var blobs = containerClient.GetBlobsAsync(prefix: folderNamePrefix); + var blobs = containerClient.GetBlobsAsync(getBlobOptions); await foreach (var blob in blobs) { @@ -155,7 +159,12 @@ public async Task DeleteFolderAsync(string folderName, string containerName = nu { var containerClient = await GetContainerClient(containerName); var folderNamePrefix = GetFolderNamePrefix(folderName); - var blobs = containerClient.GetBlobsAsync(prefix: folderNamePrefix); + var getBlobOptions = new GetBlobsOptions + { + Prefix = folderNamePrefix + }; + + var blobs = containerClient.GetBlobsAsync(getBlobOptions); await foreach (var blob in blobs) { From f7716cedab1783c50ad2dba800b8061a9534a362 Mon Sep 17 00:00:00 2001 From: Khoa Date: Thu, 15 Jan 2026 10:52:10 +0700 Subject: [PATCH 2/2] ASMO-7538 update stypecop --- .../Samhammer.AzureBlobStorage.Test.csproj | 2 +- .../Samhammer.AzureBlobStorage.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj b/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj index 1c894a4..432341f 100644 --- a/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj +++ b/src/Samhammer.AzureBlobStorage.Test/Samhammer.AzureBlobStorage.Test.csproj @@ -18,7 +18,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj b/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj index cd6fa5c..eb8e24f 100644 --- a/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj +++ b/src/Samhammer.AzureBlobStorage/Samhammer.AzureBlobStorage.csproj @@ -33,7 +33,7 @@ - + all runtime; build; native; contentfiles; analyzers