.NET 8 Upgrade Silenced Errors Fix (#30469)

* [Dev][Build] .NET 8 Upgrade Silenced errors first fix. * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1859 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1854. * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1860 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1861 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1862 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1863 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1864 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1865 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA2208 * [Dev][Build] .NET 8 Upgrade Silenced errors. CS9191 * [Dev][Build] .NET 8 Upgrade Silenced errors. Spell check * [Dev][Build] .NET 8 Upgrade Silenced errors. Spell check * [Dev][Build] .NET 8 Upgrade Silenced errors. - CompositeFormat variables used more than once in the same file were assigned to a single variable. - GetProcessesByName logic fix. - String comparion fix. - ArgumentOutOfRangeException message change. * [Dev][Build] .NET 8 Upgrade Silenced errors. - Null check added. - static readonly CompositeFormat added for all fields.
microsoft · Dec 28, 2023 · a94b3ee · a94b3ee
1 parent cd57659
commit a94b3ee
Show file tree

Hide file tree

Showing 112 changed files with 429 additions and 291 deletions.
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -96,49 +96,4 @@ end_of_line = crlf
 dotnet_diagnostic.IDE0065.severity = none
 
 # IDE0009: Add this or Me qualification
-dotnet_diagnostic.IDE0009.severity = none
-
-# CA1859: Change type for improved performance
-dotnet_diagnostic.CA1859.severity = none
-
-# CA1716: Identifiers should not match keywords
-dotnet_diagnostic.CA1716.severity = none
-
-# SYSLIB1096: Convert to 'GeneratedComInterface'
-dotnet_diagnostic.SYSLIB1096.severity = silent
-
-# CA1309: Use ordinal StringComparison
-dotnet_diagnostic.CA1309.severity = suggestion
-
-# CS1615: Argument may not be passed with the ref keyword
-dotnet_diagnostic.CS1615.severity = none
-
-# CA1854: Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup
-dotnet_diagnostic.CA1854.severity = suggestion
-
-# CA1860: Avoid using 'Enumerable.Any()' extension method
-dotnet_diagnostic.CA1860.severity = suggestion
-
-# CA1861: Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array 
-dotnet_diagnostic.CA1861.severity = suggestion
-
-# CA1862: Prefer using 'StringComparer'/'StringComparison' to perform case-insensitive string comparisons
-dotnet_diagnostic.CA1862.severity = suggestion
-
-# CA1863: Cache a CompositeFormat for repeated use in this formatting operation
-dotnet_diagnostic.CA1863.severity = none
-
-# CA1864: Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
-dotnet_diagnostic.CA1864.severity = suggestion
-
-# CA1865: Use 'string.Method(char)' instead of 'string.Method(string)' for string with single char
-dotnet_diagnostic.CA1865.severity = suggestion
-
-# CA1869: Cache and reuse 'JsonSerializerOptions' instances
-dotnet_diagnostic.CA1869.severity = none
-
-# CA2208: Instantiate argument exceptions correctly
-dotnet_diagnostic.CA2208.severity = none
-
-# CS9191: The 'ref' modifier for argument corresponding to 'in' is equivalent to 'in'. Consider using 'in' instead.
-dotnet_diagnostic.CS9191.severity = none
+dotnet_diagnostic.IDE0009.severity = none
diff --git a/src/common/AllExperiments/Experiments.cs b/src/common/AllExperiments/Experiments.cs
@@ -145,7 +145,7 @@ private async Task VariantAssignmentProvider_Initialize()
 
         private string? AssignmentUnit { get; set; }
 
-        private IVariantAssignmentRequest GetVariantAssignmentRequest()
+        private VariantAssignmentRequest GetVariantAssignmentRequest()
         {
             var jsonFilePath = CreateFilePath();
             try

diff --git a/src/common/FilePreviewCommon/Formatters/JsonFormatter.cs b/src/common/FilePreviewCommon/Formatters/JsonFormatter.cs
@@ -12,6 +12,12 @@ public class JsonFormatter : IFormatter
         /// <inheritdoc/>
         public string LangSet => "json";
 
+        private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
+        {
+            WriteIndented = true,
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        };
+
         /// <inheritdoc/>
         public string Format(string value)
         {
@@ -22,11 +28,7 @@ public string Format(string value)
 
             using (var jDocument = JsonDocument.Parse(value, new JsonDocumentOptions { CommentHandling = JsonCommentHandling.Skip }))
             {
-                return JsonSerializer.Serialize(jDocument, new JsonSerializerOptions
-                {
-                    WriteIndented = true,
-                    Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-                });
+                return JsonSerializer.Serialize(jDocument, _serializerOptions);
             }
         }
     }

diff --git a/src/modules/Hosts/Hosts/Settings/UserSettings.cs b/src/modules/Hosts/Hosts/Settings/UserSettings.cs
@@ -17,7 +17,7 @@ public class UserSettings : IUserSettings
         private const string HostsModuleName = "Hosts";
         private const int MaxNumberOfRetry = 5;
 
-        private readonly ISettingsUtils _settingsUtils;
+        private readonly SettingsUtils _settingsUtils;
         private readonly IFileSystemWatcher _watcher;
         private readonly object _loadingSettingsLock = new object();
 

diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs b/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs
@@ -45,6 +45,10 @@ internal partial class Common
         private static string lastDragDropFile;
         private static long clipboardCopiedTime;
 
+        internal static readonly char[] Comma = new char[] { ',' };
+        internal static readonly char[] Star = new char[] { '*' };
+        internal static readonly char[] NullSeparator = new char[] { '\0' };
+
         internal static ID LastIDWithClipboardData { get; set; }
 
         internal static string LastDragDropFile
@@ -406,7 +410,7 @@ private static void ConnectAndGetData(object postAction)
 
             try
             {
-                remoteMachine = postAct.Contains("mspaint,") ? postAct.Split(new char[] { ',' })[1] : Common.LastMachineWithClipboardData;
+                remoteMachine = postAct.Contains("mspaint,") ? postAct.Split(Comma)[1] : Common.LastMachineWithClipboardData;
 
                 remoteMachine = remoteMachine.Trim();
 
@@ -518,7 +522,7 @@ internal static void ReceiveAndProcessClipboardData(string remoteMachine, Socket
 
                 fileName = Common.GetStringU(header).Replace("\0", string.Empty);
                 Common.LogDebug("Header: " + fileName);
-                string[] headers = fileName.Split(new char[] { '*' });
+                string[] headers = fileName.Split(Star);
 
                 if (headers.Length < 2 || !long.TryParse(headers[0], out long dataSize))
                 {
@@ -973,7 +977,7 @@ internal static void SetClipboardData(byte[] data)
 
             foreach (string txt in texts)
             {
-                if (string.IsNullOrEmpty(txt.Trim(new char[] { '\0' })))
+                if (string.IsNullOrEmpty(txt.Trim(NullSeparator)))
                 {
                     continue;
                 }

diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.Encryption.cs b/src/modules/MouseWithoutBorders/App/Class/Common.Encryption.cs
@@ -22,7 +22,9 @@ namespace MouseWithoutBorders
 {
     internal partial class Common
     {
-        private static SymmetricAlgorithm symAl;
+#pragma warning disable SYSLIB0021
+        private static AesCryptoServiceProvider symAl;
+#pragma warning restore SYSLIB0021
         private static string myKey;
         private static uint magicNumber;
         private static Random ran = new(); // Used for non encryption related functionality.

diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.Helper.cs b/src/modules/MouseWithoutBorders/App/Class/Common.Helper.cs
@@ -313,7 +313,8 @@ internal static void RunDDHelper(bool cleanUp = false)
                 HasSwitchedMachineSinceLastCopy = true;
 
                 // Common.CreateLowIntegrityProcess("\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"", string.Empty, 0, false, 0);
-                if (Process.GetProcessesByName(HelperProcessName)?.Any() != true)
+                var processes = Process.GetProcessesByName(HelperProcessName);
+                if (processes?.Length == 0)
                 {
                     Log("Unable to start helper process.");
                     Common.ShowToolTip("Error starting Mouse Without Borders Helper, clipboard sharing will not work!", 5000, ToolTipIcon.Error);
@@ -325,7 +326,8 @@ internal static void RunDDHelper(bool cleanUp = false)
             }
             else
             {
-                if (Process.GetProcessesByName(HelperProcessName)?.Any() == true)
+                var processes = Process.GetProcessesByName(HelperProcessName);
+                if (processes?.Length > 0)
                 {
                     Log("Helper process found running.");
                 }
@@ -432,7 +434,7 @@ internal static bool GetUserName()
         {
             if (string.IsNullOrEmpty(Setting.Values.Username) && !Common.RunOnLogonDesktop)
             {
-                if (Program.User.ToLower(CultureInfo.CurrentCulture).Contains("system"))
+                if (Program.User.Contains("system", StringComparison.CurrentCultureIgnoreCase))
                 {
                     _ = Common.ImpersonateLoggedOnUserAndDoSomething(() =>
                     {

diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.Launch.cs b/src/modules/MouseWithoutBorders/App/Class/Common.Launch.cs
@@ -84,12 +84,11 @@ internal static bool ImpersonateLoggedOnUserAndDoSomething(Action targetFunc)
             }
         }
 
-        [SuppressMessage("Microsoft.Globalization", "CA1304:SpecifyCultureInfo", MessageId = "System.String.ToLower", Justification = "Dotnet port with style preservation")]
         internal static int CreateProcessInInputDesktopSession(string commandLine, string arg, string desktop, short wShowWindow, bool lowIntegrity = false)
 
         // As user who runs explorer.exe
         {
-            if (!Program.User.ToLower(CultureInfo.InvariantCulture).Contains("system"))
+            if (!Program.User.Contains("system", StringComparison.InvariantCultureIgnoreCase))
             {
                 ProcessStartInfo s = new(commandLine, arg);
                 s.WindowStyle = wShowWindow != 0 ? ProcessWindowStyle.Normal : ProcessWindowStyle.Hidden;

diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.Service.cs b/src/modules/MouseWithoutBorders/App/Class/Common.Service.cs
@@ -45,7 +45,7 @@ internal static void StartMouseWithoutBordersService(string desktopToRunMouseWit
             {
                 Process[] ps = Process.GetProcessesByName("MouseWithoutBordersSvc");
 
-                if (ps.Any())
+                if (ps.Length != 0)
                 {
                     if (DateTime.UtcNow - lastStartServiceTime < TimeSpan.FromSeconds(5))
                     {

diff --git a/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs b/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs
@@ -353,6 +353,7 @@ internal static void MouseClickDotForm(int x, int y)
         private static bool ctrlDown;
         private static bool altDown;
         private static bool shiftDown;
+        internal static readonly string[] Args = new string[] { "CAD" };
 
         private static void ResetModifiersState(HotkeySettings matchingHotkey)
         {
@@ -456,7 +457,7 @@ private static void InputProcessKeyEx(int vkCode, int flags, out bool eatKey)
                         if (ctrlDown && altDown)
                         {
                             ctrlDown = altDown = false;
-                            new ServiceController("MouseWithoutBordersSvc").Start(new string[] { "CAD" });
+                            new ServiceController("MouseWithoutBordersSvc").Start(Args);
                         }
 
                         break;

diff --git a/src/modules/MouseWithoutBorders/App/Class/MachinePool.cs b/src/modules/MouseWithoutBorders/App/Class/MachinePool.cs
@@ -156,7 +156,7 @@ public void Initialize(IEnumerable<string> machineNames)
                     }
                     else if (list.Count >= 4)
                     {
-                        throw new ArgumentException("machineNames.Length > Common.MAX_MACHINE");
+                        throw new ArgumentException($"The number of machines exceeded the maximum allowed limit of {Common.MAX_MACHINE}. Actual count: {list.Count}.");
                     }
 
                     _ = LearnMachine(name);
@@ -178,7 +178,7 @@ public void Initialize(IEnumerable<MachineInf> infos)
                     }
                     else if (list.Count >= 4)
                     {
-                        throw new ArgumentException("infos.Length > Common.MAX_MACHINE");
+                        throw new ArgumentException($"The number of machines exceeded the maximum allowed limit of {Common.MAX_MACHINE}. Actual count: {list.Count}.");
                     }
 
                     _ = LearnMachine(inf.Name);

diff --git a/src/modules/MouseWithoutBorders/App/Class/MachinePoolHelpers.cs b/src/modules/MouseWithoutBorders/App/Class/MachinePoolHelpers.cs
@@ -8,14 +8,17 @@ namespace MouseWithoutBorders.Class
 {
     internal static class MachinePoolHelpers
     {
+        internal static readonly char[] Comma = new char[] { ',' };
+        internal static readonly char[] Colon = new char[] { ':' };
+
         internal static MachineInf[] LoadMachineInfoFromMachinePoolStringSetting(string s)
         {
             if (s == null)
             {
                 throw new ArgumentNullException(s);
             }
 
-            string[] st = s.Split(new char[] { ',' });
+            string[] st = s.Split(Comma);
 
             if (st.Length < Common.MAX_MACHINE)
             {
@@ -25,7 +28,7 @@ internal static MachineInf[] LoadMachineInfoFromMachinePoolStringSetting(string
             MachineInf[] rv = new MachineInf[Common.MAX_MACHINE];
             for (int i = 0; i < Common.MAX_MACHINE; i++)
             {
-                string[] mc = st[i].Split(new char[] { ':' });
+                string[] mc = st[i].Split(Colon);
                 if (mc.Length == 2)
                 {
                     rv[i].Name = mc[0];

diff --git a/src/modules/MouseWithoutBorders/App/Class/Setting.cs b/src/modules/MouseWithoutBorders/App/Class/Setting.cs
@@ -38,7 +38,7 @@ internal class Settings
     {
         internal bool Changed;
 
-        private readonly ISettingsUtils _settingsUtils;
+        private readonly SettingsUtils _settingsUtils;
         private readonly object _loadingSettingsLock = new object();
         private readonly IFileSystemWatcher _watcher;
 

diff --git a/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs b/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs
@@ -887,14 +887,14 @@ void ClientThread(object obj)
 
                 if (!string.IsNullOrEmpty(Setting.Values.Name2IP))
                 {
-                    string[] name2ip = Setting.Values.Name2IP.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+                    string[] name2ip = Setting.Values.Name2IP.Split(Separator, StringSplitOptions.RemoveEmptyEntries);
                     string[] nameNip;
 
                     if (name2ip != null)
                     {
                         foreach (string st in name2ip)
                         {
-                            nameNip = st.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                            nameNip = st.Split(BlankSeparator, StringSplitOptions.RemoveEmptyEntries);
 
                             if (nameNip != null && nameNip.Length >= 2 && nameNip[0].Trim().Equals(machineName, StringComparison.OrdinalIgnoreCase)
                                 && IPAddress.TryParse(nameNip[1].Trim(), out IPAddress ip) && !validAddressesSt.Contains("[" + ip.ToString() + "]")
@@ -1063,7 +1063,7 @@ private bool CheckForSameSubNet(List<IPAddress> validatedAddresses, string machi
 
             List<IPAddress> localIPv4Addresses = GetMyIPv4Addresses().ToList();
 
-            if (!localIPv4Addresses.Any())
+            if (localIPv4Addresses.Count == 0)
             {
                 Common.Log($"No IPv4 resolved from the local machine: {Common.MachineName}");
                 return true;
@@ -1234,6 +1234,8 @@ private void FlagReopenSocketIfNeeded(Exception e)
         }
 
         private long lastRemoteMachineID;
+        internal static readonly string[] Separator = new string[] { "\r\n" };
+        internal static readonly char[] BlankSeparator = new char[] { ' ' };
 
         private void MainTCPRoutine(TcpSk tcp, string machineName, bool isClient)
         {

diff --git a/src/modules/MouseWithoutBorders/App/Class/TcpServer.cs b/src/modules/MouseWithoutBorders/App/Class/TcpServer.cs
@@ -104,6 +104,7 @@ internal void Close()
         }
 
         private static bool logged;
+        internal static readonly string[] Separator = new[] { " " };
 
         private void LogError(string log)
         {
@@ -146,7 +147,7 @@ private void LogError(string log)
                                 try
                                 {
                                     // Assuming the format of netstat's output is fixed.
-                                    pid = int.Parse(portLogLine.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries).Last(), CultureInfo.CurrentCulture);
+                                    pid = int.Parse(portLogLine.Split(Separator, StringSplitOptions.RemoveEmptyEntries).Last(), CultureInfo.CurrentCulture);
                                     process = Process.GetProcessById(pid);
                                 }
                                 catch (Exception)

diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.cs
@@ -123,13 +123,14 @@ private void CloseWindowButtonClick(object sender, EventArgs e)
         }
 
         private string lastMessage = string.Empty;
+        private static readonly string[] Separator = new string[] { "\r\n" };
 
         internal void ShowTip(ToolTipIcon icon, string msg, int durationInMilliseconds)
         {
             int x = 0;
             string text = msg + $"\r\n {(lastMessage.Equals(msg, StringComparison.OrdinalIgnoreCase) ? string.Empty : $"\r\nPrevious message/error: {lastMessage}")} ";
             lastMessage = msg;
-            int y = (-text.Split(new string[] { "\r\n" }, StringSplitOptions.None).Length * 15) - 30;
+            int y = (-text.Split(Separator, StringSplitOptions.None).Length * 15) - 30;
 
             toolTipManual.Hide(this);
 

diff --git a/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs b/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs
@@ -742,11 +742,13 @@ private void LoadSettingsToUI()
             LoadMachines();
         }
 
+        internal static readonly string[] Separator = new string[] { "\r\n" };
+
         internal void ShowTip(ToolTipIcon icon, string text, int duration)
         {
             int x = 0;
             text += "\r\n ";
-            int y = (-text.Split(new string[] { "\r\n" }, StringSplitOptions.None).Length * 15) - 30;
+            int y = (-text.Split(Separator, StringSplitOptions.None).Length * 15) - 30;
 
             toolTipManual.Hide(this);
 

diff --git a/src/modules/PowerOCR/PowerOCR/Helpers/ImageMethods.cs b/src/modules/PowerOCR/PowerOCR/Helpers/ImageMethods.cs
@@ -148,6 +148,8 @@ internal static async Task<string> GetClickedWord(Window passedWindow, System.Wi
         return resultText.Trim();
     }
 
+    internal static readonly char[] Separator = new char[] { '\n', '\r' };
+
     public static async Task<string> ExtractText(Bitmap bmp, Language? preferredLanguage, System.Windows.Point? singlePoint = null)
     {
         Language? selectedLanguage = preferredLanguage ?? GetOCRLanguage();
@@ -211,7 +213,7 @@ public static async Task<string> ExtractText(Bitmap bmp, Language? preferredLang
 
         if (culture.TextInfo.IsRightToLeft)
         {
-            string[] textListLines = text.ToString().Split(new char[] { '\n', '\r' });
+            string[] textListLines = text.ToString().Split(Separator);
 
             _ = text.Clear();
             foreach (string textLine in textListLines)

diff --git a/src/modules/PowerOCR/PowerOCR/Models/ResultTable.cs b/src/modules/PowerOCR/PowerOCR/Models/ResultTable.cs
@@ -239,7 +239,7 @@ private static List<int> CalculateRowAreas(Rectangle rectCanvasSize, int hitGrid
         return rowAreas;
     }
 
-    private static void CheckIntersectionsWithWordBorders(int hitGridSpacing, ICollection<WordBorder> wordBorders, ICollection<int> rowAreas, int i, Rect horizontalLineRect)
+    private static void CheckIntersectionsWithWordBorders(int hitGridSpacing, ICollection<WordBorder> wordBorders, List<int> rowAreas, int i, Rect horizontalLineRect)
     {
         foreach (WordBorder wb in wordBorders)
         {

diff --git a/src/modules/PowerOCR/PowerOCR/Settings/UserSettings.cs b/src/modules/PowerOCR/PowerOCR/Settings/UserSettings.cs
@@ -16,7 +16,7 @@ namespace PowerOCR.Settings
     [Export(typeof(IUserSettings))]
     public class UserSettings : IUserSettings
     {
-        private readonly ISettingsUtils _settingsUtils;
+        private readonly SettingsUtils _settingsUtils;
         private const string PowerOcrModuleName = "TextExtractor";
         private const string DefaultActivationShortcut = "Win + Shift + O";
         private const int MaxNumberOfRetry = 5;