From 240ce19523dcbf3831224d9cd90e50e5df3f7a5e Mon Sep 17 00:00:00 2001 From: leonluc-dev <leonlucardie@gmail.com> Date: Thu, 7 Jan 2021 13:12:48 +0100 Subject: [PATCH 1/2] Update controller.mustache Moved using directive for Microsoft.AspNetCore.Authorization outside of useSwashbuckle tag to prevent compilation errors with Authorize tag if Swashbuckle is disabled. --- .../src/main/resources/aspnetcore/3.0/controller.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache index 089e415671a..f03b399d41a 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache @@ -5,10 +5,10 @@ using System.ComponentModel.DataAnnotations; {{#operationResultTask}} using System.Threading.Tasks; {{/operationResultTask}} +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; {{#useSwashbuckle}} using Swashbuckle.AspNetCore.Annotations; -using Microsoft.AspNetCore.Authorization; using Swashbuckle.AspNetCore.SwaggerGen; {{/useSwashbuckle}} {{^isLibrary}} -- GitLab From aa01cd5b7f2759a222874b58f87b59fa5b17ea7f Mon Sep 17 00:00:00 2001 From: leonluc-dev <leonlucardie@gmail.com> Date: Thu, 7 Jan 2021 14:15:28 +0100 Subject: [PATCH 2/2] Updated aspnetcore-3.x samples --- .../aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs | 2 +- .../aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs | 2 +- .../aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs | 2 +- .../aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs | 1 + .../aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs index 2102b82d8fe..8d08f4a114e 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -11,9 +11,9 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -using Microsoft.AspNetCore.Authorization; using Swashbuckle.AspNetCore.SwaggerGen; using Newtonsoft.Json; using Org.OpenAPITools.Attributes; diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs index fa909a61a14..1097776502e 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -11,9 +11,9 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -using Microsoft.AspNetCore.Authorization; using Swashbuckle.AspNetCore.SwaggerGen; using Newtonsoft.Json; using Org.OpenAPITools.Attributes; diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs index c37f0251d3b..e8c49e1700c 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -11,9 +11,9 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -using Microsoft.AspNetCore.Authorization; using Swashbuckle.AspNetCore.SwaggerGen; using Newtonsoft.Json; using Org.OpenAPITools.Attributes; diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs index 2102b82d8fe..8d08f4a114e 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -11,9 +11,9 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -using Microsoft.AspNetCore.Authorization; using Swashbuckle.AspNetCore.SwaggerGen; using Newtonsoft.Json; using Org.OpenAPITools.Attributes; diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs index fa909a61a14..8dcdb490253 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -11,6 +11,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using Microsoft.AspNetCore.Authorization; diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs index c37f0251d3b..e8c49e1700c 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -11,9 +11,9 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -using Microsoft.AspNetCore.Authorization; using Swashbuckle.AspNetCore.SwaggerGen; using Newtonsoft.Json; using Org.OpenAPITools.Attributes; -- GitLab