From 809a4bbfbf718c7d640ddaa63f41197431cdc828 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 7 May 2021 18:55:50 +0200 Subject: [PATCH] Resolve CA2000 --- .editorconfig | 1 - .../SteamTokenDumperPlugin.cs | 6 +++--- ArchiSteamFarm/Bot.cs | 8 +++++--- ArchiSteamFarm/NLog/Logging.cs | 4 ++++ ArchiSteamFarm/Statistics.cs | 2 ++ ArchiSteamFarm/Web/WebBrowser.cs | 10 +++++----- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.editorconfig b/.editorconfig index 8b1f64cd3..9d428510c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -111,7 +111,6 @@ dotnet_diagnostic.ca1028.severity = silent dotnet_diagnostic.ca1031.severity = silent # TODO - one at a time -dotnet_diagnostic.ca2000.severity = silent dotnet_diagnostic.ca2002.severity = silent dotnet_diagnostic.ca3003.severity = silent dotnet_diagnostic.ca3012.severity = silent diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs index c3c979cbf..d340d0984 100644 --- a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs +++ b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs @@ -121,10 +121,10 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { if (globalCache == null) { ASF.ArchiLogger.LogGenericError(string.Format(CultureInfo.CurrentCulture, Strings.FileCouldNotBeLoadedFreshInit, nameof(GlobalCache))); - globalCache = new GlobalCache(); + GlobalCache = new GlobalCache(); + } else { + GlobalCache = globalCache; } - - GlobalCache = globalCache; } TimeSpan startIn = TimeSpan.FromMinutes(Utilities.RandomNext(SharedInfo.MinimumMinutesBeforeFirstUpload, SharedInfo.MaximumMinutesBeforeFirstUpload)); diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 2eb955573..603aecacd 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -3025,12 +3025,14 @@ namespace ArchiSteamFarm { byte[] sentryHash; try { - FileStream fileStream = File.Open(sentryFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite); + FileStream fileStream; #if NETFRAMEWORK - using (fileStream) { + using (fileStream = File.Open(sentryFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite)) { #else - await using (fileStream.ConfigureAwait(false)) { +#pragma warning disable CA2000 // False positive + await using ((fileStream = File.Open(sentryFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite)).ConfigureAwait(false)) { +#pragma warning restore CA2000 // False positive #endif fileStream.Seek(callback.Offset, SeekOrigin.Begin); diff --git a/ArchiSteamFarm/NLog/Logging.cs b/ArchiSteamFarm/NLog/Logging.cs index 304bb0b92..e516e246a 100644 --- a/ArchiSteamFarm/NLog/Logging.cs +++ b/ArchiSteamFarm/NLog/Logging.cs @@ -160,7 +160,9 @@ namespace ArchiSteamFarm.NLog { ConfigurationItemFactory.Default.ParseMessageTemplates = false; LoggingConfiguration config = new(); +#pragma warning disable CA2000 // False positive ColoredConsoleTarget coloredConsoleTarget = new("ColoredConsole") { Layout = GeneralLayout }; +#pragma warning restore CA2000 // False positive config.AddTarget(coloredConsoleTarget); config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, coloredConsoleTarget)); @@ -174,6 +176,7 @@ namespace ArchiSteamFarm.NLog { ASF.ArchiLogger.LogGenericException(e); } +#pragma warning disable CA2000 // False positive FileTarget fileTarget = new("File") { ArchiveFileName = Path.Combine("${currentdir}", SharedInfo.ArchivalLogsDirectory, SharedInfo.ArchivalLogFile), ArchiveNumbering = ArchiveNumberingMode.Rolling, @@ -185,6 +188,7 @@ namespace ArchiSteamFarm.NLog { Layout = GeneralLayout, MaxArchiveFiles = 10 }; +#pragma warning restore CA2000 // False positive config.AddTarget(fileTarget); config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget)); diff --git a/ArchiSteamFarm/Statistics.cs b/ArchiSteamFarm/Statistics.cs index 4a774e593..d969b2ccb 100644 --- a/ArchiSteamFarm/Statistics.cs +++ b/ArchiSteamFarm/Statistics.cs @@ -345,7 +345,9 @@ namespace ArchiSteamFarm { break; } +#pragma warning disable CA2000 // False positive using (await Bot.Actions.GetTradingLock().ConfigureAwait(false)) { +#pragma warning restore CA2000 // False positive Bot.ArchiLogger.LogGenericInfo(string.Format(CultureInfo.CurrentCulture, Strings.ActivelyMatchingItems, i)); (shouldContinueMatching, tradedSomething) = await MatchActivelyRound(acceptedMatchableTypes, triedSteamIDs).ConfigureAwait(false); Bot.ArchiLogger.LogGenericInfo(string.Format(CultureInfo.CurrentCulture, Strings.DoneActivelyMatchingItems, i)); diff --git a/ArchiSteamFarm/Web/WebBrowser.cs b/ArchiSteamFarm/Web/WebBrowser.cs index ce5e849f4..ecd3582e3 100644 --- a/ArchiSteamFarm/Web/WebBrowser.cs +++ b/ArchiSteamFarm/Web/WebBrowser.cs @@ -140,14 +140,14 @@ namespace ArchiSteamFarm.Web { progressReporter?.Report(0); - MemoryStream ms = new((int) response.Length); + MemoryStream ms; #if NETFRAMEWORK -#pragma warning disable CA1508 // False positive - using (ms) { -#pragma warning restore CA1508 // False positive + using (ms = new MemoryStream((int) response.Length)) { #else - await using (ms.ConfigureAwait(false)) { +#pragma warning disable CA2000 // False positive + await using ((ms = new MemoryStream((int) response.Length)).ConfigureAwait(false)) { +#pragma warning restore CA2000 // False positive #endif try { byte batch = 0;