Fix formatting violations in new files from main refactor

- MacNativeMethods.cs: add pragma IDE0060 for P/Invoke params, convert
  UnmanagedCallConv new Type[]{} to collection expressions
- WindowsNativeDpiHelper.cs: same pragma + collection expression fixes
- WindowsNativeMethods.cs: add pragma IDE0060, fix collection expression
- WindowsNativeUtils.cs: add pragma IDE0060 for CoInitializeSecurity params
- MsalIdHelper.cs: fix IDE0008 var -> Regex explicit type
- .editorconfig: suppress SYSLIB1054 (LibraryImport requires .NET 7+)
- CI yaml: add --exclude json\ to dotnet format command

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Robbie-Microsoft

.editorconfig

@@ -903,6 +903,8 @@ dotnet_diagnostic.CA1850.severity = none
 # Use ThrowIfCancellationRequested / ThrowIfNegativeOrZero / ObjectDisposedException.ThrowIf - requires .NET 6+/8+
 dotnet_diagnostic.CA2250.severity = none
 dotnet_diagnostic.CA1512.severity = none
+# SYSLIB1054: LibraryImport requires .NET 7+ source generation; multi-target false positive
+dotnet_diagnostic.SYSLIB1054.severity = none
 dotnet_diagnostic.CA1513.severity = none
 
 # Dispose objects before losing scope

src/client/Microsoft.Identity.Client/Internal/ClientCredential/ClientSecretCredential.cs

@@ -10,17 +10,12 @@
 
 namespace Microsoft.Identity.Client.Internal.ClientCredential
 {
-    internal class ClientSecretCredential : IClientCredential
+    internal class ClientSecretCredential(string secret) : IClientCredential
     {
-        internal string Secret { get; }
+        internal string Secret { get; } = secret;
 
         public AssertionType AssertionType => AssertionType.Secret;
 
-        public ClientSecretCredential(string secret)
-        {
-            Secret = secret;
-        }
-
         public Task<CredentialMaterial> GetCredentialMaterialAsync(
             CredentialContext context,
             CancellationToken cancellationToken)

src/client/Microsoft.Identity.Client/Internal/ClientCredential/CredentialMaterial.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 using System;
@@ -13,14 +13,19 @@ namespace Microsoft.Identity.Client.Internal.ClientCredential
     /// Replaces the former <c>ClientCredentialApplicationResult</c> and decouples "what credentials
     /// produce" from "how the token client applies them".
     /// </summary>
-    internal sealed class CredentialMaterial
+    /// <param name="tokenRequestParameters">Body parameters to add to the token request. Must not be null.</param>
+    /// <param name="resolvedCertificate">Optional certificate for mTLS transport or logging.</param>
+    internal sealed class CredentialMaterial(
+        IReadOnlyDictionary<string, string> tokenRequestParameters,
+        X509Certificate2 resolvedCertificate = null)
     {
         /// <summary>
         /// Key/value pairs to be added to the token-request body. Usually client_assertion.
         /// Never <see langword="null"/>; may be empty (e.g., for pure mTLS-transport mode where the
         /// certificate authenticates the client at the TLS layer and no assertion is needed).
         /// </summary>
-        public IReadOnlyDictionary<string, string> TokenRequestParameters { get; }
+        public IReadOnlyDictionary<string, string> TokenRequestParameters { get; } = tokenRequestParameters
+                ?? throw new ArgumentNullException(nameof(tokenRequestParameters));
 
         /// <summary>
         /// Optional certificate returned by the credential.
@@ -29,17 +34,6 @@ internal sealed class CredentialMaterial
         /// <see cref="ClientSignedAssertion.TokenBindingCertificate"/>.
         /// <see langword="null"/> when no certificate is involved (secret, plain JWT assertion).
         /// </summary>
-        public X509Certificate2 ResolvedCertificate { get; }
-
-        /// <param name="tokenRequestParameters">Body parameters to add to the token request. Must not be null.</param>
-        /// <param name="resolvedCertificate">Optional certificate for mTLS transport or logging.</param>
-        public CredentialMaterial(
-            IReadOnlyDictionary<string, string> tokenRequestParameters,
-            X509Certificate2 resolvedCertificate = null)
-        {
-            TokenRequestParameters = tokenRequestParameters
-                ?? throw new ArgumentNullException(nameof(tokenRequestParameters));
-            ResolvedCertificate = resolvedCertificate;
-        }
+        public X509Certificate2 ResolvedCertificate { get; } = resolvedCertificate;
     }
 }

src/client/Microsoft.Identity.Client/Internal/ClientCredential/CredentialMaterialResolver.cs

@@ -38,7 +38,7 @@ internal static async Task<CredentialMaterial> ResolveAsync(
             string tokenEndpoint,
             CancellationToken cancellationToken)
         {
-            var context = BuildContext(requestParams, tokenEndpoint);
+            CredentialContext context = BuildContext(requestParams, tokenEndpoint);
 
             CredentialMaterial material = await credential
                 .GetCredentialMaterialAsync(context, cancellationToken)

src/client/Microsoft.Identity.Client/Internal/ClientCredential/SignedAssertionClientCredential.cs

@@ -10,17 +10,12 @@
 
 namespace Microsoft.Identity.Client.Internal.ClientCredential
 {
-    internal class SignedAssertionClientCredential : IClientCredential
+    internal class SignedAssertionClientCredential(string signedAssertion) : IClientCredential
     {
-        private readonly string _signedAssertion;
+        private readonly string _signedAssertion = signedAssertion;
 
         public AssertionType AssertionType => AssertionType.ClientAssertion;
 
-        public SignedAssertionClientCredential(string signedAssertion)
-        {
-            _signedAssertion = signedAssertion;
-        }
-
         public Task<CredentialMaterial> GetCredentialMaterialAsync(
             CredentialContext context,
             CancellationToken cancellationToken)

src/client/Microsoft.Identity.Client/Internal/MsalIdHelper.cs

@@ -37,13 +37,13 @@ internal static class MsalIdParameter
     ///     This class adds additional query parameters or headers to the requests sent to STS. This can help us in
     ///     collecting statistics and potentially on diagnostics.
     /// </summary>
-    internal static class MsalIdHelper
+    internal static partial class MsalIdHelper
     {
         private static readonly Lazy<string> s_msalVersion = new(
             () =>
             {
                 string fullVersion = typeof(MsalIdHelper).Assembly.FullName;
-                var regex = new Regex(@"Version=[\d]+.[\d+]+.[\d]+.[\d]+");
+                Regex regex = MyRegex();
                 Match match = regex.Match(fullVersion);
                 if (!match.Success)
                 {
@@ -90,5 +90,8 @@ public static string GetMsalVersion()
         {
             return s_msalVersion.Value;
         }
+
+        [GeneratedRegex(@"Version=[\d]+.[\d+]+.[\d]+.[\d]+")]
+        private static partial Regex MyRegex();
     }
 }

src/client/Microsoft.Identity.Client/Internal/Requests/RequestBase.cs

@@ -6,24 +6,24 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Runtime.ConstrainedExecution;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
+using Microsoft.Identity.Client.AuthScheme;
 using Microsoft.Identity.Client.Cache;
 using Microsoft.Identity.Client.Cache.Items;
 using Microsoft.Identity.Client.Core;
 using Microsoft.Identity.Client.Instance.Discovery;
+using Microsoft.Identity.Client.Internal.Broker;
 using Microsoft.Identity.Client.OAuth2;
+using Microsoft.Identity.Client.TelemetryCore;
 using Microsoft.Identity.Client.TelemetryCore.Internal.Events;
+using Microsoft.Identity.Client.TelemetryCore.OpenTelemetry;
+using Microsoft.Identity.Client.TelemetryCore.TelemetryClient;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Client.TelemetryCore;
 using Microsoft.IdentityModel.Abstractions;
-using Microsoft.Identity.Client.TelemetryCore.TelemetryClient;
-using Microsoft.Identity.Client.TelemetryCore.OpenTelemetry;
-using Microsoft.Identity.Client.Internal.Broker;
-using System.Runtime.ConstrainedExecution;
-using Microsoft.Identity.Client.AuthScheme;
 
 namespace Microsoft.Identity.Client.Internal.Requests
 {
@@ -73,7 +73,7 @@ public async Task<AuthenticationResult> RunAsync(CancellationToken cancellationT
         {
             ApiEvent apiEvent = null;
 
-            var measureTelemetryDurationResult = StopwatchService.MeasureCodeBlock(() =>
+            MeasureDurationResult measureTelemetryDurationResult = StopwatchService.MeasureCodeBlock(() =>
             {
                 apiEvent = InitializeApiEvent(AuthenticationRequestParameters.Account?.HomeAccountId?.Identifier);
                 AuthenticationRequestParameters.RequestContext.ApiEvent = apiEvent;
@@ -82,7 +82,7 @@ public async Task<AuthenticationResult> RunAsync(CancellationToken cancellationT
             try
             {
                 AuthenticationResult authenticationResult = null;
-                var measureDurationResult = await StopwatchService.MeasureCodeBlockAsync(async () =>
+                MeasureDurationResult measureDurationResult = await StopwatchService.MeasureCodeBlockAsync(async () =>
                 {
                     AuthenticationRequestParameters.LogParameters();
                     LogRequestStarted(AuthenticationRequestParameters);
@@ -156,10 +156,10 @@ private Tuple<string, string> ParseScopesForTelemetry()
 
                 if (Uri.IsWellFormedUriString(firstScope, UriKind.Absolute))
                 {
-                    Uri firstScopeAsUri = new Uri(firstScope);
+                    Uri firstScopeAsUri = new(firstScope);
                     resource = $"{firstScopeAsUri.Scheme}://{firstScopeAsUri.Host}";
 
-                    StringBuilder stringBuilder = new StringBuilder();
+                    StringBuilder stringBuilder = new();
 
                     foreach (string scope in AuthenticationRequestParameters.Scope)
                     {
@@ -199,7 +199,7 @@ private static void LogMetricsFromAuthResult(AuthenticationResult authentication
         {
             if (logger.IsLoggingEnabled(LogLevel.Always))
             {
-                var metadata = authenticationResult.AuthenticationResultMetadata;
+                AuthenticationResultMetadata metadata = authenticationResult.AuthenticationResultMetadata;
                 logger.Always(
                     $"""
                      
@@ -237,7 +237,7 @@ protected virtual void EnrichTelemetryApiEvent(ApiEvent apiEvent)
         private ApiEvent InitializeApiEvent(string accountId)
 #pragma warning restore IDE0060
         {
-            ApiEvent apiEvent = new ApiEvent(AuthenticationRequestParameters.RequestContext.CorrelationId)
+            ApiEvent apiEvent = new(AuthenticationRequestParameters.RequestContext.CorrelationId)
             {
                 ApiId = AuthenticationRequestParameters.ApiId,
                 IsTokenCacheSerialized =
@@ -268,11 +268,9 @@ private ApiEvent InitializeApiEvent(string accountId)
 
         private void UpdateCallerSdkDetails(ApiEvent apiEvent)
         {
-            string callerSdkId;
-            string callerSdkVer;
 
             // Check if ExtraQueryParameters contains caller-sdk-id and caller-sdk-ver
-            if (AuthenticationRequestParameters.ExtraQueryParameters.TryGetValue(Constants.CallerSdkIdKey, out callerSdkId))
+            if (AuthenticationRequestParameters.ExtraQueryParameters.TryGetValue(Constants.CallerSdkIdKey, out string callerSdkId))
             {
                 AuthenticationRequestParameters.ExtraQueryParameters.Remove(Constants.CallerSdkIdKey);
             }
@@ -281,7 +279,7 @@ private void UpdateCallerSdkDetails(ApiEvent apiEvent)
                 callerSdkId = AuthenticationRequestParameters.RequestContext.ServiceBundle.Config.ClientName;
             }
 
-            if (AuthenticationRequestParameters.ExtraQueryParameters.TryGetValue(Constants.CallerSdkVersionKey, out callerSdkVer))
+            if (AuthenticationRequestParameters.ExtraQueryParameters.TryGetValue(Constants.CallerSdkVersionKey, out string callerSdkVer))
             {
                 AuthenticationRequestParameters.ExtraQueryParameters.Remove(Constants.CallerSdkVersionKey);
             }
@@ -331,7 +329,7 @@ protected async Task<AuthenticationResult> CacheTokenResponseAndCreateAuthentica
                 AuthenticationRequestParameters.ApiId != ApiEvent.ApiIds.AcquireTokenForUserAssignedManagedIdentity &&
                 AuthenticationRequestParameters.ApiId != ApiEvent.ApiIds.AcquireTokenByRefreshToken &&
                 AuthenticationRequestParameters.AuthorityInfo.AuthorityType != AuthorityType.Adfs &&
-                !(msalTokenResponse.ClientInfo is null))
+                msalTokenResponse.ClientInfo is not null)
             {
                 //client_info is not returned from managed identity flows because there is no user present.
                 clientInfoFromServer = ClientInfo.CreateFromJson(msalTokenResponse.ClientInfo);
@@ -340,9 +338,9 @@ protected async Task<AuthenticationResult> CacheTokenResponseAndCreateAuthentica
 
             AuthenticationRequestParameters.RequestContext.Logger.Info("Saving token response to cache..");
 
-            var tuple = await CacheManager.SaveTokenResponseAsync(msalTokenResponse).ConfigureAwait(false);
-            var atItem = tuple.Item1;
-            var idtItem = tuple.Item2;
+            Tuple<MsalAccessTokenCacheItem, MsalIdTokenCacheItem, Account> tuple = await CacheManager.SaveTokenResponseAsync(msalTokenResponse).ConfigureAwait(false);
+            MsalAccessTokenCacheItem atItem = tuple.Item1;
+            MsalIdTokenCacheItem idtItem = tuple.Item2;
             Account account = tuple.Item3;
 #if !MOBILE
             atItem?.AddAdditionalCacheParameters(clientInfoFromServer?.AdditionalResponseParameters);
@@ -376,7 +374,7 @@ internal async Task<MsalTokenResponse> SendTokenRequestAsync(
         {
             var tokenEndpoint = await AuthenticationRequestParameters.Authority.GetTokenEndpointAsync(AuthenticationRequestParameters.RequestContext).ConfigureAwait(false);
 
-            var tokenResponse = await SendTokenRequestAsync(
+            MsalTokenResponse tokenResponse = await SendTokenRequestAsync(
                 tokenEndpoint,
                 additionalBodyParameters,
                 cancellationToken).ConfigureAwait(false);
@@ -393,7 +391,7 @@ protected Task<MsalTokenResponse> SendTokenRequestAsync(
             string scopes = GetOverriddenScopes(AuthenticationRequestParameters.Scope).AsSingleString();
             var tokenClient = new TokenClient(AuthenticationRequestParameters);
 
-            var CcsHeader = GetCcsHeader(additionalBodyParameters);
+            KeyValuePair<string, string>? CcsHeader = GetCcsHeader(additionalBodyParameters);
             if (CcsHeader != null && !string.IsNullOrEmpty(CcsHeader.Value.Key))
             {
                 tokenClient.AddHeaderToClient(CcsHeader.Value.Key, CcsHeader.Value.Value);
@@ -417,7 +415,7 @@ private void InjectPcaSsoPolicyHeader(TokenClient tokenClient)
                     ServiceBundle.Config,
                     AuthenticationRequestParameters.RequestContext.Logger);
 
-                var ssoPolicyHeaders = broker.GetSsoPolicyHeaders();
+                IReadOnlyDictionary<string, string> ssoPolicyHeaders = broker.GetSsoPolicyHeaders();
                 foreach (KeyValuePair<string, string> kvp in ssoPolicyHeaders)
                 {
                     tokenClient.AddHeaderToClient(kvp.Key, kvp.Value);
@@ -531,16 +529,16 @@ internal async Task<AuthenticationResult> HandleTokenRefreshErrorAsync(
             MsalAccessTokenCacheItem cachedAccessTokenItem,
             CancellationToken cancellationToken)
         {
-            var logger = AuthenticationRequestParameters.RequestContext.Logger;
+            ILoggerAdapter logger = AuthenticationRequestParameters.RequestContext.Logger;
 
             logger.Warning($"Fetching a new AT failed. Is exception retry-able? {e.IsRetryable}. Is there an AT in the cache that is usable? {cachedAccessTokenItem != null}");
 
             if (cachedAccessTokenItem != null && e.IsRetryable)
             {
                 logger.Info("Returning existing access token. It is not expired, but should be refreshed. ");
 
-                var idToken = await CacheManager.GetIdTokenCacheItemAsync(cachedAccessTokenItem).ConfigureAwait(false);
-                var account = await CacheManager.GetAccountAssociatedWithAccessTokenAsync(cachedAccessTokenItem).ConfigureAwait(false);
+                MsalIdTokenCacheItem idToken = await CacheManager.GetIdTokenCacheItemAsync(cachedAccessTokenItem).ConfigureAwait(false);
+                Account account = await CacheManager.GetAccountAssociatedWithAccessTokenAsync(cachedAccessTokenItem).ConfigureAwait(false);
 
                 return await AuthenticationResult.CreateAsync(
                     cachedAccessTokenItem,

src/client/Microsoft.Identity.Client/OAuth2/TokenClient.cs

@@ -142,7 +142,7 @@ private async Task AddBodyParamsAndHeadersAsync(
                         tokenEndpoint,
                         cancellationToken).ConfigureAwait(false);
 
-                    foreach (var kvp in material.TokenRequestParameters)
+                    foreach (KeyValuePair<string, string> kvp in material.TokenRequestParameters)
                     {
                         _oAuth2Client.AddBodyParameter(kvp.Key, kvp.Value);
                     }