Fix CA1802;CA1805;CA1823;CA1822;CA1845;CA1846;CA1852; (#2138)

* Fix CA1802;CA1805;CA1823;

* Fix CA1822;CA1845;CA1846;CA1852;

Author: vicancy

Directory.Build.props

@@ -29,7 +29,7 @@
     <ThirdPartyAssemblySigningCertName>3PartySHA2</ThirdPartyAssemblySigningCertName>
     <PackageSigningCertName>NuGet</PackageSigningCertName>
     <!-- Disable the warnings for now, enable batch by batch later-->
-    <NoWarn>$(NoWarn);CA1802;CA1805;CA1823;CA1822;CA1845;CA1846;CA1852;CA2007;CA2008;CA2012;CA2016;CA1835;CA2208;IDE0161;IDE0130;IDE0290;IDE1006;IDE0090</NoWarn>
+    <NoWarn>$(NoWarn);CA2007;CA2008;CA2012;CA2016;CA1835;CA2208;IDE0161;IDE0130;IDE0290;IDE1006;IDE0090</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

samples/AspNet.ChatSample/AspNet.ChatSample.CSharpClient/Program.cs

@@ -10,7 +10,7 @@
 
 namespace AspNet.ChatSample.CSharpClient;
 
-class Program
+sealed class Program
 {
     private static readonly Func<Task> ReconnectDelayTask = () => DelayRandom(200, 1000);
     private static readonly SemaphoreSlim ReconnectLock = new SemaphoreSlim(1);

samples/ChatSample/ChatSample.CSharpClient/Program.cs

@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,7 +11,7 @@
 
 namespace ChatSample.CSharpClient
 {
-    class Program
+    sealed class Program
     {
         static async Task Main(string[] args)
         {

samples/ChatSample/ChatSample.ManagementPublisher/MessagePublisher.cs

@@ -6,7 +6,7 @@
 // A simple library file to test cross project reference issue: https://github.com/Azure/azure-signalr/issues/1720
 namespace ManagementPublisher
 {
-    internal class MessagePublisher
+    internal sealed class MessagePublisher
     {
         private const string Target = "Target";
         private const string HubName = "Chat";

src/Common/TextMessageParser.cs

@@ -10,7 +10,7 @@ namespace Microsoft.Azure.SignalR
     /// </summary>
     internal static class TextMessageParser
     {
-        public static readonly byte RecordSeparator = 0x1e;
+        public const byte RecordSeparator = 0x1e;
 
         public static bool TryParseMessage(ref ReadOnlySequence<byte> buffer, out ReadOnlySequence<byte> payload)
         {

src/Microsoft.Azure.SignalR.Common/Auth/AuthUtility.cs

@@ -15,8 +15,6 @@ internal static class AuthUtility
 {
     private const int MaxTokenLength = 4096;
 
-    private static readonly SignalRJwtSecurityTokenHandler JwtTokenHandler = new();
-
     public static string GenerateJwtToken(byte[] keyBytes,
                                           string? kid = null,
                                           string? issuer = null,
@@ -29,7 +27,7 @@ public static string GenerateJwtToken(byte[] keyBytes,
     {
         var subject = claims == null ? null : new ClaimsIdentity(claims);
 
-        var token = JwtTokenHandler.CreateJwtSecurityToken(
+        var token = SignalRJwtSecurityTokenHandler.CreateJwtSecurityToken(
             expires: expires,
             issuedAt: issuedAt,
             issuer: issuer,

src/Microsoft.Azure.SignalR.Common/Auth/MicrosoftEntra/MicrosoftEntraAccessKey.cs

@@ -42,7 +42,7 @@ internal class MicrosoftEntraAccessKey : IAccessKey
 
     private readonly IHttpClientFactory _httpClientFactory;
 
-    private volatile bool _isAuthorized = false;
+    private volatile bool _isAuthorized;
 
     private DateTime _updateAt = DateTime.MinValue;
 

src/Microsoft.Azure.SignalR.Common/Auth/SignalRJwtSecurityTokenHandler.cs

@@ -28,15 +28,15 @@ internal class SignalRJwtSecurityTokenHandler
     // Simplified from following codes:
     //      method `CreateJwtSecurityToken` in [JwtSecruityTokenHandler.cs](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/6.22.0/src/System.IdentityModel.Tokens.Jwt/JwtSecurityTokenHandler.cs#L487)
     //      method `CreateJwtSecurityTokenPrivate` in [JwtSecurityTokenHandler.cs](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/6.22.0/src/System.IdentityModel.Tokens.Jwt/JwtSecurityTokenHandler.cs#L616)
-    public string CreateJwtSecurityToken(DateTime? notBefore = null,
-                                         DateTime? expires = null,
-                                         DateTime? issuedAt = null,
-                                         string issuer = null,
-                                         string audience = null,
-                                         ClaimsIdentity subject = null,
-                                         byte[] key = null,
-                                         string kid = null,
-                                         AccessTokenAlgorithm algorithm = AccessTokenAlgorithm.HS256)
+    public static string CreateJwtSecurityToken(DateTime? notBefore = null,
+                                                 DateTime? expires = null,
+                                                 DateTime? issuedAt = null,
+                                                 string issuer = null,
+                                                 string audience = null,
+                                                 ClaimsIdentity subject = null,
+                                                 byte[] key = null,
+                                                 string kid = null,
+                                                 AccessTokenAlgorithm algorithm = AccessTokenAlgorithm.HS256)
     {
         if (!expires.HasValue || !issuedAt.HasValue || !notBefore.HasValue)
         {

src/Microsoft.Azure.SignalR.Common/Constants.cs

@@ -33,7 +33,7 @@ public static class Keys
 
         public const string AzureSignalREndpointsKey = $"{AzureSignalRSectionKey}:Endpoints";
 
-        public static readonly string ConnectionStringSecondaryKey =
+        public const string ConnectionStringSecondaryKey =
             $"ConnectionStrings:{ConnectionStringDefaultKey}";
     }
 

src/Microsoft.Azure.SignalR.Common/ServiceConnections/ConnectionFactory.cs

@@ -72,7 +72,7 @@ public Task DisposeAsync(ConnectionContext connection)
         return ((WebSocketConnectionContext)connection).StopAsync();
     }
 
-    private Uri GetServiceUrl(IServiceEndpointProvider provider, string hubName, string connectionId, string target)
+    private static Uri GetServiceUrl(IServiceEndpointProvider provider, string hubName, string connectionId, string target)
     {
         var baseUri = new UriBuilder(provider.GetServerEndpoint(hubName));
         var query = "cid=" + connectionId;
@@ -82,7 +82,12 @@ private Uri GetServiceUrl(IServiceEndpointProvider provider, string hubName, str
         }
         if (baseUri.Query != null && baseUri.Query.Length > 1)
         {
+#if NET6_0_OR_GREATER
+            baseUri.Query = string.Concat(baseUri.Query.AsSpan(1), "&", query);
+#else
+
             baseUri.Query = baseUri.Query.Substring(1) + "&" + query;
+#endif
         }
         else
         {