diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0401c2b..64bdae3 100644 --- a/.github/workflows/publish.yml +++ b/.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: diff --git a/ArchiSteamFarm b/ArchiSteamFarm index fc198d6..8547097 160000 --- a/ArchiSteamFarm +++ b/ArchiSteamFarm @@ -1 +1 @@ -Subproject commit fc198d6eae34532bc5b8e569857c36f060600a58 +Subproject commit 8547097e78c508bbcaab593dbf2c8fbd1af55465 diff --git a/CS2Interface/CS2Interface.csproj b/CS2Interface/CS2Interface.csproj index 02a5b34..a4ed0c1 100644 --- a/CS2Interface/CS2Interface.csproj +++ b/CS2Interface/CS2Interface.csproj @@ -2,17 +2,18 @@ Citrinate - 1.1.1.8 + 1.1.2.0 enable latest - net9.0 + net10.0 true PrepareResources;$(CompileDependsOn) - + + diff --git a/CS2Interface/GameData/GameDataResource.cs b/CS2Interface/GameData/GameDataResource.cs index 52f4fb4..ac6bc1e 100644 --- a/CS2Interface/GameData/GameDataResource.cs +++ b/CS2Interface/GameData/GameDataResource.cs @@ -33,10 +33,10 @@ internal GameDataResource(string url) { Dictionary 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]; } } diff --git a/build.bat b/build.bat index 3a7c4a9..3e8c541 100644 --- a/build.bat +++ b/build.bat @@ -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 diff --git a/build.sh b/build.sh index 898acfa..a8b3820 100755 --- a/build.sh +++ b/build.sh @@ -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 || : )