more

bgavrilMS · bgavrilMS · commit 977c649356a0 · 2025-01-06T21:24:24.000Z
diff --git a/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResult.cs b/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResult.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonIncludeAttribute;
 
 namespace Microsoft.Identity.Client.Cache
diff --git a/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResultWrapper.cs b/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResultWrapper.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 
 namespace Microsoft.Identity.Client.Cache
 {
diff --git a/src/client/Microsoft.Identity.Client/Cache/Adal/AdalUserInfo.cs b/src/client/Microsoft.Identity.Client/Cache/Adal/AdalUserInfo.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonIncludeAttribute;
 
 namespace Microsoft.Identity.Client.Cache
diff --git a/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryMetadataEntry.cs b/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryMetadataEntry.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.Instance.Discovery
diff --git a/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryResponse.cs b/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryResponse.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.Identity.Client.OAuth2;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.Instance.Discovery
diff --git a/src/client/Microsoft.Identity.Client/Instance/Region/LocalImdsErrorResponse.cs b/src/client/Microsoft.Identity.Client/Instance/Region/LocalImdsErrorResponse.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.Region
diff --git a/src/client/Microsoft.Identity.Client/Instance/Validation/AdfsWebFingerResponse.cs b/src/client/Microsoft.Identity.Client/Instance/Validation/AdfsWebFingerResponse.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.Identity.Client.OAuth2;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using System.Text.Json.Nodes;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
diff --git a/src/client/Microsoft.Identity.Client/Internal/ClientInfo.cs b/src/client/Microsoft.Identity.Client/Internal/ClientInfo.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.Internal
diff --git a/src/client/Microsoft.Identity.Client/Internal/DeviceCodeResponse.cs b/src/client/Microsoft.Identity.Client/Internal/DeviceCodeResponse.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Identity.Client.OAuth2;
 using System.Text.Json.Serialization;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.Internal
diff --git a/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityErrorResponse.cs b/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityErrorResponse.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 
diff --git a/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityResponse.cs b/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityResponse.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 
diff --git a/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj b/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <!-- Mobile targets are disabled by default to speed up dev box -->
-  <PropertyGroup Condition="'$(INCLUDE_MOBILE_AND_LEGACY_TFM)' != ''">
+  <PropertyGroup Condition="'$(INCLUDE_MOBILE_AND_LEGACY_TFM)' != '1'">
     <TargetFrameworkNetAndroid>net8.0-android</TargetFrameworkNetAndroid>
     <TargetFrameworkNetIos>net8.0-ios</TargetFrameworkNetIos>
   </PropertyGroup>
@@ -121,9 +121,9 @@
     <Compile Include="$(PathToMsalSources)\Platforms\Android\**\*.cs" />
     <Compile Include="$(PathToMsalSources)\PlatformsCommon\PlatformNotSupported\ApiConfig\SystemWebViewOptions.cs" />
     <PackageReference Include="System.Security.SecureString" />
-
     <PackageReference Include="Xamarin.AndroidX.Browser" PrivateAssets="All" />
   </ItemGroup>
+  
   <ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetIos)'">
     <Compile Include="$(PathToMsalSources)\Platforms\iOS\**\*.cs" />
     <Compile Include="$(PathToMsalSources)\PlatformsCommon\PlatformNotSupported\ApiConfig\SystemWebViewOptions.cs" />
diff --git a/src/client/Microsoft.Identity.Client/OAuth2/DeviceAuthJWTResponse.cs b/src/client/Microsoft.Identity.Client/OAuth2/DeviceAuthJWTResponse.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 using System.Text.Json.Serialization;
 
diff --git a/src/client/Microsoft.Identity.Client/OAuth2/MsalTokenResponse.cs b/src/client/Microsoft.Identity.Client/OAuth2/MsalTokenResponse.cs
@@ -13,7 +13,7 @@
 using Microsoft.Identity.Client.Utils;
 using System.Text.Json.Serialization;
 using System.Text.Json;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JObject = System.Text.Json.Nodes.JsonObject;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
diff --git a/src/client/Microsoft.Identity.Client/OAuth2/OAuth2ResponseBase.cs b/src/client/Microsoft.Identity.Client/OAuth2/OAuth2ResponseBase.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.OAuth2
diff --git a/src/client/Microsoft.Identity.Client/UI/AuthorizationResult.cs b/src/client/Microsoft.Identity.Client/UI/AuthorizationResult.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Identity.Client.OAuth2;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 
 namespace Microsoft.Identity.Client.UI
 {
diff --git a/src/client/Microsoft.Identity.Client/Utils/JsonHelper.cs b/src/client/Microsoft.Identity.Client/Utils/JsonHelper.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using Microsoft.Identity.Client.Core;
 using Microsoft.Identity.Client.Internal;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 
diff --git a/src/client/Microsoft.Identity.Client/WsTrust/UserRealmDiscoveryResponse.cs b/src/client/Microsoft.Identity.Client/WsTrust/UserRealmDiscoveryResponse.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.WsTrust
diff --git a/src/client/Microsoft.Identity.Client/json/JsonStringConverter.cs b/src/client/Microsoft.Identity.Client/json/JsonStringConverter.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.Identity.Client.Platforms.net
+namespace Microsoft.Identity.Client.Json
 {
     internal class JsonStringConverter : JsonConverter<string>
     {
diff --git a/src/client/Microsoft.Identity.Client/json/MsalJsonSerializerContext.cs b/src/client/Microsoft.Identity.Client/json/MsalJsonSerializerContext.cs
@@ -1,23 +1,22 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
 using Microsoft.Identity.Client.Cache;
 using Microsoft.Identity.Client.Instance.Discovery;
 using Microsoft.Identity.Client.Instance.Oidc;
 using Microsoft.Identity.Client.Instance.Validation;
 using Microsoft.Identity.Client.Internal;
+using Microsoft.Identity.Client.Json;
 using Microsoft.Identity.Client.Kerberos;
 using Microsoft.Identity.Client.ManagedIdentity;
 using Microsoft.Identity.Client.OAuth2;
 using Microsoft.Identity.Client.Region;
 using Microsoft.Identity.Client.WsTrust;
 
-namespace Microsoft.Identity.Client.Platforms.net
+namespace Microsoft.Identity.Client.Platforms.Json
 {
     /// <summary>
     /// This class specifies metadata for System.Text.Json source generation.
@@ -40,6 +39,10 @@ namespace Microsoft.Identity.Client.Platforms.net
     [JsonSerializable(typeof(ManagedIdentityResponse))]
     [JsonSerializable(typeof(ManagedIdentityErrorResponse))]
     [JsonSerializable(typeof(OidcMetadata))]
+#if ANDROID
+    [JsonSerializable(typeof(Android.Broker.BrokerErrorResponse))]    
+    [JsonSerializable(typeof(Android.Broker.BrokerRequest))]    
+#endif
     [JsonSourceGenerationOptions]
     internal partial class MsalJsonSerializerContext : JsonSerializerContext
     {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using Microsoft.Identity.Client.Utils;`
`5`		`-using Microsoft.Identity.Client.Platforms.net;`
	`5`	`+using Microsoft.Identity.Client.Platforms.Json;`
`6`	`6`
`7`	`7`	`namespace Microsoft.Identity.Client.Cache`
`8`	`8`	`{`