Merge pull request #72 from AITGmbH/develop

jaredcnance · web-flow · commit 1ecd765e6950 · 2017-03-23T18:18:01.000-05:00
Fix #71 Hard dependency to MVC setup
diff --git a/src/JsonApiDotNetCore/Extensions/IApplicationBuilderExtensions.cs b/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;
         }
diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/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>

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,12 @@ namespace JsonApiDotNetCore.Routing`
`5`	`5`	`{`
`6`	`6`	`public static class IApplicationBuilderExtensions`
`7`	`7`	`{`
`8`		`- public static IApplicationBuilder UseJsonApi(this IApplicationBuilder app)`
	`8`	`+ public static IApplicationBuilder UseJsonApi(this IApplicationBuilder app, bool useMvc = true)`
`9`	`9`	`{`
`10`	`10`	`app.UseMiddleware<RequestMiddleware>();`
`11`	`11`
`12`		`- app.UseMvc();`
	`12`	`+ if (useMvc)`
	`13`	`+ app.UseMvc();`
`13`	`14`
`14`	`15`	`return app;`
`15`	`16`	`}`