remove net48, bump, fix warnings

ezhevita · Feb 27, 2024 · 5d4bed8 · 5d4bed8
1 parent cdd39f8
commit 5d4bed8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 .idea
 [Bb]in/
-[Oo]bj/
+[Oo]bj/
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,11 +1,7 @@
 <Project>
 
 	<ItemGroup>
-		<PackageVersion Include="AngleSharp" Version="1.1.0" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
-		<PackageVersion Include="IndexRange" Version="1.0.3" />
+		<PackageVersion Include="AngleSharp" Version="1.0.2" />
 	</ItemGroup>
 
 	<Import Project="ArchiSteamFarm/Directory.Packages.props" />

diff --git a/GameRemover/Directory.Build.props b/GameRemover/Directory.Build.props
@@ -4,7 +4,7 @@
 
 	<PropertyGroup>
 		<Description>ASF plugin to remove games from account.</Description>
-		<Version>2.2.1.0</Version>
+		<Version>2.3.0</Version>
 	</PropertyGroup>
 
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>

diff --git a/GameRemover/GameRemover.csproj b/GameRemover/GameRemover.csproj
@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="AngleSharp" IncludeAssets="compile" />
-		<PackageReference Include="JetBrains.Annotations" IncludeAssets="compile" />
-		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
-		<ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj" Private="false" ExcludeAssets="all" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
-		<PackageReference Include="IndexRange" IncludeAssets="compile" />
+		<PackageReference Include="AngleSharp" IncludeAssets="compile"/>
+		<PackageReference Include="JetBrains.Annotations" IncludeAssets="compile"/>
+		<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile"/>
+		<ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj" Private="false" ExcludeAssets="all"/>
 	</ItemGroup>
 
 </Project>
diff --git a/GameRemover/GameRemoverPlugin.cs b/GameRemover/GameRemoverPlugin.cs
@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using ArchiSteamFarm.Core;
@@ -22,6 +23,10 @@ namespace GameRemover;
 [UsedImplicitly]
 public class GameRemoverPlugin : IBotCommand2
 {
+	private static readonly CompositeFormat ErrorIsInvalid = CompositeFormat.Parse(Strings.ErrorIsInvalid);
+	private static readonly CompositeFormat ErrorObjectIsNull = CompositeFormat.Parse(Strings.ErrorObjectIsNull);
+	private static readonly CompositeFormat BotNotFound = CompositeFormat.Parse(Strings.BotNotFound);
+
 	public Task OnLoaded()
 	{
 		ASF.ArchiLogger.LogGenericInfo($"{Name} by ezhevita | Support & source code: https://github.com/ezhevita/{Name}");
@@ -59,30 +64,29 @@ public Task OnLoaded()
 		{
 			if (!uint.TryParse(appIDText, out var appID) || (appID == 0) || !appIDs.Add(appID))
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsInvalid, appIDText));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorIsInvalid, appIDText));
 			}
 		}
 
 		ushort successCount = 0;
 		foreach (var appID in appIDs)
 		{
-			const string RequestDeleteGamePage = "/en/wizard/HelpWithGameIssue/?appid={0}&issueid=123";
-			Uri uriDeleteGamePage = new(ArchiWebHandler.SteamHelpURL, string.Format(CultureInfo.InvariantCulture, RequestDeleteGamePage, appID));
+			Uri uriDeleteGamePage = new(ArchiWebHandler.SteamHelpURL, $"/en/wizard/HelpWithGameIssue/?appid={appID}&issueid=123");
 			using var responseDeleteGamePage = (await bot.ArchiWebHandler.UrlGetToHtmlDocumentWithSession(uriDeleteGamePage).ConfigureAwait(false))?.Content;
 			if (responseDeleteGamePage == null)
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorObjectIsNull, nameof(responseDeleteGamePage)));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorObjectIsNull, nameof(responseDeleteGamePage)));
 			}
 
 			var node = responseDeleteGamePage.SelectSingleNode<IElement>("//input[@id='packageid']");
 			if (node == null)
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorObjectIsNull, nameof(node)));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorObjectIsNull, nameof(node)));
 			}
 
 			if (!uint.TryParse(node.GetAttribute("value"), out var packageID) || (packageID == 0))
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsInvalid, nameof(packageID)));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorIsInvalid, nameof(packageID)));
 			}
 
 			Dictionary<string, string> data = new(3)
@@ -106,7 +110,7 @@ public Task OnLoaded()
 		var bots = Bot.GetBots(botNames);
 		if ((bots == null) || (bots.Count == 0))
 		{
-			return access >= EAccess.Owner ? Commands.FormatStaticResponse(string.Format(CultureInfo.CurrentCulture, Strings.BotNotFound, botNames)) : null;
+			return access >= EAccess.Owner ? Commands.FormatStaticResponse(string.Format(CultureInfo.CurrentCulture, BotNotFound, botNames)) : null;
 		}
 
 		var results = await Utilities.InParallel(bots.Select(bot => ResponseDeleteGame(bot, Commands.GetProxyAccess(bot, access, steamID), appIDsText))).ConfigureAwait(false);