From 02350a550fbb32a39b0d6b24c352399cbd94e282 Mon Sep 17 00:00:00 2001 From: Citrinate Date: Thu, 21 Nov 2024 21:38:52 -0500 Subject: [PATCH] Update ArchiSteamFarm to 6.1.0.1 --- .github/workflows/publish.yml | 2 +- ArchiSteamFarm | 2 +- CS2Interface/CS2Interface.csproj | 8 ++++---- CS2Interface/IPC/Api/CS2InterfaceController.cs | 16 ++++++---------- build.bat | 2 +- build.sh | 2 +- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 46d03a6..47a8ba7 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: 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/CS2Interface/CS2Interface.csproj b/CS2Interface/CS2Interface.csproj index edb73e1..8ea7019 100644 --- a/CS2Interface/CS2Interface.csproj +++ b/CS2Interface/CS2Interface.csproj @@ -2,17 +2,17 @@ Citrinate - 1.0.11.1 + 1.0.12.0 enable latest - net8.0 + net9.0 true PrepareResources;$(CompileDependsOn) - - + + diff --git a/CS2Interface/IPC/Api/CS2InterfaceController.cs b/CS2Interface/IPC/Api/CS2InterfaceController.cs index da0a799..5736c13 100644 --- a/CS2Interface/IPC/Api/CS2InterfaceController.cs +++ b/CS2Interface/IPC/Api/CS2InterfaceController.cs @@ -13,13 +13,13 @@ using Swashbuckle.AspNetCore.Annotations; namespace CS2Interface { - [Route("Api/CS2Interface", Name = nameof(CS2Interface))] + [Route("Api/CS2Interface")] public sealed class CS2InterfaceController : ArchiController { [HttpGet("{botNames:required}/Start")] [SwaggerOperation (Summary = "Starts the CS2 Interface")] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] - public async Task> Start([FromRoute] string botNames) { + public async Task> Start(string botNames) { if (string.IsNullOrEmpty(botNames)) { throw new ArgumentNullException(nameof(botNames)); } @@ -39,7 +39,7 @@ public async Task> Start([FromRoute] string botNam [SwaggerOperation (Summary = "Stops the CS2 Interface")] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] - public ActionResult Stop([FromRoute] string botNames) { + public ActionResult Stop(string botNames) { if (string.IsNullOrEmpty(botNames)) { throw new ArgumentNullException(nameof(botNames)); } @@ -61,7 +61,6 @@ public ActionResult Stop([FromRoute] string botNames) { [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)] public async Task> InspectItem( - [FromRoute] string botNames, [FromQuery] [SwaggerParameter(Description = "The item's inspect link", Required = false)] @@ -140,7 +139,7 @@ public async Task> InspectItem( [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)] - public async Task> PlayerProfile([FromRoute] string botName, [FromRoute] ulong steamID) { + public async Task> PlayerProfile(string botName, ulong steamID) { if (string.IsNullOrEmpty(botName)) { throw new ArgumentNullException(nameof(botName)); } @@ -170,7 +169,6 @@ public async Task> PlayerProfile([FromRoute] strin [ProducesResponseType(typeof(GenericResponse>), (int) HttpStatusCode.OK)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] public ActionResult Inventory( - [FromRoute] string botName, [FromQuery] [SwaggerParameter(Description = "If true, only the data recieved from the CS2 client will be provided", Required = false)] @@ -209,9 +207,7 @@ public ActionResult Inventory( [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)] public async Task> GetCrateContents( - [FromRoute] string botName, - [FromRoute] ulong crateID, [FromQuery] [SwaggerParameter(Description = "If true, only the data recieved from the CS2 client will be provided", Required = false)] @@ -251,7 +247,7 @@ public async Task> GetCrateContents( [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)] - public async Task> StoreItem([FromRoute] string botName, [FromRoute] ulong crateID, [FromRoute] ulong itemID) { + public async Task> StoreItem(string botName, ulong crateID, ulong itemID) { if (string.IsNullOrEmpty(botName)) { throw new ArgumentNullException(nameof(botName)); } @@ -280,7 +276,7 @@ public async Task> StoreItem([FromRoute] string bo [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)] [ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)] - public async Task> RetrieveItem([FromRoute] string botName, [FromRoute] ulong crateID, [FromRoute] ulong itemID) { + public async Task> RetrieveItem(string botName, ulong crateID, ulong itemID) { if (string.IsNullOrEmpty(botName)) { throw new ArgumentNullException(nameof(botName)); } diff --git a/build.bat b/build.bat index 925de28..3a7c4a9 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 "net8.0" -o "out/generic" "/p:LinkDuringPublish=false" +dotnet publish CS2Interface -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 c7ec506..898acfa 100755 --- a/build.sh +++ b/build.sh @@ -45,7 +45,7 @@ fi ## release generic version dotnet restore sync -dotnet publish CS2Interface -c "Release" -f net8.0 -o "out/generic" "/p:LinkDuringPublish=false" +dotnet publish CS2Interface -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 || : )