Merge branch 'main' into 1.2

Author: Citrinate

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   PLUGIN_NAME: "CS2Interface"
-  DOTNET_SDK_VERSION: 9.0
+  DOTNET_SDK_VERSION: 10.0
 
 jobs:
   publish:

ArchiSteamFarm

@@ -5,14 +5,15 @@
     <AssemblyVersion>1.2.0.0</AssemblyVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Deterministic>true</Deterministic>
     <CoreCompileDependsOn>PrepareResources;$(CompileDependsOn)</CoreCompileDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.11.0-beta1.24508.2" PrivateAssets="all" />
-    <PackageReference Include="System.Composition.AttributedModel" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" IncludeAssets="compile" />
+    <PackageReference Include="System.Composition.AttributedModel" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>

CS2Interface/CS2Interface.csproj

@@ -33,10 +33,10 @@ internal GameDataResource(string url) {
 			Dictionary<string, string> kvp = new();
 			using (Stream response = await httpClient.GetStreamAsync(Url).ConfigureAwait(false)) {
 				using (StreamReader sr = new StreamReader(response)) {
-					// https://github.com/dotnet/runtime/issues/68983
-					while (!sr.EndOfStream) {
-						string[]? kv = sr.ReadLine()?.Split("=");
-						if (kv?.Length == 2) {
+					string? line;
+					while ((line = await sr.ReadLineAsync().ConfigureAwait(false)) != null) {
+						string[] kv = line.Split("=");
+						if (kv.Length == 2) {
 							kvp[kv[0]] = kv[1];
 						}
 					}

CS2Interface/GameData/GameDataResource.cs

@@ -21,7 +21,7 @@ if exist out rmdir /Q /S out
 
 rem release generic version
 
-dotnet publish CS2Interface -c "Release" -f "net9.0" -o "out/generic" "/p:LinkDuringPublish=false"
+dotnet publish CS2Interface -c "Release" -f "net10.0" -o "out/generic" "/p:LinkDuringPublish=false"
 mkdir .\out\%CurrDirName%
 copy .\out\generic\%CurrDirName%.dll .\out\%CurrDirName%
 rem comment section below (downto :zip label) if you don't want to include documentation 

build.bat

@@ -45,7 +45,7 @@ fi
 ## release generic version
 dotnet restore
 sync
-dotnet publish CS2Interface -c "Release" -f net9.0 -o "out/generic" "/p:LinkDuringPublish=false"
+dotnet publish CS2Interface -c "Release" -f net10.0 -o "out/generic" "/p:LinkDuringPublish=false"
 mkdir ./out/$plugin_name
 cp ./out/generic/$plugin_name.dll ./out/$plugin_name
 ( cd ./out/generic ; cp --parents ./*/$plugin_name.resources.dll ../../out/$plugin_name || : )