Merge pull request #76 from Research-Institute/develop

v1.2.2 Extensibility Updates

Author: jaredcnance

src/JsonApiDotNetCore/Extensions/IApplicationBuilderExtensions.cs

@@ -5,11 +5,12 @@ namespace JsonApiDotNetCore.Routing
 {
     public static class IApplicationBuilderExtensions
     {
-        public static IApplicationBuilder UseJsonApi(this IApplicationBuilder app)
+        public static IApplicationBuilder UseJsonApi(this IApplicationBuilder app, bool useMvc = true)
         {
             app.UseMiddleware<RequestMiddleware>();
 
-            app.UseMvc();
+            if (useMvc)
+                app.UseMvc();
 
             return app;
         }

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -18,22 +18,38 @@ public static class IServiceCollectionExtensions
         public static void AddJsonApi<TContext>(this IServiceCollection services) 
             where TContext : DbContext
         {
-            _addInternals<TContext>(services, new JsonApiOptions());
+            var mvcBuilder = services.AddMvc();
+            AddInternals<TContext>(services, new JsonApiOptions(), mvcBuilder);
         }
 
         public static void AddJsonApi<TContext>(this IServiceCollection services, Action<JsonApiOptions> options) 
             where TContext : DbContext
         {
             var config = new JsonApiOptions();
+            
             options(config);
-            _addInternals<TContext>(services, config);
+
+            var mvcBuilder = services.AddMvc();
+            AddInternals<TContext>(services, config, mvcBuilder);
         }
 
-        private static void _addInternals<TContext>(IServiceCollection services, JsonApiOptions jsonApiOptions)
-            where TContext : DbContext
+         public static void AddJsonApi<TContext>(this IServiceCollection services, 
+            Action<JsonApiOptions> options,
+            IMvcBuilder mvcBuilder) where TContext : DbContext
+        {
+            var config = new JsonApiOptions();
+            
+            options(config);
+
+            AddInternals<TContext>(services, config, mvcBuilder);
+        }
+
+        private static void AddInternals<TContext>(IServiceCollection services, 
+            JsonApiOptions jsonApiOptions,
+            IMvcBuilder mvcBuilder) where TContext : DbContext
         {
             services.AddJsonApiInternals<TContext>(jsonApiOptions);
-            services.AddMvc()
+            mvcBuilder
                 .AddMvcOptions(opt => {
                     opt.Filters.Add(typeof(JsonApiExceptionFilter));
                     opt.SerializeAsJsonApi(jsonApiOptions);

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>1.2.1</VersionPrefix>
+    <VersionPrefix>1.2.2</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>