Update ArchiSteamFarm to 6.1.0.1

Citrinate · Nov 22, 2024 · 02350a5 · 02350a5
1 parent b1d9631
commit 02350a5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git 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
diff --git a/CS2Interface/CS2Interface.csproj b/CS2Interface/CS2Interface.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <Authors>Citrinate</Authors>
-    <AssemblyVersion>1.0.11.1</AssemblyVersion>
+    <AssemblyVersion>1.0.12.0</AssemblyVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Deterministic>true</Deterministic>
     <CoreCompileDependsOn>PrepareResources;$(CompileDependsOn)</CoreCompileDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.11.0-beta1.23364.2" PrivateAssets="all" />
-    <PackageReference Include="System.Composition.AttributedModel" Version="8.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.11.0-beta1.24508.2" PrivateAssets="all" />
+    <PackageReference Include="System.Composition.AttributedModel" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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<ActionResult<GenericResponse>> Start([FromRoute] string botNames) {
+		public async Task<ActionResult<GenericResponse>> Start(string botNames) {
 			if (string.IsNullOrEmpty(botNames)) {
 				throw new ArgumentNullException(nameof(botNames));
 			}
@@ -39,7 +39,7 @@ public async Task<ActionResult<GenericResponse>> Start([FromRoute] string botNam
 		[SwaggerOperation (Summary = "Stops the CS2 Interface")]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
-		public ActionResult<GenericResponse> Stop([FromRoute] string botNames) {
+		public ActionResult<GenericResponse> Stop(string botNames) {
 			if (string.IsNullOrEmpty(botNames)) {
 				throw new ArgumentNullException(nameof(botNames));
 			}
@@ -61,7 +61,6 @@ public ActionResult<GenericResponse> Stop([FromRoute] string botNames) {
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)]
 		public async Task<ActionResult<GenericResponse>> InspectItem(
-			[FromRoute] 
 			string botNames, 
 			[FromQuery]
 			[SwaggerParameter(Description = "The item's inspect link", Required = false)] 
@@ -140,7 +139,7 @@ public async Task<ActionResult<GenericResponse>> InspectItem(
 		[ProducesResponseType(typeof(GenericResponse<CMsgGCCStrike15_v2_PlayersProfile>), (int) HttpStatusCode.OK)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)]
-		public async Task<ActionResult<GenericResponse>> PlayerProfile([FromRoute] string botName, [FromRoute] ulong steamID) {
+		public async Task<ActionResult<GenericResponse>> PlayerProfile(string botName, ulong steamID) {
 			if (string.IsNullOrEmpty(botName)) {
 				throw new ArgumentNullException(nameof(botName));
 			}
@@ -170,7 +169,6 @@ public async Task<ActionResult<GenericResponse>> PlayerProfile([FromRoute] strin
 		[ProducesResponseType(typeof(GenericResponse<List<InventoryItem>>), (int) HttpStatusCode.OK)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
 		public ActionResult<GenericResponse> 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<GenericResponse> Inventory(
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)]
 		public async Task<ActionResult<GenericResponse>> 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<ActionResult<GenericResponse>> GetCrateContents(
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
 		[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.GatewayTimeout)]
-		public async Task<ActionResult<GenericResponse>> StoreItem([FromRoute] string botName, [FromRoute] ulong crateID, [FromRoute] ulong itemID) {
+		public async Task<ActionResult<GenericResponse>> StoreItem(string botName, ulong crateID, ulong itemID) {
 			if (string.IsNullOrEmpty(botName)) {
 				throw new ArgumentNullException(nameof(botName));
 			}
@@ -280,7 +276,7 @@ public async Task<ActionResult<GenericResponse>> 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<ActionResult<GenericResponse>> RetrieveItem([FromRoute] string botName, [FromRoute] ulong crateID, [FromRoute] ulong itemID) {
+		public async Task<ActionResult<GenericResponse>> RetrieveItem(string botName, ulong crateID, ulong itemID) {
 			if (string.IsNullOrEmpty(botName)) {
 				throw new ArgumentNullException(nameof(botName));
 			}

diff --git 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
@@ -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 || : )