diff --git a/ArchiSteamFarm.CustomPlugins.SignInWithSteam/ArchiSteamFarm.CustomPlugins.SignInWithSteam.csproj b/ArchiSteamFarm.CustomPlugins.SignInWithSteam/ArchiSteamFarm.CustomPlugins.SignInWithSteam.csproj index 6c8b547c9..2562b4411 100644 --- a/ArchiSteamFarm.CustomPlugins.SignInWithSteam/ArchiSteamFarm.CustomPlugins.SignInWithSteam.csproj +++ b/ArchiSteamFarm.CustomPlugins.SignInWithSteam/ArchiSteamFarm.CustomPlugins.SignInWithSteam.csproj @@ -4,7 +4,7 @@ - + diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index 95541f9b9..624f328ef 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -5,7 +5,7 @@ - + diff --git a/ArchiSteamFarm/Core/Utilities.cs b/ArchiSteamFarm/Core/Utilities.cs index 37deb8199..cc3eb23b4 100644 --- a/ArchiSteamFarm/Core/Utilities.cs +++ b/ArchiSteamFarm/Core/Utilities.cs @@ -35,8 +35,6 @@ using System.Resources; using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; -using AngleSharp.Dom; -using AngleSharp.XPath; using ArchiSteamFarm.Localization; using ArchiSteamFarm.NLog; using ArchiSteamFarm.Storage; @@ -197,54 +195,6 @@ public static class Utilities { return (text.Length % 2 == 0) && text.All(Uri.IsHexDigit); } - [Obsolete($"Use {nameof(document.QuerySelectorAll)} instead, we're removing our AngleSharp.XPath dependency and helpers in the future ASF version")] - [PublicAPI] - public static IList SelectNodes(this IDocument document, string xpath) { - ArgumentNullException.ThrowIfNull(document); - - return document.Body.SelectNodes(xpath); - } - - [Obsolete($"Use {nameof(document.QuerySelectorAll)} instead, we're removing our AngleSharp.XPath dependency and helpers in the future ASF version")] - [PublicAPI] - public static IEnumerable SelectNodes(this IDocument document, string xpath) where T : class, INode { - ArgumentNullException.ThrowIfNull(document); - - return document.Body.SelectNodes(xpath).OfType(); - } - - [Obsolete($"Use {nameof(element.QuerySelectorAll)} instead, we're removing our AngleSharp.XPath dependency and helpers in the future ASF version")] - [PublicAPI] - public static IEnumerable SelectNodes(this IElement element, string xpath) where T : class, INode { - ArgumentNullException.ThrowIfNull(element); - - return element.SelectNodes(xpath).OfType(); - } - - [Obsolete($"Use {nameof(document.QuerySelector)} instead, we're removing our AngleSharp.XPath dependency and helpers in the future ASF version")] - [PublicAPI] - public static INode? SelectSingleNode(this IDocument document, string xpath) { - ArgumentNullException.ThrowIfNull(document); - - return document.Body.SelectSingleNode(xpath); - } - - [Obsolete($"Use {nameof(document.QuerySelector)} instead, we're removing our AngleSharp.XPath dependency and helpers in the future ASF version")] - [PublicAPI] - public static T? SelectSingleNode(this IDocument document, string xpath) where T : class, INode { - ArgumentNullException.ThrowIfNull(document); - - return document.Body.SelectSingleNode(xpath) as T; - } - - [Obsolete($"Use {nameof(element.QuerySelector)} instead, we're removing our AngleSharp.XPath dependency and helpers in the future ASF version")] - [PublicAPI] - public static T? SelectSingleNode(this IElement element, string xpath) where T : class, INode { - ArgumentNullException.ThrowIfNull(element); - - return element.SelectSingleNode(xpath) as T; - } - [PublicAPI] public static IEnumerable ToEnumerable(this T item) { yield return item; diff --git a/ArchiSteamFarm/Helpers/Json/BooleanNumberConverter.cs b/ArchiSteamFarm/Helpers/Json/BooleanNumberConverter.cs deleted file mode 100644 index 7c5c937bc..000000000 --- a/ArchiSteamFarm/Helpers/Json/BooleanNumberConverter.cs +++ /dev/null @@ -1,47 +0,0 @@ -// ---------------------------------------------------------------------------------------------- -// _ _ _ ____ _ _____ -// / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___ -// / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \ -// / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | | -// /_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_| -// ---------------------------------------------------------------------------------------------- -// | -// Copyright 2015-2025 Łukasz "JustArchi" Domeradzki -// Contact: JustArchi@JustArchi.net -// | -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// | -// http://www.apache.org/licenses/LICENSE-2.0 -// | -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System; -using System.Text.Json; -using System.Text.Json.Serialization; -using JetBrains.Annotations; - -namespace ArchiSteamFarm.Helpers.Json; - -[Obsolete($"Use {nameof(BooleanNormalizationConverter)} instead if you want to always serialize as booleans, or roll out your own solution that would preserve original type. This helper class will be removed in the next ASF version, as we switched to the other converter instead.")] -[PublicAPI] -public sealed class BooleanNumberConverter : JsonConverter { - public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => - reader.TokenType switch { - JsonTokenType.True => true, - JsonTokenType.False => false, - JsonTokenType.Number => reader.GetByte() == 1, - _ => throw new JsonException() - }; - - public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options) { - ArgumentNullException.ThrowIfNull(writer); - - writer.WriteNumberValue(value ? 1 : 0); - } -} diff --git a/Directory.Build.props b/Directory.Build.props index 4716131e3..e265fb9ff 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 6.1.3.4 + 6.1.4.0 diff --git a/Directory.Packages.props b/Directory.Packages.props index 5f99f5011..a1f9e40c5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,6 +1,6 @@ - +