Refactor & Enhancements: Namespace Fix, .NET 9 Upgrade, Bot Package Checker, and Plugin Improvements

.github/workflows/ci.yml

@@ -5,8 +5,8 @@ on: [push, pull_request]
 env:
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
-  DOTNET_SDK_VERSION: 8.0.x
-  DOTNET_FRAMEWORK: net8.0
+  DOTNET_SDK_VERSION: 9.0.x
+  DOTNET_FRAMEWORK: net9.0
 
 jobs:
   main:

.github/workflows/publish.yml

@@ -6,8 +6,8 @@ env:
   CONFIGURATION: Release
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
-  DOTNET_SDK_VERSION: 8.0.x
-  NET_CORE_VERSION: net8.0
+  DOTNET_SDK_VERSION: 9.0.x
+  NET_CORE_VERSION: net9.0
   NET_FRAMEWORK_VERSION: net48
   PLUGIN_NAME: ASFFreeGames
 

.github/workflows/test_integration.yml

@@ -13,7 +13,7 @@ on:
 env:
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
-  DOTNET_SDK_VERSION: 8.0.x
+  DOTNET_SDK_VERSION: 9.0.x
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.gitignore

@@ -289,13 +289,13 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
+# Note: Comment the next line if you want to check in your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
+# check in your Azure Web App publish settings, but sensitive information contained
 # in these scripts will be unencrypted
 PublishScripts/
 

ASFFreeGames.Tests/ASFFreeGames.Tests.csproj

@@ -5,7 +5,7 @@
 
         <IsPackable>false</IsPackable>
 
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

ASFFreeGames.Tests/GameIdentifierParserTests.cs

@@ -1,7 +1,7 @@
 using System;
-using ASFFreeGames.ASFExtentions.Games;
-using Maxisoft.ASF.ASFExtentions;
-using Maxisoft.ASF.ASFExtentions.Games;
+using ASFFreeGames.ASFExtensions.Games;
+using Maxisoft.ASF.ASFExtensions;
+using Maxisoft.ASF.ASFExtensions.Games;
 using Xunit;
 
 namespace Maxisoft.ASF.Tests;

ASFFreeGames.Tests/GameIdentifierTests.cs

@@ -1,7 +1,7 @@
 using System;
-using ASFFreeGames.ASFExtentions.Games;
-using Maxisoft.ASF.ASFExtentions;
-using Maxisoft.ASF.ASFExtentions.Games;
+using ASFFreeGames.ASFExtensions.Games;
+using Maxisoft.ASF.ASFExtensions;
+using Maxisoft.ASF.ASFExtensions.Games;
 using Xunit;
 
 namespace Maxisoft.ASF.Tests;

ASFFreeGames.sln

@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -10,32 +9,32 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASFFreeGames.Tests", "ASFFreeGames.Tests\ASFFreeGames.Tests.csproj", "{CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}"
 EndProject
 Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		DebugFast|Any CPU = DebugFast|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.DebugFast|Any CPU.ActiveCfg = DebugFast|Any CPU
-		{A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.DebugFast|Any CPU.Build.0 = DebugFast|Any CPU
-		{A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50744701-4C54-49BE-8189-518DA2A65797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50744701-4C54-49BE-8189-518DA2A65797}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50744701-4C54-49BE-8189-518DA2A65797}.DebugFast|Any CPU.ActiveCfg = DebugFast|Any CPU
-		{50744701-4C54-49BE-8189-518DA2A65797}.DebugFast|Any CPU.Build.0 = DebugFast|Any CPU
-		{50744701-4C54-49BE-8189-518DA2A65797}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50744701-4C54-49BE-8189-518DA2A65797}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.DebugFast|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.DebugFast|Any CPU.Build.0 = Debug|Any CPU
-		{CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
+    GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        Debug|Any CPU = Debug|Any CPU
+        DebugFast|Any CPU = DebugFast|Any CPU
+        Release|Any CPU = Release|Any CPU
+    EndGlobalSection
+    GlobalSection(SolutionProperties) = preSolution
+        HideSolutionNode = FALSE
+    EndGlobalSection
+    GlobalSection(ProjectConfigurationPlatforms) = postSolution
+        {A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.DebugFast|Any CPU.ActiveCfg = DebugFast|Any CPU
+        {A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.DebugFast|Any CPU.Build.0 = DebugFast|Any CPU
+        {A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {A64A35BD-25B6-4F4F-8C3C-E0CF9CE843F9}.Release|Any CPU.Build.0 = Release|Any CPU
+        {50744701-4C54-49BE-8189-518DA2A65797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {50744701-4C54-49BE-8189-518DA2A65797}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {50744701-4C54-49BE-8189-518DA2A65797}.DebugFast|Any CPU.ActiveCfg = DebugFast|Any CPU
+        {50744701-4C54-49BE-8189-518DA2A65797}.DebugFast|Any CPU.Build.0 = DebugFast|Any CPU
+        {50744701-4C54-49BE-8189-518DA2A65797}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {50744701-4C54-49BE-8189-518DA2A65797}.Release|Any CPU.Build.0 = Release|Any CPU
+        {CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.DebugFast|Any CPU.ActiveCfg = DebugFast|Any CPU
+        {CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.DebugFast|Any CPU.Build.0 = DebugFast|Any CPU
+        {CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {CC4DC8D7-AF9D-464D-BC93-DD829B3D1837}.Release|Any CPU.Build.0 = Release|Any CPU
+    EndGlobalSection
 EndGlobal

ASFFreeGames.sln.DotSettings

@@ -760,6 +760,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

ASFFreeGames/ASFExtentions/Bot/BotContext.cs

@@ -1,14 +1,18 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading;
+using System.Reflection;
 using System.Threading.Tasks;
-using ASFFreeGames.ASFExtentions.Games;
+using ASFFreeGames.ASFExtensions.Games;
 using Maxisoft.ASF;
 using Maxisoft.ASF.AppLists;
+using Maxisoft.ASF.Utils.Workarounds;
 
-namespace ASFFreeGames.ASFExtentions.Bot;
+namespace ASFFreeGames.ASFExtensions.Bot;
 
 using Bot = ArchiSteamFarm.Steam.Bot;
+using static ArchiSteamFarm.Localization.Strings;
 
 internal sealed class BotContext : IDisposable {
 	private const ulong TriesBeforeBlacklistingGameEntry = 5;
@@ -74,7 +78,7 @@ public bool HasApp(in GameIdentifier gameIdentifier) {
 
 		Bot? bot = Bot.GetBot(BotIdentifier);
 
-		return bot is not null && bot.OwnedPackageIDs.ContainsKey(checked((uint) gameIdentifier.Id));
+		return bot is not null && BotPackageChecker.BotOwnsPackage(bot, checked((uint) gameIdentifier.Id));
 	}
 
 	public async Task LoadFromFileSystem(CancellationToken cancellationToken = default) {
@@ -117,4 +121,3 @@ private string CompletedAppFilePath() {
 		return res;
 	}
 }
-

ASFFreeGames/ASFExtentions/Bot/BotEqualityComparer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ASFFreeGames.ASFExtentions.Bot;
+namespace ASFFreeGames.ASFExtensions.Bot;
 
 using Bot = ArchiSteamFarm.Steam.Bot;
 

ASFFreeGames/ASFExtentions/Bot/BotName.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace ASFFreeGames.ASFExtentions.Bot {
+namespace ASFFreeGames.ASFExtensions.Bot {
 	/// <summary>
 	/// Represents a readonly record struct that encapsulates bot's name (a string) and provides implicit conversion and comparison methods.
 	/// </summary>

ASFFreeGames/ASFExtentions/Games/GameIdentifier.cs

@@ -2,12 +2,12 @@
 using System.Buffers.Binary;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using Maxisoft.ASF.ASFExtentions;
-using Maxisoft.ASF.ASFExtentions.Games;
+using Maxisoft.ASF.ASFExtensions;
+using Maxisoft.ASF.ASFExtensions.Games;
 
 // ReSharper disable RedundantNullableFlowAttribute
 
-namespace ASFFreeGames.ASFExtentions.Games;
+namespace ASFFreeGames.ASFExtensions.Games;
 
 /// <summary>
 ///     Represents a readonly record struct that encapsulates a game identifier with a numeric ID and a type.

ASFFreeGames/ASFExtentions/Games/GameIdentifierParser.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using ASFFreeGames.ASFExtentions.Games;
+using ASFFreeGames.ASFExtensions.Games;
 
-namespace Maxisoft.ASF.ASFExtentions.Games;
+namespace Maxisoft.ASF.ASFExtensions.Games;
 
 /// <summary>
 ///     Represents a static class that provides methods for parsing game identifiers from strings.

ASFFreeGames/ASFExtentions/Games/GameIdentifierType.cs

@@ -1,4 +1,4 @@
-namespace Maxisoft.ASF.ASFExtentions.Games;
+namespace Maxisoft.ASF.ASFExtensions.Games;
 
 public enum GameIdentifierType : sbyte {
 	None = 0,

ASFFreeGames/ASFFreeGames.csproj

@@ -4,7 +4,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>pdbonly</DebugType>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -71,14 +71,17 @@
 	  <Content Include="..\Directory.Build.props">
 	    <Link>Directory.Build.props</Link>
 	  </Content>
+	  <Content Include="..\Directory.Packages.props">
+	    <Link>Directory.Packages.props</Link>
+	  </Content>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Folder Include="Resouces\" />
+	  <Folder Include="Resources\" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <None Remove="Resouces\redlib_instances.json" />
-	  <EmbeddedResource Include="Resouces\redlib_instances.json" />
+	  <None Remove="Resources\redlib_instances.json" />
+	  <EmbeddedResource Include="Resources\redlib_instances.json" />
 	</ItemGroup>
 </Project>

ASFFreeGames/ASFFreeGames.csproj.DotSettings

@@ -1,3 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">No</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/UsageCheckingInspectionLevel/@EntryValue">InternalsOnly</s:String></wpf:ResourceDictionary>
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:schemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">No</s:String>
+    <s:String x:Key="/Default/CodeInspection/Highlighting/UsageCheckingInspectionLevel/@EntryValue">InternalsOnly</s:String>
+</wpf:ResourceDictionary>

ASFFreeGames/ASFFreeGamesPlugin.cs

@@ -8,14 +8,15 @@
 using ArchiSteamFarm.Collections;
 using ArchiSteamFarm.Plugins.Interfaces;
 using ArchiSteamFarm.Steam;
-using ASFFreeGames.ASFExtentions.Bot;
+using ASFFreeGames.ASFExtensions.Bot;
 using ASFFreeGames.Commands;
 using ASFFreeGames.Configurations;
 using JetBrains.Annotations;
-using Maxisoft.ASF.ASFExtentions;
+using Maxisoft.ASF.ASFExtensions;
 using Maxisoft.ASF.Configurations;
 using Maxisoft.ASF.Github;
 using Maxisoft.ASF.Utils;
+using Maxisoft.ASF.Utils.Workarounds;
 using SteamKit2;
 using static ArchiSteamFarm.Core.ASF;
 
@@ -68,7 +69,7 @@ public ASFFreeGamesPlugin() {
 		_context.Value = new PluginContext(Bots, BotContextRegistry, Options, LoggerFilter) { CancellationTokenLazy = new Lazy<CancellationToken>(() => CancellationTokenSourceLazy.Value.Token) };
 	}
 
-	public async Task<string?> OnBotCommand(Bot bot, EAccess access, string message, string[] args, ulong steamID = 0) {
+	public async Task<string?> OnBotCommand(Bot? bot, EAccess access, string message, string[] args, ulong steamID = 0) {
 		if (!Context.Valid) {
 			CreateContext();
 		}
@@ -141,9 +142,13 @@ public async void CollectGamesOnClock(object? source) {
 
 			if (!cts.IsCancellationRequested) {
 				string cmd = $"FREEGAMES {FreeGamesCommand.CollectInternalCommandString} " + string.Join(' ', reorderedBots.Select(static bot => bot.BotName));
-#pragma warning disable CS1998
-				await OnBotCommand(null!, EAccess.None, cmd, cmd.Split()).ConfigureAwait(false);
-#pragma warning restore CS1998
+
+				try {
+					await OnBotCommand(null, EAccess.None, cmd, cmd.Split()).ConfigureAwait(false);
+				}
+				catch (Exception ex) {
+					ArchiLogger.LogGenericWarning($"Failed to execute scheduled free games collection: {ex.Message}");
+				}
 			}
 		}
 	}
@@ -186,6 +191,7 @@ private async Task RemoveBot(Bot bot) {
 		}
 
 		LoggerFilter.RemoveFilters(bot);
+		BotPackageChecker.RemoveBotCache(bot);
 	}
 
 	// ReSharper disable once UnusedMethodReturnValue.Local

ASFFreeGames/AppLists/CompletedAppList.cs

@@ -7,8 +7,8 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using ASFFreeGames.ASFExtentions.Games;
-using Maxisoft.ASF.ASFExtentions;
+using ASFFreeGames.ASFExtensions.Games;
+using Maxisoft.ASF.ASFExtensions;
 
 namespace Maxisoft.ASF.AppLists;
 

ASFFreeGames/AppLists/RecentGameMapping.cs

@@ -4,8 +4,8 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using ASFFreeGames.ASFExtentions.Games;
-using Maxisoft.ASF.ASFExtentions;
+using ASFFreeGames.ASFExtensions.Games;
+using Maxisoft.ASF.ASFExtensions;
 using Maxisoft.Utils.Collections.Spans;
 
 namespace Maxisoft.ASF.AppLists;

ASFFreeGames/Commands/FreeGamesCommand.cs

@@ -8,11 +8,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Steam;
-using ASFFreeGames.ASFExtentions.Bot;
-using ASFFreeGames.ASFExtentions.Games;
+using ASFFreeGames.ASFExtensions.Bot;
+using ASFFreeGames.ASFExtensions.Games;
 using ASFFreeGames.Configurations;
 using Maxisoft.ASF;
-using Maxisoft.ASF.ASFExtentions;
+using Maxisoft.ASF.ASFExtensions;
 using Maxisoft.ASF.Configurations;
 using Maxisoft.ASF.FreeGames.Strategies;
 using Maxisoft.ASF.HttpClientSimple;

ASFFreeGames/Configurations/ASFFreeGamesOptions.cs

@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 using ArchiSteamFarm.Steam;
-using ASFFreeGames.ASFExtentions.Games;
+using ASFFreeGames.ASFExtensions.Games;
 using Maxisoft.ASF;
-using Maxisoft.ASF.ASFExtentions;
+using Maxisoft.ASF.ASFExtensions;
 
 namespace ASFFreeGames.Configurations;
 

ASFFreeGames/ContextRegistry.cs

@@ -3,8 +3,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Steam;
-using ASFFreeGames.ASFExtentions.Bot;
-using Maxisoft.ASF.ASFExtentions;
+using ASFFreeGames.ASFExtensions.Bot;
+using Maxisoft.ASF.ASFExtensions;
 
 namespace Maxisoft.ASF {
 	/// <summary>