Added option to select serializer

src/Directory.Build.targets

@@ -4,14 +4,8 @@
   <Choose>
     <When Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0'">
       <PropertyGroup>
-        <DefineConstants>$(DefineConstants);SYSTEM_TEXT_JSON</DefineConstants>
+        <DefineConstants>$(DefineConstants);MODERN_DOTNET</DefineConstants>
       </PropertyGroup>
     </When>
-    <Otherwise>
-      <PropertyGroup>
-        <DefineConstants>$(DefineConstants);NEWTONSOFT_JSON</DefineConstants>
-      </PropertyGroup>
-    </Otherwise>
   </Choose>
-
 </Project>

src/JWT.Extensions.AspNetCore/JWT.Extensions.AspNetCore.csproj

@@ -11,7 +11,7 @@
     <Authors>Alexander Batishchev</Authors>
     <PackageTags>jwt;json;asp.net;asp.net core;.net core;authorization</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>10.0.0-beta3</Version>
+    <Version>10.0.0-beta4</Version>
     <FileVersion>10.0.0.0</FileVersion>
     <AssemblyVersion>10.0.0.0</AssemblyVersion>
     <RootNamespace>JWT.Extensions.AspNetCore</RootNamespace>
@@ -30,8 +30,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Condition="$(DefineConstants.Contains(SYSTEM_TEXT_JSON))" Include="System.Text.Json" Version="6.0.4" />
-    <PackageReference Condition="$(DefineConstants.Contains(NEWTONSOFT_JSON))" Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Condition="$(DefineConstants.Contains(MODERN_DOTNET))" Include="System.Text.Json" Version="6.0.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/JWT.Extensions.DependencyInjection/JWT.Extensions.DependencyInjection.csproj

@@ -11,7 +11,7 @@
     <Authors>Alexander Batishchev</Authors>
     <PackageTags>jwt;json;asp.net;asp.net core;.net core;authorization;dependenсy injection</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>2.2.0-beta3</Version>
+    <Version>2.2.0-beta4</Version>
     <FileVersion>2.0.0.0</FileVersion>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <RootNamespace>JWT</RootNamespace>
@@ -30,8 +30,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.25" />
-    <PackageReference Condition="$(DefineConstants.Contains(SYSTEM_TEXT_JSON))" Include="System.Text.Json" Version="6.0.4" />
-    <PackageReference Condition="$(DefineConstants.Contains(NEWTONSOFT_JSON))" Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Condition="$(DefineConstants.Contains(MODERN_DOTNET))" Include="System.Text.Json" Version="6.0.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/JWT.Extensions.DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,23 +1,18 @@
 using System;
 using JWT.Algorithms;
 using JWT.Internal;
+using JWT.Serializers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-#if SYSTEM_TEXT_JSON
-using JsonSerializer = JWT.Serializers.SystemTextSerializer;
-#elif NEWTONSOFT_JSON
-using JsonSerializer = JWT.Serializers.JsonNetSerializer;
-#endif
-
 namespace JWT
 {
     public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddJwtEncoder(this IServiceCollection services)
         {
             services.TryAddSingleton<IJwtEncoder, JwtEncoder>();
-            services.TryAddSingleton<IJsonSerializer, JsonSerializer>();
+            services.TryAddSingleton(JsonSerializerFactory.CreateSerializer());
             services.TryAddSingleton<IBase64UrlEncoder, JwtBase64UrlEncoder>();
 
             return services;
@@ -44,7 +39,7 @@ private static IServiceCollection AddJwtEncoder<TFactory>(this IServiceCollectio
         public static IServiceCollection AddJwtDecoder(this IServiceCollection services)
         {
             services.TryAddSingleton<IJwtDecoder, JwtDecoder>();
-            services.TryAddSingleton<IJsonSerializer, JsonSerializer>();
+            services.TryAddSingleton(JsonSerializerFactory.CreateSerializer());
             services.TryAddSingleton<IJwtValidator, JwtValidator>();
             services.TryAddSingleton<IBase64UrlEncoder, JwtBase64UrlEncoder>();
             services.TryAddSingleton<IDateTimeProvider, UtcDatetimeProvider>();

src/JWT/Builder/JwtBuilder.cs

@@ -78,6 +78,9 @@ public JwtBuilder AddClaim(string name, object value)
         public JwtBuilder WithSerializer(IJsonSerializer serializer)
         {
             _serializer = serializer;
+#if MODERN_DOTNET
+            SetSerializer(serializer);
+#endif
             return this;
         }
 

src/JWT/Builder/JwtHeader.cs

@@ -1,6 +1,6 @@
-#if SYSTEM_TEXT_JSON
+#if MODERN_DOTNET
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
-#elif NEWTONSOFT_JSON
+#else
 using Newtonsoft.Json;
 #endif
 

src/JWT/JWT.csproj

@@ -20,7 +20,7 @@
     <Authors>Alexander Batishchev, John Sheehan, Michael Lehenbauer</Authors>
     <PackageTags>jwt;json;authorization</PackageTags>
     <PackageLicenseExpression>CC0-1.0</PackageLicenseExpression>
-    <Version>10.0.0-beta6</Version>
+    <Version>10.0.0-beta7</Version>
     <FileVersion>10.0.0.0</FileVersion>
     <AssemblyVersion>10.0.0.0</AssemblyVersion>
     <RootNamespace>JWT</RootNamespace>
@@ -38,8 +38,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Condition="$(DefineConstants.Contains(SYSTEM_TEXT_JSON))" Include="System.Text.Json" Version="6.0.4" />
-    <PackageReference Condition="$(DefineConstants.Contains(NEWTONSOFT_JSON))" Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Condition="$(DefineConstants.Contains(MODERN_DOTNET))" Include="System.Text.Json" Version="6.0.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netstandard2.0'">

src/JWT/Serializers/Converters/DictionaryStringObjectJsonConverter.cs

@@ -1,4 +1,4 @@
-#if SYSTEM_TEXT_JSON
+#if MODERN_DOTNET
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/JWT/Serializers/JsonNetSerializer.cs

@@ -1,5 +1,4 @@
-#if NEWTONSOFT_JSON
-using System;
+using System;
 using System.IO;
 using System.Text;
 using Newtonsoft.Json;
@@ -61,4 +60,3 @@ public object Deserialize(Type type, string json)
         }
     }
 }
-#endif

src/JWT/Serializers/JsonSerializerFactory.cs

@@ -1,15 +1,22 @@
 namespace JWT.Serializers
 {
-    internal static class JsonSerializerFactory
+    public static class JsonSerializerFactory
     {
+        private static IJsonSerializer _jsonSerializer;
+
+#if MODERN_DOTNET
+        public static void SetSerializer(IJsonSerializer jsonSerializer)
+        {
+            _jsonSerializer = jsonSerializer;
+        }
+#endif
+
         public static IJsonSerializer CreateSerializer()
         {
-#if SYSTEM_TEXT_JSON
-            return new SystemTextSerializer();
-#elif NEWTONSOFT_JSON
-            return new JsonNetSerializer();
+#if MODERN_DOTNET
+            return _jsonSerializer ??= new SystemTextSerializer();
 #else
-            throw new System.NotSupportedException();
+            return _jsonSerializer ??= new JsonNetSerializer();
 #endif
         }
     }

src/JWT/Serializers/SystemTextSerializer.cs

@@ -1,4 +1,4 @@
-#if SYSTEM_TEXT_JSON
+#if MODERN_DOTNET
 using System;
 using System.Text.Json;
 using JWT.Serializers.Converters;

tests/JWT.Tests.Common/Builder/JwtBuilderEncodeTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -7,6 +7,7 @@
 using FluentAssertions;
 using JWT.Algorithms;
 using JWT.Builder;
+using JWT.Serializers;
 using JWT.Tests.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -268,8 +269,26 @@ public void Encode_Should_Return_ThrowTargetException_Encode_TypesMatch()
                           .AddClaim("ExtraClaim", new { NestedProperty1 = "Foo", NestedProperty2 = 3 })
                           .Encode(typeof(string), TestData.Customer);
 
-            action.Should()
-                  .Throw<TargetException>("Object does not match target type.");
+            if (IsRunningOnMono())
+            {
+                action.Should()
+                    .Throw<TargetInvocationException>("Exception has been thrown by the target of an invocation.");
+            }
+            else
+            {
+                action.Should()
+                    .Throw<TargetException>("Object does not match target type.");
+            }
+        }
+
+        /// <summary>
+        /// Copied from: https://stackoverflow.com/a/7077620/2890855
+        /// </summary>
+        /// <returns></returns>
+        private static bool IsRunningOnMono()
+        {
+            Type type = Type.GetType("Mono.Runtime");
+            return type != null;
         }
 
         [TestMethod]
@@ -294,7 +313,7 @@ public void Encode_Should_Return_Token_With_Custom_Extra_Headers_Full_Payload2()
                                       });
 
             token.Should()
-                .Be(TestData.TokenWithCustomTypeHeader3AndClaimNested, "because the same data encoded with the same key must result in the same token");
+                 .Be(TestData.TokenWithCustomTypeHeader3AndClaimNested, "because the same data encoded with the same key must result in the same token");
         }
 
         [TestMethod]
@@ -326,6 +345,24 @@ public void Encode_With_Custom_Factory_Return_Token()
                  .NotBeNullOrEmpty("because the token should contains some data");
         }
 
+        [TestMethod]
+        public void Encode_With_Secret_Should_Return_Valid_Token_Using_Json_Net()
+        {
+            var secret = _fixture.Create<string>();
+
+            var token = JwtBuilder.Create()
+                                  .WithAlgorithm(TestData.HMACSHA256Algorithm)
+                                  .WithSecret(secret)
+                                  .WithSerializer(new JsonNetSerializer())
+                                  .Encode();
+
+            token.Should()
+                 .NotBeNullOrEmpty("because the token should contains some data");
+            token.Split('.')
+                 .Should()
+                 .HaveCount(3, "because the token should consist of three parts");
+        }
+
         private sealed class CustomFactory : IAlgorithmFactory
         {
             public IJwtAlgorithm Create(JwtDecoderContext context) =>

tests/JWT.Tests.Common/JwtEncoderTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using FluentAssertions;
 using JWT.Algorithms;
+using JWT.Serializers;
 using JWT.Tests.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -91,5 +92,23 @@ public void Encode_With_NoAlgorithm_Should_Encode_To_Token()
             actual.Should()
                   .Be(expected, "because the same data encoded with the same key must result in the same token");
         }
+
+        [TestMethod]
+        public void Encode_Should_Encode_To_Token_Using_Json_Net()
+        {
+            const string key = TestData.Secret;
+            var toEncode = TestData.Customer;
+            const string expected = TestData.Token;
+
+            var algorithm = new HMACSHA256Algorithm();
+            var urlEncoder = new JwtBase64UrlEncoder();
+            var serializer = new JsonNetSerializer();
+            var encoder = new JwtEncoder(algorithm, serializer, urlEncoder);
+
+            var actual = encoder.Encode(toEncode, key);
+
+            actual.Should()
+                  .Be(expected, "because the same data encoded with the same key must result in the same token");
+        }
     }
-}
+}

tests/JWT.Tests.Common/SerializerTests.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Versioning;
+using JWT.Serializers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace JWT.Tests
+{
+    [TestClass]
+    public class SerializerTests
+    {
+        [TestMethod]
+        public void Serializer_Should_Use_Correct_Default()
+        {
+            var serializer = JsonSerializerFactory.CreateSerializer();
+
+            var dotnetVersion = GetRunningDotnetVersion();
+            Console.WriteLine($"Dotnet version: {dotnetVersion}");
+
+            var defaultSerializerClass = serializer.GetType().Name;
+            Console.WriteLine($"Default serializer class: {defaultSerializerClass}");
+
+            switch (dotnetVersion)
+            {
+                case ".NETFramework,Version=v4.6.2":
+                case ".NETCoreApp,Version=v3.0":
+                case ".NETCoreApp,Version=v6.0":
+                    Assert.AreEqual("SystemTextSerializer", defaultSerializerClass);
+                    break;
+
+                case ".NETFramework,Version=v4.6.1":
+                    Assert.AreEqual("JsonNetSerializer", defaultSerializerClass);
+                    break;
+                default:
+                    Assert.Fail($"Unrecognized dotnet version {dotnetVersion}");
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Copied from: https://stackoverflow.com/a/49754978
+        /// </summary>
+        /// <returns>The running dotnet version.</returns>
+        private string GetRunningDotnetVersion()
+        {
+            var version = Assembly.GetExecutingAssembly()
+                .GetCustomAttributes(typeof(TargetFrameworkAttribute), false)
+                .Cast<TargetFrameworkAttribute>()
+                .Single()
+                .FrameworkName;
+            return version;
+        }
+    }
+}

tests/JWT.Tests.Net40/JWT.Tests.Net40.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>