Update Docker runtime and publish profile to .NET 10

woutervanranst · woutervanranst · commit d2026ca002d3 · 2025-11-12T19:46:01.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       - name: "🧰 Setup .NET"
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: 10.x
 
       - name: "🏗️ Build Arius.Cli"
         run: dotnet build Arius.Cli/Arius.Cli.csproj --configuration Release
@@ -79,7 +79,7 @@ jobs:
       - name: "🧰 Setup .NET"
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: 10.x
 
       - name: "🧮 Determine version"
         id: get_version
@@ -164,7 +164,7 @@ jobs:
       - name: "🧰 Setup .NET"
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: 10.x
 
       - name: "🧪 Run Arius.Explorer & Core Tests"
         env:
@@ -205,7 +205,7 @@ jobs:
       - name: "🧰 Setup .NET"
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: 10.x
 
       - name: "🧮 Determine version"
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.x
+        dotnet-version: 10.x
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v4
       with:
diff --git a/src/Arius.Benchmarks/Arius.Benchmarks.csproj b/src/Arius.Benchmarks/Arius.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Arius.Cli.Tests/Arius.Cli.Tests.csproj b/src/Arius.Cli.Tests/Arius.Cli.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
diff --git a/src/Arius.Cli/Arius.Cli.csproj b/src/Arius.Cli/Arius.Cli.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net9.0</TargetFramework>
+              <TargetFramework>net10.0</TargetFramework>
 		<UserSecretsId>2c53e63e-555d-44f4-a474-29c01fb8c564</UserSecretsId>
 		<AssemblyName>arius</AssemblyName>
 		
diff --git a/src/Arius.Cli/Dockerfile b/src/Arius.Cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/runtime:9.0
+FROM mcr.microsoft.com/dotnet/runtime:10.0
 WORKDIR /app
 
 # Copy the prebuilt artifacts into the image
diff --git a/src/Arius.Core.DbMigrationV3V5/Arius.Core.DbMigrationV3V5.csproj b/src/Arius.Core.DbMigrationV3V5/Arius.Core.DbMigrationV3V5.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net9.0</TargetFramework>
+              <TargetFramework>net10.0</TargetFramework>
 		<UserSecretsId>1ce3e36f-cb01-4aac-bf1a-e2c0cebdd61c</UserSecretsId>
 	</PropertyGroup>
 
diff --git a/src/Arius.Core.Tests/Arius.Core.Tests.csproj b/src/Arius.Core.Tests/Arius.Core.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+              <TargetFramework>net10.0</TargetFramework>
 
 		<IsPackable>false</IsPackable>
 		<IsTestProject>true</IsTestProject>
diff --git a/src/Arius.Core/Arius.Core.csproj b/src/Arius.Core/Arius.Core.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+              <TargetFramework>net10.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -17,7 +17,6 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
-		<PackageReference Include="System.Linq.Async" />
 		<PackageReference Include="Zio" />
 			<!--<PrivateAssets>compile;build;buildTransitive;contentFiles;analyzers;native</PrivateAssets>-->
 		
diff --git a/src/Arius.Core/Features/Queries/PointerFileEntries/PointerFileEntriesQueryHandler.cs b/src/Arius.Core/Features/Queries/PointerFileEntries/PointerFileEntriesQueryHandler.cs
@@ -33,7 +33,7 @@ public async IAsyncEnumerable<PointerFileEntriesQueryResult> Handle(PointerFileE
         }
     }
 
-    internal async IAsyncEnumerable<PointerFileEntriesQueryResult> Handle(HandlerContext handlerContext, CancellationToken cancellationToken)
+    internal async IAsyncEnumerable<PointerFileEntriesQueryResult> Handle(HandlerContext handlerContext, [EnumeratorCancellation] CancellationToken cancellationToken)
     {
         var resultChannel = Channel.CreateUnbounded<PointerFileEntriesQueryResult>(new UnboundedChannelOptions
         {
diff --git a/src/Arius.Core/Shared/Storage/AzureBlobStorageContainer.cs b/src/Arius.Core/Shared/Storage/AzureBlobStorageContainer.cs
@@ -6,6 +6,7 @@
 using FluentResults;
 using Microsoft.Extensions.Logging;
 using System.Net;
+using System.Runtime.CompilerServices;
 
 namespace Arius.Core.Shared.Storage;
 
@@ -77,17 +78,22 @@ public async Task<bool> ContainerExistsAsync()
         }
     }
 
-    public IAsyncEnumerable<StorageProperties> GetAllAsync(string prefix, CancellationToken cancellationToken = default)
+    public async IAsyncEnumerable<StorageProperties> GetAllAsync(string prefix, [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         logger.LogDebug("Listing blobs with prefix '{Prefix}' from container '{ContainerName}'", prefix, blobContainerClient.Name);
-        return blobContainerClient.GetBlobsAsync(prefix: prefix, traits: BlobTraits.Metadata, cancellationToken: cancellationToken)
-            .Select(blob => new StorageProperties(
+
+        await foreach (var blob in blobContainerClient
+                               .GetBlobsAsync(prefix: prefix, traits: BlobTraits.Metadata, cancellationToken: cancellationToken)
+                               .WithCancellation(cancellationToken))
+        {
+            yield return new StorageProperties(
                 Name: blob.Name,
                 ContentType: blob.Properties.ContentType,
                 Metadata: blob.Metadata,
                 StorageTier: blob.Properties.AccessTier.ToStorageTier(),
                 ContentLength: blob.Properties.ContentLength ?? -1
-            ));
+            );
+        }
     }
 
     public async Task<Result<Stream>> OpenReadAsync(string blobName, IProgress<long>? progress = default, CancellationToken cancellationToken = default)
diff --git a/src/Arius.Core/Shared/Storage/EncryptedCompressedStorage.cs b/src/Arius.Core/Shared/Storage/EncryptedCompressedStorage.cs
@@ -3,6 +3,7 @@
 using Arius.Core.Shared.Hashing;
 using FluentResults;
 using System.IO.Compression;
+using System.Runtime.CompilerServices;
 using Zio;
 
 namespace Arius.Core.Shared.Storage;
@@ -41,12 +42,26 @@ public Task<bool> ContainerExistsAsync()
 
     // -- STATES
 
-    public IAsyncEnumerable<string> GetStates(CancellationToken cancellationToken = default)
+    public async IAsyncEnumerable<string> GetStates([EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        return container.GetAllAsync(statesFolderPrefix, cancellationToken)
-            .OrderBy(sp => sp.Name)
-            .Where(sp => sp.Metadata != null && sp.Metadata.TryGetValue("DatabaseVersion", out var version) && version == "5") // Get all v5 states
-            .Select(sp => sp.Name[statesFolderPrefix.Length..]); // remove the "states/" prefix
+        var states = new List<string>();
+
+        await foreach (var storageProperties in container
+                           .GetAllAsync(statesFolderPrefix, cancellationToken)
+                           .WithCancellation(cancellationToken))
+        {
+            if (storageProperties.Metadata != null
+                && storageProperties.Metadata.TryGetValue("DatabaseVersion", out var version)
+                && version == "5")
+            {
+                states.Add(storageProperties.Name[statesFolderPrefix.Length..]);
+            }
+        }
+
+        foreach (var state in states.OrderBy(static name => name, StringComparer.Ordinal))
+        {
+            yield return state;
+        }
     }
 
     public async Task DownloadStateAsync(string stateName, FileEntry targetFile, CancellationToken cancellationToken = default)
diff --git a/src/Arius.Explorer.Tests/Arius.Explorer.Tests.csproj b/src/Arius.Explorer.Tests/Arius.Explorer.Tests.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFramework>net9.0-windows</TargetFramework>
+      <TargetFramework>net10.0-windows</TargetFramework>
+      <EnableWindowsTargeting>true</EnableWindowsTargeting>
 	<IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Arius.Explorer/Arius.Explorer.csproj b/src/Arius.Explorer/Arius.Explorer.csproj
@@ -2,7 +2,8 @@
 
         <PropertyGroup>
                 <OutputType>WinExe</OutputType>
-                <TargetFramework>net9.0-windows</TargetFramework>
+                <TargetFramework>net10.0-windows</TargetFramework>
+                <EnableWindowsTargeting>true</EnableWindowsTargeting>
 
                 <UseWPF>true</UseWPF>
 
diff --git a/src/Arius.Explorer/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/Arius.Explorer/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -20,7 +20,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
     <Platform>Any CPU</Platform>
     <ProductName>Arius</ProductName>
-    <PublishDir>bin\Release\net9.0-windows\app.publish\</PublishDir>
+    <PublishDir>bin\Release\net10.0-windows\app.publish\</PublishDir>
     <PublishProtocol>ClickOnce</PublishProtocol>
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishSingleFile>False</PublishSingleFile>
@@ -30,16 +30,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SignManifests>False</SignManifests>
     <SkipPublishVerification>false</SkipPublishVerification>
     <SupportUrl>https://github.com/woutervanranst/Arius</SupportUrl>
-    <TargetFramework>net9.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <UpdateEnabled>True</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateRequired>False</UpdateRequired>
     <WebPageFileName>Publish.html</WebPageFileName>
   </PropertyGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.NetCore.DesktopRuntime.9.0.x64">
+    <BootstrapperPackage Include="Microsoft.NetCore.DesktopRuntime.10.0.x64">
       <Install>true</Install>
-      <ProductName>.NET Desktop Runtime 9.0 (x64)</ProductName>
+      <ProductName>.NET Desktop Runtime 10.0 (x64)</ProductName>
     </BootstrapperPackage>
   </ItemGroup>
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -44,7 +44,6 @@
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="Spectre.Console" Version="0.53.0" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
     <PackageVersion Include="System.Reactive" Version="6.1.0" />
     <PackageVersion Include="TngTech.ArchUnitNET" Version="0.12.3" />
     <PackageVersion Include="WouterVanRanst.Utils" Version="2.0.10" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/dotnet/runtime:9.0`
	`1`	`+FROM mcr.microsoft.com/dotnet/runtime:10.0`
`2`	`2`	`WORKDIR /app`
`3`	`3`
`4`	`4`	`# Copy the prebuilt artifacts into the image`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async IAsyncEnumerable<PointerFileEntriesQueryResult> Handle(PointerFileE`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- internal async IAsyncEnumerable<PointerFileEntriesQueryResult> Handle(HandlerContext handlerContext, CancellationToken cancellationToken)`
	`36`	`+ internal async IAsyncEnumerable<PointerFileEntriesQueryResult> Handle(HandlerContext handlerContext, [EnumeratorCancellation] CancellationToken cancellationToken)`
`37`	`37`	`{`
`38`	`38`	`var resultChannel = Channel.CreateUnbounded<PointerFileEntriesQueryResult>(new UnboundedChannelOptions`
`39`	`39`	`{`