.NET 10 (#3482)

JustArchi · web-flow · commit c8e8cd27b808 · 2025-11-11T16:37:43.000+01:00
* Initial .NET 10 bump

* Use KnownIPNetworks

* .NET 10 library updates

* First round of trimming fixes

* Fix docker in .NET 10

* Resolve trimming warning

* Bump packages to rc2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 env:
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
-  DOTNET_SDK_VERSION: 9.0
+  DOTNET_SDK_VERSION: 10.0
 
 permissions: {}
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,7 +6,7 @@ env:
   CONFIGURATION: Release
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
-  DOTNET_SDK_VERSION: 9.0
+  DOTNET_SDK_VERSION: 10.0
   NODE_JS_VERSION: 'lts/*'
   PLUGINS_BUNDLED: ArchiSteamFarm.OfficialPlugins.ItemsMatcher ArchiSteamFarm.OfficialPlugins.MobileAuthenticator ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
   PLUGINS_INCLUDED: ArchiSteamFarm.OfficialPlugins.Monitoring # Apart from declaring them here, there is certain amount of hardcoding needed below for uploading
diff --git a/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj b/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj
@@ -5,6 +5,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" IncludeAssets="compile" />
 		<PackageReference Include="SteamKit2" IncludeAssets="compile" />
 		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
 	</ItemGroup>
diff --git a/ArchiSteamFarm.CustomPlugins.PeriodicGC/ArchiSteamFarm.CustomPlugins.PeriodicGC.csproj b/ArchiSteamFarm.CustomPlugins.PeriodicGC/ArchiSteamFarm.CustomPlugins.PeriodicGC.csproj
@@ -5,6 +5,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" IncludeAssets="compile" />
 		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
 	</ItemGroup>
 
diff --git a/ArchiSteamFarm.CustomPlugins.SignInWithSteam/ArchiSteamFarm.CustomPlugins.SignInWithSteam.csproj b/ArchiSteamFarm.CustomPlugins.SignInWithSteam/ArchiSteamFarm.CustomPlugins.SignInWithSteam.csproj
@@ -6,6 +6,7 @@
 	<ItemGroup>
 		<PackageReference Include="AngleSharp" IncludeAssets="compile" />
 		<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" IncludeAssets="compile" />
 		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
 	</ItemGroup>
 
diff --git a/ArchiSteamFarm.OfficialPlugins.ItemsMatcher/ArchiSteamFarm.OfficialPlugins.ItemsMatcher.csproj b/ArchiSteamFarm.OfficialPlugins.ItemsMatcher/ArchiSteamFarm.OfficialPlugins.ItemsMatcher.csproj
@@ -5,10 +5,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" IncludeAssets="compile" />
 		<PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" PrivateAssets="all" />
 		<PackageReference Include="SteamKit2" IncludeAssets="compile" />
 		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
-		<PackageReference Include="System.Linq.Async" IncludeAssets="compile" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ArchiSteamFarm.OfficialPlugins.MobileAuthenticator/ArchiSteamFarm.OfficialPlugins.MobileAuthenticator.csproj b/ArchiSteamFarm.OfficialPlugins.MobileAuthenticator/ArchiSteamFarm.OfficialPlugins.MobileAuthenticator.csproj
@@ -5,6 +5,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" IncludeAssets="compile" />
 		<PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" PrivateAssets="all" />
 		<PackageReference Include="SteamKit2" IncludeAssets="compile" />
 		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
diff --git a/ArchiSteamFarm.OfficialPlugins.Monitoring/ArchiSteamFarm.OfficialPlugins.Monitoring.csproj b/ArchiSteamFarm.OfficialPlugins.Monitoring/ArchiSteamFarm.OfficialPlugins.Monitoring.csproj
@@ -6,6 +6,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" IncludeAssets="compile" />
 		<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" />
 		<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
 		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper.csproj b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper.csproj
@@ -5,6 +5,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" IncludeAssets="compile" />
 		<PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" PrivateAssets="all" />
 		<PackageReference Include="SteamKit2" IncludeAssets="compile" />
 		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -18,7 +18,6 @@
 		<PackageReference Include="Scalar.AspNetCore" />
 		<PackageReference Include="SteamKit2" />
 		<PackageReference Include="System.Composition" />
-		<PackageReference Include="System.Linq.Async" />
 		<PackageReference Include="System.Security.Cryptography.ProtectedData" />
 	</ItemGroup>
 
diff --git a/ArchiSteamFarm/Core/Utilities.cs b/ArchiSteamFarm/Core/Utilities.cs
@@ -313,7 +313,7 @@ internal static async Task<bool> UpdateFromArchive(ZipArchive zipArchive, string
 		// Now extract the zip file to entirely new location, this decreases chance of corruptions if user kills the process during this stage
 		string updateDirectory = Path.Combine(targetDirectory, SharedInfo.UpdateDirectoryNew);
 
-		zipArchive.ExtractToDirectory(updateDirectory, true);
+		await zipArchive.ExtractToDirectoryAsync(updateDirectory, true).ConfigureAwait(false);
 
 		// Now, critical section begins, we're going to move all files from target directory to a backup directory
 		string backupDirectory = Path.Combine(targetDirectory, SharedInfo.UpdateDirectoryOld);
diff --git a/ArchiSteamFarm/IPC/ArchiKestrel.cs b/ArchiSteamFarm/IPC/ArchiKestrel.cs
@@ -56,7 +56,7 @@
 using Microsoft.Net.Http.Headers;
 using NLog.Web;
 using Scalar.AspNetCore;
-using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
+using IPNetwork = System.Net.IPNetwork;
 
 namespace ArchiSteamFarm.IPC;
 
@@ -323,7 +323,7 @@ private static void ConfigureServices([SuppressMessage("ReSharper", "SuggestBase
 
 				if (knownNetworks != null) {
 					foreach (IPNetwork knownNetwork in knownNetworks) {
-						options.KnownNetworks.Add(knownNetwork);
+						options.KnownIPNetworks.Add(knownNetwork);
 					}
 				}
 			}
diff --git a/ArchiSteamFarm/IPC/Integration/ApiAuthenticationMiddleware.cs b/ArchiSteamFarm/IPC/Integration/ApiAuthenticationMiddleware.cs
@@ -124,19 +124,19 @@ internal static bool UnbanIP(IPAddress ipAddress) {
 				return (HttpStatusCode.OK, true);
 			}
 
-			if (ForwardedHeadersOptions.KnownNetworks.Count == 0) {
+			if (ForwardedHeadersOptions.KnownIPNetworks.Count == 0) {
 				return (HttpStatusCode.Forbidden, true);
 			}
 
 			if (clientIP.IsIPv4MappedToIPv6) {
 				IPAddress mappedClientIP = clientIP.MapToIPv4();
 
-				if (ForwardedHeadersOptions.KnownNetworks.Any(network => network.Contains(mappedClientIP))) {
+				if (ForwardedHeadersOptions.KnownIPNetworks.Any(network => network.Contains(mappedClientIP))) {
 					return (HttpStatusCode.OK, true);
 				}
 			}
 
-			return (ForwardedHeadersOptions.KnownNetworks.Any(network => network.Contains(clientIP)) ? HttpStatusCode.OK : HttpStatusCode.Forbidden, true);
+			return (ForwardedHeadersOptions.KnownIPNetworks.Any(network => network.Contains(clientIP)) ? HttpStatusCode.OK : HttpStatusCode.Forbidden, true);
 		}
 
 		if (!context.Request.Headers.TryGetValue(HeadersField, out StringValues passwords) && !context.Request.Query.TryGetValue("password", out passwords)) {
diff --git a/ArchiSteamFarm/IPC/Integration/CustomSwaggerAttribute.cs b/ArchiSteamFarm/IPC/Integration/CustomSwaggerAttribute.cs
@@ -23,7 +23,7 @@
 
 using System;
 using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace ArchiSteamFarm.IPC.Integration;
 
diff --git a/ArchiSteamFarm/IPC/Integration/SwaggerItemsMinMaxAttribute.cs b/ArchiSteamFarm/IPC/Integration/SwaggerItemsMinMaxAttribute.cs
@@ -22,8 +22,9 @@
 // limitations under the License.
 
 using System;
+using System.Globalization;
 using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace ArchiSteamFarm.IPC.Integration;
 
@@ -45,16 +46,16 @@ public uint MinimumUint {
 	public override void Apply(OpenApiSchema schema) {
 		ArgumentNullException.ThrowIfNull(schema);
 
-		if (schema.Items == null) {
+		if (schema.Items is not OpenApiSchema items) {
 			throw new InvalidOperationException(nameof(schema.Items));
 		}
 
 		if (BackingMinimum.HasValue) {
-			schema.Items.Minimum = BackingMinimum.Value;
+			items.Minimum = BackingMinimum.Value.ToString(CultureInfo.InvariantCulture);
 		}
 
 		if (BackingMaximum.HasValue) {
-			schema.Items.Maximum = BackingMaximum.Value;
+			items.Maximum = BackingMaximum.Value.ToString(CultureInfo.InvariantCulture);
 		}
 	}
 }
diff --git a/ArchiSteamFarm/IPC/Integration/SwaggerSecurityCriticalAttribute.cs b/ArchiSteamFarm/IPC/Integration/SwaggerSecurityCriticalAttribute.cs
@@ -22,10 +22,9 @@
 // limitations under the License.
 
 using System;
+using System.Text.Json.Nodes;
 using JetBrains.Annotations;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace ArchiSteamFarm.IPC.Integration;
 
@@ -36,10 +35,20 @@ public sealed class SwaggerSecurityCriticalAttribute : CustomSwaggerAttribute {
 	public override void Apply(OpenApiSchema schema) {
 		ArgumentNullException.ThrowIfNull(schema);
 
-		if (schema.Items is { Reference: null }) {
-			schema.Items.AddExtension(ExtensionName, new OpenApiBoolean(true));
-		} else {
-			schema.AddExtension(ExtensionName, new OpenApiBoolean(true));
+		JsonValue value = JsonValue.Create(true);
+
+		if (schema.Items != null) {
+			if (schema.Items is OpenApiSchema items) {
+				items.AddExtension(ExtensionName, new JsonNodeExtension(value));
+			} else if (schema.Items.Extensions != null) {
+				schema.Items.Extensions[ExtensionName] = new JsonNodeExtension(value);
+			} else {
+				throw new InvalidOperationException(nameof(schema.Items));
+			}
+
+			return;
 		}
+
+		schema.AddExtension(ExtensionName, new JsonNodeExtension(value));
 	}
 }
diff --git a/ArchiSteamFarm/IPC/Integration/SwaggerSteamIdentifierAttribute.cs b/ArchiSteamFarm/IPC/Integration/SwaggerSteamIdentifierAttribute.cs
@@ -22,8 +22,9 @@
 // limitations under the License.
 
 using System;
+using System.Globalization;
 using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using SteamKit2;
 
 namespace ArchiSteamFarm.IPC.Integration;
@@ -38,7 +39,7 @@ public sealed class SwaggerSteamIdentifierAttribute : CustomSwaggerAttribute {
 	public override void Apply(OpenApiSchema schema) {
 		ArgumentNullException.ThrowIfNull(schema);
 
-		schema.Minimum = new SteamID(MinimumAccountID, Universe, AccountType);
-		schema.Maximum = new SteamID(MaximumAccountID, Universe, AccountType);
+		schema.Minimum = new SteamID(MinimumAccountID, Universe, AccountType).ConvertToUInt64().ToString(CultureInfo.InvariantCulture);
+		schema.Maximum = new SteamID(MaximumAccountID, Universe, AccountType).ConvertToUInt64().ToString(CultureInfo.InvariantCulture);
 	}
 }
diff --git a/ArchiSteamFarm/IPC/Integration/SwaggerValidValuesAttribute.cs b/ArchiSteamFarm/IPC/Integration/SwaggerValidValuesAttribute.cs
@@ -22,36 +22,50 @@
 // limitations under the License.
 
 using System;
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Nodes;
 using JetBrains.Annotations;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace ArchiSteamFarm.IPC.Integration;
 
 [PublicAPI]
 public sealed class SwaggerValidValuesAttribute : CustomSwaggerAttribute {
+	private const string ExtensionName = "x-valid-values";
+
 	public int[]? ValidIntValues { get; init; }
 	public string[]? ValidStringValues { get; init; }
 
+	[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We're not creating json values with non-primitive types")]
 	public override void Apply(OpenApiSchema schema) {
 		ArgumentNullException.ThrowIfNull(schema);
 
-		OpenApiArray validValues = [];
+		JsonArray validValues = [];
 
 		if (ValidIntValues != null) {
-			validValues.AddRange(ValidIntValues.Select(static type => new OpenApiInteger(type)));
+			foreach (int value in ValidIntValues) {
+				validValues.Add(JsonValue.Create(value));
+			}
 		}
 
 		if (ValidStringValues != null) {
-			validValues.AddRange(ValidStringValues.Select(static type => new OpenApiString(type)));
+			foreach (string value in ValidStringValues) {
+				validValues.Add(JsonValue.Create(value));
+			}
 		}
 
-		if (schema.Items is { Reference: null }) {
-			schema.Items.AddExtension("x-valid-values", validValues);
-		} else {
-			schema.AddExtension("x-valid-values", validValues);
+		if (schema.Items != null) {
+			if (schema.Items is OpenApiSchema items) {
+				items.AddExtension(ExtensionName, new JsonNodeExtension(validValues));
+			} else if (schema.Items.Extensions != null) {
+				schema.Items.Extensions[ExtensionName] = new JsonNodeExtension(validValues);
+			} else {
+				throw new InvalidOperationException(nameof(schema.Items));
+			}
+
+			return;
 		}
+
+		schema.AddExtension(ExtensionName, new JsonNodeExtension(validValues));
 	}
 }
diff --git a/ArchiSteamFarm/IPC/OpenApi/DocumentTransformer.cs b/ArchiSteamFarm/IPC/OpenApi/DocumentTransformer.cs
@@ -29,7 +29,7 @@
 using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace ArchiSteamFarm.IPC.OpenApi;
 
@@ -40,7 +40,6 @@ public Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerC
 		ArgumentNullException.ThrowIfNull(document);
 		ArgumentNullException.ThrowIfNull(context);
 
-		document.Info ??= new OpenApiInfo();
 		document.Info.Title = $"{SharedInfo.AssemblyName} API";
 		document.Info.Version = SharedInfo.Version.ToString();
 
@@ -53,7 +52,7 @@ public Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerC
 		document.Info.License.Url = new Uri(SharedInfo.LicenseURL);
 
 		document.Components ??= new OpenApiComponents();
-		document.Components.SecuritySchemes ??= new Dictionary<string, OpenApiSecurityScheme>(1);
+		document.Components.SecuritySchemes ??= new Dictionary<string, IOpenApiSecurityScheme>(1);
 
 		document.Components.SecuritySchemes.Add(
 			nameof(GlobalConfig.IPCPassword), new OpenApiSecurityScheme {
diff --git a/ArchiSteamFarm/IPC/OpenApi/OperationTransformer.cs b/ArchiSteamFarm/IPC/OpenApi/OperationTransformer.cs
@@ -28,7 +28,7 @@
 using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace ArchiSteamFarm.IPC.OpenApi;
 
@@ -45,13 +45,7 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
 			operation.Security.Add(
 				new OpenApiSecurityRequirement {
 					{
-						new OpenApiSecurityScheme {
-							Reference = new OpenApiReference {
-								Id = nameof(GlobalConfig.IPCPassword),
-								Type = ReferenceType.SecurityScheme
-							}
-						},
-
+						new OpenApiSecuritySchemeReference(nameof(GlobalConfig.IPCPassword), context.Document),
 						[]
 					}
 				}
diff --git a/ArchiSteamFarm/IPC/OpenApi/SchemaTransformer.cs b/ArchiSteamFarm/IPC/OpenApi/SchemaTransformer.cs
diff --git a/ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/overlay/variant-specific/docker/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/variant-specific/docker/ArchiSteamFarm.sh
diff --git a/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm-Service.sh
diff --git a/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm.sh
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/Directory.Packages.props b/Directory.Packages.props
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile.Service b/Dockerfile.Service
