Use FrozenSet in two appropriate places (#2640)

* Use FrozenSet in two appropriate places * Use FrozenSet only for .NET 8 and above --------- Co-authored-by: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
AzureAD · Jun 17, 2024 · bf18516 · bf18516
1 parent d0131d5
commit bf18516
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/...dentityModel.Protocols.OpenIdConnect/Configuration/OpenIdConnectConfigurationRetriever.cs b/...dentityModel.Protocols.OpenIdConnect/Configuration/OpenIdConnectConfigurationRetriever.cs
@@ -10,13 +10,11 @@
 
 namespace Microsoft.IdentityModel.Protocols.OpenIdConnect
 {
-
     /// <summary>
     ///  Retrieves a populated <see cref="OpenIdConnectConfiguration"/> given an address.
     /// </summary>
     public class OpenIdConnectConfigurationRetriever : IConfigurationRetriever<OpenIdConnectConfiguration>
     {
-
         /// <summary>
         /// Retrieves a populated <see cref="OpenIdConnectConfiguration"/> given an address.
         /// </summary>

diff --git a/...rosoft.IdentityModel.Protocols.OpenIdConnect/Exceptions/OpenIdConnectProtocolException.cs b/...rosoft.IdentityModel.Protocols.OpenIdConnect/Exceptions/OpenIdConnectProtocolException.cs
@@ -6,7 +6,6 @@
 
 namespace Microsoft.IdentityModel.Protocols.OpenIdConnect
 {
-
     /// <summary>
     /// This exception is thrown when an OpenIdConnect protocol handler encounters a protocol error.
     /// </summary>

diff --git a/...rosoft.IdentityModel.Protocols.OpenIdConnect/Json/OpenIdConnectConfigurationSerializer.cs b/...rosoft.IdentityModel.Protocols.OpenIdConnect/Json/OpenIdConnectConfigurationSerializer.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+#if NET8_0_OR_GREATER
+using System.Collections.Frozen;
+#endif
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -26,7 +29,13 @@ internal static class OpenIdConnectConfigurationSerializer
         // If not found, then we assume we should put the value into AdditionalData.
         // If we didn't do that, we would pay a performance penalty for those cases where there is AdditionalData
         // but otherwise the JSON properties are all lower case.
-        public static HashSet<string> OpenIdProviderMetadataNamesUpperCase = new HashSet<string>
+        public static readonly
+#if NET8_0_OR_GREATER
+        FrozenSet<string>
+#else
+        HashSet<string>
+#endif
+        OpenIdProviderMetadataNamesUpperCase = new HashSet<string>
         {
             "ACR_VALUES_SUPPORTED",
             "AUTHORIZATION_ENDPOINT",
@@ -87,7 +96,11 @@ internal static class OpenIdConnectConfigurationSerializer
             "USERINFO_ENCRYPTION_ALG_VALUES_SUPPORTED",
             "USERINFO_ENCRYPTION_ENC_VALUES_SUPPORTED",
             "USERINFO_SIGNING_ALG_VALUES_SUPPORTED",
-        };
+        }
+#if NET8_0_OR_GREATER
+        .ToFrozenSet()
+#endif
+        ;
 
         #region Read
         public static OpenIdConnectConfiguration Read(string json)

diff --git a/src/Microsoft.IdentityModel.Tokens/Json/JsonWebKeySerializer.cs b/src/Microsoft.IdentityModel.Tokens/Json/JsonWebKeySerializer.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+#if NET8_0_OR_GREATER
+using System.Collections.Frozen;
+#endif
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -21,7 +24,13 @@ internal static class JsonWebKeySerializer
         // If not found, then we assume we should put the value into AdditionalData.
         // If we didn't do that, we would pay a performance penalty for those cases where there is AdditionalData
         // but otherwise the JSON properties are all lower case.
-        public static HashSet<string> JsonWebKeyParameterNamesUpperCase = new HashSet<string>
+        public static readonly
+#if NET8_0_OR_GREATER
+        FrozenSet<string>
+#else
+        HashSet<string>
+# endif
+        JsonWebKeyParameterNamesUpperCase = new HashSet<string>
         {
             "ALG",
             "CRV",
@@ -46,7 +55,11 @@ internal static class JsonWebKeySerializer
             "X5T#S256",
             "X5U",
             "Y"
-        };
+        }
+#if NET8_0_OR_GREATER
+        .ToFrozenSet()
+#endif
+        ;
 
         #region Read
         public static JsonWebKey Read(string json)
@@ -399,4 +412,3 @@ public static void Write(ref Utf8JsonWriter writer, JsonWebKey jsonWebKey)
         #endregion
     }
 }
-