Skip to content

Migrate Microsoft.IdentityModel.TestExtensions from Newtonsoft.Json to System.Text.Json #3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keegan-caruso merged 4 commits into from
Oct 22, 2025
+7 −9
Merged

Migrate Microsoft.IdentityModel.TestExtensions from Newtonsoft.Json to System.Text.Json #3356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e16378d
Initial plan
Copilot Oct 19, 2025
a084b9b
Migrate Microsoft.IdentityModel.TestExtensions from Newtonsoft.Json t…
Copilot Oct 19, 2025
8aad001
Merge branch 'dev' into copilot/migrate-to-system-text-json
keegan-caruso Oct 21, 2025
c7916ef
Add comment explaining NoWarn suppressions for IL2026 and IL3050
Copilot Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Microsoft.IdentityModel.TestExtensions/Microsoft.IdentityModel.TestExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<SignAssembly>true</SignAssembly>
<Nullable>enable</Nullable>
<EnablePackageValidation>false</EnablePackageValidation>
<!-- Suppress IL2026 (RequiresUnreferencedCode) and IL3050 (RequiresDynamicCode) warnings for System.Text.Json serialization.
TestExtensions is a test utility library that does not require AOT compatibility. -->
<NoWarn>$(NoWarn);IL2026;IL3050</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand All @@ -21,8 +24,8 @@
<ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftVersion)" />
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
9 changes: 2 additions & 7 deletions src/Microsoft.IdentityModel.TestExtensions/TestTokenCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
using System.Globalization;
using System.Security.Claims;
using System.Security.Cryptography;
using System.Text.Json;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace Microsoft.IdentityModel.TestExtensions
{
Expand Down Expand Up @@ -427,11 +426,7 @@ public static string CreateJsonPayload(IDictionary<string, object> claims)
if (claims == null)
throw new ArgumentNullException(nameof(claims));

var jobj = new JObject();
foreach (var claim in claims)
jobj.Add(claim.Key, JToken.FromObject(claim.Value));

return jobj.ToString(Formatting.None);
return JsonSerializer.Serialize(claims);
}
}
}
Loading