Merge pull request #116 from NSwag/master

Release v2.26
RicoSuter · May 18, 2016 · 2b18160 · 2b18160
2 parents 9389fc4 + 4622eb4
commit 2b18160
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/NSwag.CodeGeneration/SwaggerGenerators/WebApi/WebApiToSwaggerGenerator.cs b/src/NSwag.CodeGeneration/SwaggerGenerators/WebApi/WebApiToSwaggerGenerator.cs
@@ -94,6 +94,7 @@ private void GenerateForController(SwaggerService service, Type controllerType,
                 m.DeclaringType != typeof(object) &&
                 m.DeclaringType.FullName != "System.Web.Http.ApiController" &&
                 m.DeclaringType.FullName != "Microsoft.AspNet.Mvc.Controller" && // .NET Core (Web API & MVC)
+                m.DeclaringType.FullName != "Microsoft.AspNetCore.Mvc.Controller" && // .NET Core (Web API & MVC)
                 m.DeclaringType.FullName != "System.Web.Mvc.Controller"))
             {
                 var parameters = method.GetParameters().ToList();