Add .NET 6 target that uses System.Text.Json and IL trimming

LibsAndSamples.sln

@@ -187,6 +187,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntuneMAMSampleiOS", "tests
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TrueMam", "TrueMam", "{660867D0-956C-4AF2-8627-03AADF4FCEAA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Test.UIAutomation.Infrastructure", "tests\Microsoft.Identity.Test.Core.UIAutomation\Microsoft.Identity.Test.UIAutomation.Infrastructure.csproj", "{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug + MobileApps|Any CPU = Debug + MobileApps|Any CPU
@@ -2310,6 +2312,48 @@ Global
 		{034A5B86-A8AE-449D-B561-46F811329E6D}.Release|x64.Build.0 = Release|iPhoneSimulator
 		{034A5B86-A8AE-449D-B561-46F811329E6D}.Release|x86.ActiveCfg = Release|iPhoneSimulator
 		{034A5B86-A8AE-449D-B561-46F811329E6D}.Release|x86.Build.0 = Release|iPhoneSimulator
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|Any CPU.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|ARM.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|ARM.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|ARM64.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|ARM64.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|iPhone.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|iPhone.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|x64.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|x64.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|x86.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|x86.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|ARM.Build.0 = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|ARM64.Build.0 = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|iPhone.Build.0 = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|x64.Build.0 = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2373,6 +2417,7 @@ Global
 		{69CE42A2-44DD-4740-856B-607C3BB5A92E} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F}
 		{034A5B86-A8AE-449D-B561-46F811329E6D} = {660867D0-956C-4AF2-8627-03AADF4FCEAA}
 		{660867D0-956C-4AF2-8627-03AADF4FCEAA} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB}
+		{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4} = {45EBC624-6277-4EA2-A89C-A730A3214503}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {020399A9-DC27-4B82-9CAA-EF488665AC27}

build/platform_and_feature_flags.props

@@ -2,6 +2,9 @@
   <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetCore)' ">
     <DefineConstants>$(DefineConstants);NET_CORE;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_CUSTOM_CACHE;SUPPORTS_BROKER;SUPPORTS_WIN32;</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6)' ">
+    <DefineConstants>$(DefineConstants);NET_CORE;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_CUSTOM_CACHE;SUPPORTS_BROKER;SUPPORTS_WIN32;</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet5Win)' ">
     <DefineConstants>$(DefineConstants);NET5_WIN;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_CUSTOM_CACHE;SUPPORTS_BROKER;SUPPORTS_WIN32;</DefineConstants>
   </PropertyGroup>

src/client/Microsoft.Identity.Client/AppConfig/AbstractApplicationBuilder.cs

@@ -10,11 +10,14 @@
 using Microsoft.Identity.Client.Http;
 using Microsoft.Identity.Client.Instance;
 using Microsoft.Identity.Client.Instance.Discovery;
-using Microsoft.Identity.Client.Internal;
 using Microsoft.Identity.Client.PlatformsCommon.Interfaces;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Json;
 using Microsoft.IdentityModel.Abstractions;
+#if NET6_0_OR_GREATER
+using System.Text.Json;
+#else
+using Microsoft.Identity.Json;
+#endif
 
 namespace Microsoft.Identity.Client
 {
@@ -555,18 +558,17 @@ internal void ValidateUseOfExperimentalFeature([System.Runtime.CompilerServices.
             }
         }
 
-
         #region Authority
         private void ResolveAuthority()
         {
             if (Config.Authority?.AuthorityInfo != null)
             {
                 var isB2C = Config.Authority is B2CAuthority;
-                
+
                 AadAuthority aadAuthority = Config.Authority as AadAuthority;
-                if (!string.IsNullOrEmpty(Config.TenantId) 
+                if (!string.IsNullOrEmpty(Config.TenantId)
                     && !isB2C
-                    && aadAuthority != null )
+                    && aadAuthority != null)
                 {
                     if (!aadAuthority.IsCommonOrganizationsOrConsumersTenant() &&
                         !string.Equals(aadAuthority.TenantId, Config.TenantId))
@@ -854,7 +856,7 @@ public T WithB2CAuthority(string authorityUri)
             return (T)this;
         }
 
-#endregion
+        #endregion
 
         private static string GetValueIfNotEmpty(string original, string value)
         {

src/client/Microsoft.Identity.Client/AppConfig/TraceTelemetryConfig.cs

@@ -6,8 +6,11 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Json;
+#if NET6_0_OR_GREATER
+using JObject = System.Text.Json.Nodes.JsonObject;
+#else
 using Microsoft.Identity.Json.Linq;
+#endif
 
 namespace Microsoft.Identity.Client
 {
@@ -46,29 +49,29 @@ public TraceTelemetryConfig()
         /// <remarks>This API is experimental and it may change in future versions of the library without an major version increment</remarks>
         public Action<ITelemetryEventPayload> DispatchAction => payload =>
         {
-            var j = new JObject();
+            var jsonObject = new JObject();
             foreach (var kvp in payload.BoolValues)
             {
-                j[kvp.Key] = kvp.Value;
+                jsonObject[kvp.Key] = kvp.Value;
             }
             foreach (var kvp in payload.IntValues)
             {
-                j[kvp.Key] = kvp.Value;
+                jsonObject[kvp.Key] = kvp.Value;
             }
             foreach (var kvp in payload.Int64Values)
             {
-                j[kvp.Key] = kvp.Value;
+                jsonObject[kvp.Key] = kvp.Value;
             }
             foreach (var kvp in payload.StringValues)
             {
-                j[kvp.Key] = kvp.Value;
+                jsonObject[kvp.Key] = kvp.Value;
             }
 
-            string msg = JsonConvert.SerializeObject(j, Formatting.None);
+            string message = JsonHelper.JsonObjectToString(jsonObject);
 #if WINDOWS_APP
-            Debug.WriteLine(msg);
+            Debug.WriteLine(message);
 #else
-            Trace.TraceInformation(msg);
+            Trace.TraceInformation(message);
             Trace.Flush();
 #endif
         };

src/client/Microsoft.Identity.Client/AuthScheme/PoP/PoPAuthenticationScheme.cs

@@ -11,16 +11,21 @@
 using Microsoft.Identity.Client.Internal;
 using Microsoft.Identity.Client.OAuth2;
 using Microsoft.Identity.Client.Utils;
+#if NET6_0_OR_GREATER
+using JObject = System.Text.Json.Nodes.JsonObject;
+using JToken = System.Text.Json.Nodes.JsonNode;
+#else
 using Microsoft.Identity.Json;
 using Microsoft.Identity.Json.Linq;
+#endif
 
 namespace Microsoft.Identity.Client.AuthScheme.PoP
 {
     internal class PopAuthenticationScheme : IAuthenticationScheme
     {
         private static readonly DateTime s_jwtBaselineTime = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
         private readonly PoPAuthenticationConfiguration _popAuthenticationConfiguration;
-        private IPoPCryptoProvider _popCryptoProvider;
+        private readonly IPoPCryptoProvider _popCryptoProvider;
 
         /// <summary>
         /// Creates POP tokens, i.e. tokens that are bound to an HTTP request and are digitally signed.
@@ -68,48 +73,48 @@ public string FormatAccessToken(MsalAccessTokenCacheItem msalAccessTokenCacheIte
                 return msalAccessTokenCacheItem.Secret;
             }
 
-            JObject header = new JObject
-            {
-                { JsonWebTokenConstants.ReservedHeaderParameters.Algorithm, _popCryptoProvider.CryptographicAlgorithm },
-                { JsonWebTokenConstants.ReservedHeaderParameters.KeyId, KeyId },
-                { JsonWebTokenConstants.ReservedHeaderParameters.Type, Constants.PoPTokenType}
-            };
+            var header = new JObject();
+            header[JsonWebTokenConstants.ReservedHeaderParameters.Algorithm] = _popCryptoProvider.CryptographicAlgorithm;
+            header[JsonWebTokenConstants.ReservedHeaderParameters.KeyId] = KeyId;
+            header[JsonWebTokenConstants.ReservedHeaderParameters.Type] = Constants.PoPTokenType;
 
-            JObject body = CreateBody(msalAccessTokenCacheItem);
+            var body = CreateBody(msalAccessTokenCacheItem);
 
-            string popToken = CreateJWS(body.ToString(Formatting.None), header.ToString(Formatting.None));
+            string popToken = CreateJWS(JsonHelper.JsonObjectToString(body), JsonHelper.JsonObjectToString(header));
             return popToken;
         }
 
         private JObject CreateBody(MsalAccessTokenCacheItem msalAccessTokenCacheItem)
         {
-            JToken publicKeyJWK = JToken.Parse(_popCryptoProvider.CannonicalPublicKeyJwk);
-            List<JProperty> properties = new List<JProperty>(8);
-
-            // Mandatory parameters
-            properties.Add(new JProperty(PoPClaimTypes.Cnf, new JObject(new JProperty(PoPClaimTypes.JWK, publicKeyJWK))));
-            properties.Add(new JProperty(PoPClaimTypes.Ts, DateTimeHelpers.CurrDateTimeInUnixTimestamp()));
-            properties.Add(new JProperty(PoPClaimTypes.At, msalAccessTokenCacheItem.Secret));
-            properties.Add(new JProperty(PoPClaimTypes.Nonce, _popAuthenticationConfiguration.Nonce ?? CreateSimpleNonce()));
+            var publicKeyJwk = JToken.Parse(_popCryptoProvider.CannonicalPublicKeyJwk);
+            var body = new JObject
+            {
+                // Mandatory parameters
+                [PoPClaimTypes.Cnf] = new JObject
+                {
+                    [PoPClaimTypes.JWK] = publicKeyJwk
+                },
+                [PoPClaimTypes.Ts] = DateTimeHelpers.CurrDateTimeInUnixTimestamp(),
+                [PoPClaimTypes.At] = msalAccessTokenCacheItem.Secret,
+                [PoPClaimTypes.Nonce] = _popAuthenticationConfiguration.Nonce ?? CreateSimpleNonce(),
+            };
 
             if (_popAuthenticationConfiguration.HttpMethod != null)
             {
-                properties.Add(new JProperty(PoPClaimTypes.HttpMethod, _popAuthenticationConfiguration.HttpMethod?.ToString()));
+                body[PoPClaimTypes.HttpMethod] = _popAuthenticationConfiguration.HttpMethod?.ToString();
             }
 
             if (!string.IsNullOrEmpty(_popAuthenticationConfiguration.HttpHost))
             {
-                properties.Add(new JProperty(PoPClaimTypes.Host, _popAuthenticationConfiguration.HttpHost));
+                body[PoPClaimTypes.Host] = _popAuthenticationConfiguration.HttpHost;
             }
 
             if (!string.IsNullOrEmpty(_popAuthenticationConfiguration.HttpPath))
             {
-                properties.Add(new JProperty(PoPClaimTypes.Path, _popAuthenticationConfiguration.HttpPath));
+                body[PoPClaimTypes.Path] = _popAuthenticationConfiguration.HttpPath;
             }
 
-            var payload = new JObject(properties);
-
-            return payload;
+            return body;
         }
 
         private static string CreateSimpleNonce()

src/client/Microsoft.Identity.Client/Cache/Adal/AdalResult.cs

@@ -1,23 +1,28 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
+#if NET6_0_OR_GREATER
+using JsonProperty = System.Text.Json.Serialization.JsonIncludeAttribute;
+#else
 using Microsoft.Identity.Json;
+#endif
 
 namespace Microsoft.Identity.Client.Cache
 {
     /// <summary>
     /// Contains the results of an ADAL token acquisition. Access Tokens from ADAL are not compatible 
     /// with MSAL, only Refresh Tokens are.
     /// </summary>
+#if !NET6_0_OR_GREATER
     [JsonObject]
+#endif
     [Preserve(AllMembers = true)]
     internal sealed class AdalResult
     {
-        internal AdalResult() 
-        { 
+        public AdalResult()
+        {
             // for serialization
-        } 
+        }
 
         /// <summary>
         /// Gets user information including user Id. Some elements in UserInfo might be null if not returned by the service.

src/client/Microsoft.Identity.Client/Cache/Adal/AdalResultWrapper.cs

@@ -1,26 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
 using Microsoft.Identity.Client.Utils;
+#if !NET6_0_OR_GREATER
 using Microsoft.Identity.Json;
+#endif
 
 namespace Microsoft.Identity.Client.Cache
 {
+#if !NET6_0_OR_GREATER
     [JsonObject]
+#endif
     [Preserve(AllMembers = true)]
     internal class AdalResultWrapper
     {
+
+#if !NET6_0_OR_GREATER
         [JsonProperty]
+#endif
         public AdalResult Result { get; set; }
 
+#if !NET6_0_OR_GREATER
         [JsonProperty]
+#endif
         public string RawClientInfo { get; set; }
 
         /// <summary>
         /// Gets the Refresh Token associated with the requested Access Token. Note: not all operations will return a Refresh Token.
         /// </summary>
+#if !NET6_0_OR_GREATER
         [JsonProperty]
+#endif
         public string RefreshToken { get; set; }
 
         /// <summary>
@@ -30,7 +40,9 @@ internal class AdalResultWrapper
 
         // This is only needed for AcquireTokenByAuthorizationCode in which parameter resource is optional and we need
         // to get it from the STS response.
+#if !NET6_0_OR_GREATER
         [JsonProperty]
+#endif
         internal string ResourceInResponse { get; set; }
 
         /// <summary>
@@ -51,9 +63,9 @@ public string Serialize()
             return JsonHelper.SerializeToJson(this);
         }
 
-        internal Exception Exception { get; set; }
-
+#if !NET6_0_OR_GREATER
         [JsonProperty]
+#endif
         public string UserAssertionHash { get; set; }
 
         internal AdalResultWrapper Clone()

src/client/Microsoft.Identity.Client/Cache/Adal/AdalUserInfo.cs

@@ -2,14 +2,20 @@
 // Licensed under the MIT License.
 
 using System;
+#if NET6_0_OR_GREATER
+using JsonProperty = System.Text.Json.Serialization.JsonIncludeAttribute;
+#else
 using Microsoft.Identity.Json;
+#endif
 
 namespace Microsoft.Identity.Client.Cache
 {
     /// <summary>
     /// Contains information of a single user. This information is used for token cache lookup. Also if created with userId, userId is sent to the service when login_hint is accepted.
     /// </summary>
+#if !NET6_0_OR_GREATER
     [JsonObject]
+#endif
     [Preserve(AllMembers = true)]
     internal sealed class AdalUserInfo
     {

src/client/Microsoft.Identity.Client/Cache/ITokenCacheSerializable.cs

@@ -2,7 +2,11 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
+#if NET6_0_OR_GREATER
+using JToken = System.Text.Json.Nodes.JsonNode;
+#else
 using Microsoft.Identity.Json.Linq;
+#endif
 
 namespace Microsoft.Identity.Client.Cache
 {