Merge branch 'release/7.1.0'

Author: Chris Young

.DS_Store

@@ -4,15 +4,14 @@
 using FluentValidation.AspNetCore;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 
 namespace ArchitectNow.Web.Configuration
 {
 	public static class WebApiExtensions
 	{
-		public static void ConfigureApi(this IServiceCollection services, FluentValidationOptions fluentValidationOptions, Action<MvcOptions> configureMvc = null, Action<MvcJsonOptions> configureJson = null)
+		public static void ConfigureApi(this IServiceCollection services, FluentValidationOptions fluentValidationOptions, Action<MvcOptions> configureMvc = null, Action<MvcJsonOptions> configureJson = null, Action<IMvcBuilder> configureMvcBuilder = null)
 		{
 			/*************************
              * IConfiguration is not available yet
@@ -33,16 +32,14 @@ public static void ConfigureApi(this IServiceCollection services, FluentValidati
 					var camelCasePropertyNamesContractResolver = new CamelCasePropertyNamesContractResolver();
 
 					settings.ContractResolver = camelCasePropertyNamesContractResolver;
-					settings.Converters = new JsonConverter[]
-					{
-						new IsoDateTimeConverter(),
-						new StringEnumConverter(true)
-					};
+					settings.Converters.Add(new IsoDateTimeConverter());
+					settings.Converters.Add(new StringEnumConverter(true));
 
 					configureJson?.Invoke(options);
 				});
 
-
+			configureMvcBuilder?.Invoke(mvcBuilder);
+			
 			if (fluentValidationOptions.Enabled)
 			{
 				mvcBuilder.AddFluentValidation(configuration => fluentValidationOptions.Configure?.Invoke(configuration));

src/.DS_Store

@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -40,7 +41,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
 
             services.ConfigureJwt(_configuration, ConfigureSecurityKey);
 
-            services.ConfigureApi(new FluentValidationOptions {Enabled = true});
+            services.ConfigureApi(new FluentValidationOptions {Enabled = true}, configureMvcBuilder: builder =>
+            {
+                builder.SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            });
 
             services.ConfigureAutomapper(expression => { });