From 896dadd05a28c66fd5d4cde04db10b0009a82620 Mon Sep 17 00:00:00 2001 From: Citrinate Date: Thu, 21 Nov 2024 21:39:34 -0500 Subject: [PATCH] Update ArchiSteamFarm to 6.1.0.1 --- .github/workflows/publish.yml | 2 +- ArchiSteamFarm | 2 +- BoosterManager/BoosterManager.cs | 2 +- BoosterManager/BoosterManager.csproj | 8 ++++---- BoosterManager/IPC/Api/BoosterManagerController.cs | 2 +- build.bat | 2 +- build.sh | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0613aed..77ef7fb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,7 @@ on: [push, pull_request] env: PLUGIN_NAME: "BoosterManager" - DOTNET_SDK_VERSION: 8.0 + DOTNET_SDK_VERSION: 9.0 jobs: publish: diff --git a/ArchiSteamFarm b/ArchiSteamFarm index ce4b41e..8aa0170 160000 --- a/ArchiSteamFarm +++ b/ArchiSteamFarm @@ -1 +1 @@ -Subproject commit ce4b41ee739f028e74688ce8764b2418b1a3a8e0 +Subproject commit 8aa017050e7bbc5b75f378ff5b5a1bf32479a656 diff --git a/BoosterManager/BoosterManager.cs b/BoosterManager/BoosterManager.cs index 9766845..e47b093 100644 --- a/BoosterManager/BoosterManager.cs +++ b/BoosterManager/BoosterManager.cs @@ -67,7 +67,7 @@ public Task OnASFInit(IReadOnlyDictionary? additionalConfig } case "LogDataPageDelay" or "MarketHistoryDelay" when configProperty.Value.ValueKind == JsonValueKind.Number: { ASF.ArchiLogger.LogGenericInfo("Log Data Page Delay : " + configProperty.Value); - DataHandler.LogDataPageDelay = configProperty.Value.GetUInt32(); + DataHandler.LogDataPageDelay = configProperty.Value.ToJsonObject(); break; } case "InventoryHistoryAppFilter" when configProperty.Value.ValueKind == JsonValueKind.Array && configProperty.Value.GetArrayLength() > 0: { diff --git a/BoosterManager/BoosterManager.csproj b/BoosterManager/BoosterManager.csproj index 3484876..99dd32d 100644 --- a/BoosterManager/BoosterManager.csproj +++ b/BoosterManager/BoosterManager.csproj @@ -2,17 +2,17 @@ Citrinate - 2.10.1.2 + 2.10.2.0 enable latest - net8.0 + net9.0 true PrepareResources;$(CompileDependsOn) - - + + diff --git a/BoosterManager/IPC/Api/BoosterManagerController.cs b/BoosterManager/IPC/Api/BoosterManagerController.cs index ef40947..a9fd072 100644 --- a/BoosterManager/IPC/Api/BoosterManagerController.cs +++ b/BoosterManager/IPC/Api/BoosterManagerController.cs @@ -12,7 +12,7 @@ using Swashbuckle.AspNetCore.Annotations; namespace BoosterManager { - [Route("Api/BoosterManager", Name = nameof(BoosterManager))] + [Route("Api/BoosterManager")] public sealed class BoosterManagerController : ArchiController { /// /// Retrieves booster data for given bot. diff --git a/build.bat b/build.bat index d15905b..8bf6aa3 100644 --- a/build.bat +++ b/build.bat @@ -21,7 +21,7 @@ if exist out rmdir /Q /S out rem release generic version -dotnet publish BoosterManager -c "Release" -f "net8.0" -o "out/generic" "/p:LinkDuringPublish=false" +dotnet publish BoosterManager -c "Release" -f "net9.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 85632d3..30ab0ab 100755 --- a/build.sh +++ b/build.sh @@ -45,7 +45,7 @@ fi ## release generic version dotnet restore sync -dotnet publish BoosterManager -c "Release" -f net8.0 -o "out/generic" "/p:LinkDuringPublish=false" +dotnet publish BoosterManager -c "Release" -f net9.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 || : )