Merge branch 'master' into develop

# Conflicts:
#	src/Simplify.Web.Json/Simplify.Web.Json.csproj

Author: i4004

src/Simplify.Web.Json/Model/Binding/JsonModelBinder.cs

@@ -10,6 +10,17 @@ namespace Simplify.Web.Json.Model.Binding
 	/// </summary>
 	public class JsonModelBinder : IModelBinder
 	{
+		private readonly JsonSerializerSettings? _settings;
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="JsonModelBinder"/> class.
+		/// </summary>
+		/// <param name="settings">The settings.</param>
+		public JsonModelBinder(JsonSerializerSettings? settings = null)
+		{
+			_settings = settings;
+		}
+
 		/// <summary>
 		/// Binds the model asynchronously.
 		/// </summary>
@@ -27,7 +38,7 @@ public async Task BindAsync<T>(ModelBinderEventArgs<T> args)
 			if (string.IsNullOrEmpty(args.Context.RequestBody))
 				throw new ModelValidationException("JSON request body is null or empty");
 
-			args.SetModel(JsonConvert.DeserializeObject<T>(args.Context.RequestBody));
+			args.SetModel(JsonConvert.DeserializeObject<T>(args.Context.RequestBody, _settings));
 		}
 	}
 }

src/Simplify.Web.Json/Simplify.Web.Json.csproj

@@ -14,8 +14,8 @@
 		<RepositoryType>GIT</RepositoryType>
 		<PackageTags>Simplify.Web JSON</PackageTags>
 		<PackageReleaseNotes>
-			Updates
-			* Upgrade to Simplify.Web 4.1.1
+Updates
+* Upgrade to Simplify.Web 4.1.1
 		</PackageReleaseNotes>
 		<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
 		<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.Json.xml</DocumentationFile>

src/Simplify.Web.Json/SimplifyDIRegistratorExtensions.cs

@@ -1,4 +1,5 @@
-using Simplify.DI;
+using Newtonsoft.Json;
+using Simplify.DI;
 using Simplify.Web.Json.Model.Binding;
 
 namespace Simplify.Web.Json
@@ -12,9 +13,23 @@ public static class SimplifyDIRegistratorExtensions
 		/// Registers Simplify.Web.Json JsonModelBinder.
 		/// </summary>
 		/// <param name="registrator">The registrator.</param>
-		public static IDIRegistrator RegisterJsonModelBinder(this IDIRegistrator registrator)
+		/// <param name="settings">The settings.</param>
+		/// <returns></returns>
+		public static IDIRegistrator RegisterJsonModelBinder(this IDIRegistrator registrator, JsonSerializerSettings? settings = null)
 		{
-			registrator.Register<JsonModelBinder>(LifetimeType.Singleton);
+			registrator.Register(r => new JsonModelBinder(settings), LifetimeType.Singleton);
+
+			return registrator;
+		}
+
+		/// <summary>
+		/// Registers Simplify.Web.Json JsonModelBinder which will search for `JsonSerializerSettings` registered in container (JsonSerializerSettings should be manually registered in container).
+		/// </summary>
+		/// <param name="registrator">The registrator.</param>
+		/// <returns></returns>
+		public static IDIRegistrator RegisterJsonModelBinderWithSettingsFromContainer(this IDIRegistrator registrator)
+		{
+			registrator.Register(r => new JsonModelBinder(r.Resolve<JsonSerializerSettings>()), LifetimeType.Singleton);
 
 			return registrator;
 		}