diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 7a7ecc9046..bd0bf1069f 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -99,7 +100,7 @@ namespace Volo.BloggingTestApp context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "Blogging API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Blogging API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -147,11 +148,11 @@ namespace Volo.BloggingTestApp app.UseRouting(); - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuthentication(); diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj index a0712e66f1..4fc039fcc2 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index f7b0567f4c..f275081723 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -16,7 +16,7 @@ - + diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 0766d977c9..73ec94d76e 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -96,7 +97,7 @@ namespace VoloDocs.Web context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Docs API", Version = "v1" diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj index 60caedd837..33e9eabfb3 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj @@ -13,7 +13,7 @@ - + diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs index 1ab494026d..eff9b9b9fb 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Hosting; using Acme.BookStore.MongoDB; using Acme.BookStore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -50,9 +51,7 @@ namespace Acme.BookStore ConfigureLocalization(); ConfigureVirtualFileSystem(context); ConfigureCors(context, configuration); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context); + ConfigureSwaggerServices(context); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -107,7 +106,7 @@ namespace Acme.BookStore context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info {Title = "BookStore API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "BookStore API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); }); } @@ -166,13 +165,11 @@ namespace Acme.BookStore app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs index 98d3d54cbd..44534ce35e 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs @@ -7,9 +7,7 @@ namespace Acme.BookStore.Controllers { public ActionResult Index() { - //TODO: Enabled once Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - return Content("OK: Acme.BookStore.HttpApi.Host is running..."); + return Redirect("/swagger"); } } } diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 6ecfde3589..bb1ce35232 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -35,7 +35,7 @@ - + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs index 2b78cb9cab..b09d8d3bfe 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -11,6 +11,7 @@ using Acme.BookStore.EntityFrameworkCore; using Acme.BookStore.Localization; using Acme.BookStore.MultiTenancy; using Acme.BookStore.Web.Menus; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -78,9 +79,7 @@ namespace Acme.BookStore.Web ConfigureLocalizationServices(); ConfigureNavigationServices(); ConfigureAutoApiControllers(); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context.Services); + ConfigureSwaggerServices(context.Services); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -170,7 +169,7 @@ namespace Acme.BookStore.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookStore API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookStore API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -207,13 +206,11 @@ namespace Acme.BookStore.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj index 77d59c25ce..7353f8c4cc 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 9a29e4e98f..afe0ca7b3c 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Hosting; using Acme.BookStore.BookManagement.EntityFrameworkCore; using Acme.BookStore.BookManagement.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; @@ -66,7 +67,7 @@ namespace Acme.BookStore.BookManagement context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -131,13 +132,12 @@ namespace Acme.BookStore.BookManagement { app.UseMultiTenancy(); } - app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseAbpRequestLocalization(); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs index d19236cf69..d643ad277f 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace Acme.BookStore.BookManagement.Controllers { public ActionResult Index() { - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - - return Content("OK: Acme.BookStore.BookManagement.HttpApi.Host is running..."); + return Redirect("/swagger"); } } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj index f4fe52af5d..39eed22e92 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj @@ -10,7 +10,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs index dc71ba4059..8a1d18d634 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Acme.BookStore.BookManagement.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -74,7 +75,7 @@ namespace Acme.BookStore.BookManagement context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -147,12 +148,11 @@ namespace Acme.BookStore.BookManagement } app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj index 3966fbf009..b135162793 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs index 7da9bf2cc8..39f25c5248 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs @@ -2,6 +2,7 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using System.IO; using Microsoft.AspNetCore.Authentication; @@ -167,7 +168,7 @@ namespace Acme.BookStore.BookManagement services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -221,12 +222,11 @@ namespace Acme.BookStore.BookManagement app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookManagement API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookManagement API"); + }); app.UseAuditing(); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj index 133f92e897..36e3fe44b3 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs index 31a3162acc..9ad0a094df 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Hosting; using Acme.BookStore.BookManagement.EntityFrameworkCore; using Acme.BookStore.BookManagement.MultiTenancy; using Acme.BookStore.BookManagement.Web; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -81,7 +82,7 @@ namespace Acme.BookStore.BookManagement context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -125,12 +126,11 @@ namespace Acme.BookStore.BookManagement app.UseMultiTenancy(); } - //TODO: Enabled when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAbpRequestLocalization(); app.UseAuditing(); diff --git a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 5dab7d1cfe..e0b270f72a 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -25,7 +25,7 @@ - + diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index 767b3ca138..91d7cb0d16 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -158,7 +159,7 @@ namespace Acme.BookStore.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookStore API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookStore API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -197,11 +198,11 @@ namespace Acme.BookStore.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj index 56a3fa2209..716a9fd147 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj @@ -33,7 +33,7 @@ - + diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index c599ee0ac4..3bee23d8e0 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -9,6 +9,7 @@ using DashboardDemo.EntityFrameworkCore; using DashboardDemo.Localization; using DashboardDemo.MultiTenancy; using DashboardDemo.Web.Menus; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -165,7 +166,7 @@ namespace DashboardDemo.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "DashboardDemo API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "DashboardDemo API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -198,12 +199,11 @@ namespace DashboardDemo.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //Swagger does not support ASP.NET Core 3.0 yet - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "DashboardDemo API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "DashboardDemo API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj index 96ff8bb1dc..71841d6b75 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs index 150852d69c..13c4577cc0 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OAuth; @@ -77,7 +78,7 @@ namespace BackendAdminApp.Host context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "Backend Admin Application API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Backend Admin Application API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); }); @@ -100,11 +101,11 @@ namespace BackendAdminApp.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Backend Admin Application API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Backend Admin Application API"); + }); app.UseMvcWithDefaultRouteAndArea(); } } diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj index cc8cd37351..7b6557bdfa 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs index 8c9a26406e..45fe70e03f 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs @@ -5,6 +5,7 @@ using Ocelot.DependencyInjection; using Ocelot.Middleware; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Autofac; @@ -63,7 +64,7 @@ namespace BackendAdminAppGateway.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info { Title = "BackendAdminApp Gateway API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BackendAdminApp Gateway API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -93,12 +94,11 @@ namespace BackendAdminAppGateway.Host app.UseVirtualFiles(); app.UseRouting(); app.UseAuthentication(); - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "BackendAdminApp Gateway API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "BackendAdminApp Gateway API"); + }); app.MapWhen( ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") || diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj index ae9b1d5dd1..0871015c5e 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs index 687d2e26a9..1232852126 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs @@ -5,6 +5,7 @@ using Ocelot.DependencyInjection; using Ocelot.Middleware; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Autofac; @@ -52,7 +53,7 @@ namespace InternalGateway.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info { Title = "Internal Gateway API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Internal Gateway API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -82,12 +83,11 @@ namespace InternalGateway.Host app.UseVirtualFiles(); app.UseRouting(); app.UseAuthentication(); - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Internal Gateway API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Internal Gateway API"); + }); app.MapWhen( ctx => diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj index f9bc566169..66d934c076 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs index b17e6bdbe1..2513c16c00 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs @@ -5,6 +5,7 @@ using Ocelot.DependencyInjection; using Ocelot.Middleware; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Autofac; @@ -50,7 +51,7 @@ namespace PublicWebSiteGateway.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info { Title = "PublicWebSite Gateway API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "PublicWebSite Gateway API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -80,12 +81,11 @@ namespace PublicWebSiteGateway.Host app.UseVirtualFiles(); app.UseRouting(); app.UseAuthentication(); - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "PublicWebSite Gateway API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "PublicWebSite Gateway API"); + }); app.MapWhen( ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") || diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj index 51f991da3f..657e3cc1e3 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs index c495ed5a26..1f80e0c605 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Auditing; @@ -68,7 +69,7 @@ namespace BloggingService.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info {Title = "Blogging Service API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "Blogging Service API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -113,12 +114,11 @@ namespace BloggingService.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Blogging Service API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Blogging Service API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs index 5aa69a1e9b..014cf76fc3 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace BloggingService.Host.Controllers { public ActionResult Index() { - //TODO: Enable swagger UI once it supports asp.net core 3.x - //return Redirect("/swagger"); - - return Content("OK: BloggingService.Host is working..."); + return Redirect("/swagger"); } } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs index a2b841ab54..690dfb972e 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace IdentityService.Host.Controllers { public ActionResult Index() { - //TODO: Enable swagger UI once it supports asp.net core 3.x - //return Redirect("/swagger"); - - return Content("OK: IdentityService.Host is working..."); + return Redirect("/swagger"); } } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj index 684f1bd4f1..9c14f74469 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs index 3e5210dfb8..96899af0a0 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Auditing; @@ -55,7 +56,7 @@ namespace IdentityService.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info {Title = "Identity Service API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "Identity Service API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -95,12 +96,11 @@ namespace IdentityService.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Identity Service API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Identity Service API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs index 7830e5d6bf..8d28ce4295 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace ProductService.Host.Controllers { public ActionResult Index() { - //TODO: Enable swagger UI once it supports asp.net core 3.x - //return Redirect("/swagger"); - - return Content("OK: ProductService.Host is working..."); + return Redirect("/swagger"); } } } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj index 80d2a33bd6..2c101fcfa6 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs index e88228feb2..8389067092 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using ProductManagement; using ProductManagement.EntityFrameworkCore; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Auditing; @@ -57,7 +58,7 @@ namespace ProductService.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info {Title = "Product Service API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "Product Service API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -97,12 +98,11 @@ namespace ProductService.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Product Service API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Product Service API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs index 0db5c96aee..66ab9f58d0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs @@ -7,9 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers { public ActionResult Index() { - //TODO: Enabled once Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - return Content("OK: MyCompanyName.MyProjectName.HttpApi.Host is running..."); + return Redirect("/swagger"); } } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index a0d90bf695..bf7f6c19cd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 1c6ab51509..e22551a315 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; @@ -48,9 +49,7 @@ namespace MyCompanyName.MyProjectName ConfigureVirtualFileSystem(context); ConfigureRedis(context, configuration, hostingEnvironment); ConfigureCors(context, configuration); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context); + ConfigureSwaggerServices(context); } private void ConfigureCache(IConfigurationRoot configuration) @@ -101,7 +100,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info {Title = "MyProjectName API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "MyProjectName API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); }); } @@ -175,13 +174,11 @@ namespace MyCompanyName.MyProjectName } app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs index 71c6127f9e..66ab9f58d0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs @@ -7,9 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers { public ActionResult Index() { - //TODO: Enabled once Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - return Content("OK: MyCompanyName.MyProjectName.HttpApi.HostWithIds is running..."); + return Redirect("/swagger"); } } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 3a566c6563..82b1b69666 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -12,7 +12,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index db8f6cf0a4..114d3daa2c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -50,9 +51,7 @@ namespace MyCompanyName.MyProjectName ConfigureLocalization(); ConfigureVirtualFileSystem(context); ConfigureCors(context, configuration); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context); + ConfigureSwaggerServices(context); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -107,7 +106,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info {Title = "MyProjectName API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "MyProjectName API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); }); } @@ -166,13 +165,11 @@ namespace MyCompanyName.MyProjectName app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index d8f91dfd0d..15ea71970a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -18,7 +18,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 4f5bf7dd44..7c3494a040 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -12,6 +12,7 @@ using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web.Menus; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OAuth; @@ -76,11 +77,8 @@ namespace MyCompanyName.MyProjectName.Web ConfigureAutoMapper(); ConfigureVirtualFileSystem(hostingEnvironment); ConfigureNavigationServices(configuration); - ConfigureSwaggerServices(context.Services); ConfigureMultiTenancy(); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context.Services); + ConfigureSwaggerServices(context.Services); } private void ConfigureCache(IConfigurationRoot configuration) @@ -182,7 +180,7 @@ namespace MyCompanyName.MyProjectName.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -236,13 +234,11 @@ namespace MyCompanyName.MyProjectName.Web app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 8c65e90c25..7182a9730e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -34,7 +34,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 25a59a3d07..5f26a74bf0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -11,6 +11,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web.Menus; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -78,9 +79,7 @@ namespace MyCompanyName.MyProjectName.Web ConfigureLocalizationServices(); ConfigureNavigationServices(); ConfigureAutoApiControllers(); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context.Services); + ConfigureSwaggerServices(context.Services); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -178,7 +177,7 @@ namespace MyCompanyName.MyProjectName.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -215,13 +214,11 @@ namespace MyCompanyName.MyProjectName.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs index 5752202a06..66ab9f58d0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers { public ActionResult Index() { - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - - return Content("OK: MyCompanyName.MyProjectName.HttpApi.Host is running..."); + return Redirect("/swagger"); } } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 6a2ee611da..b06102add4 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 2d0190b60d..49735a9d40 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; @@ -65,7 +66,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -125,12 +126,11 @@ namespace MyCompanyName.MyProjectName app.UseMultiTenancy(); } app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj index f0431dce74..e26ff78926 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 397afc38c3..ff1247c68b 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -74,7 +75,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -147,12 +148,11 @@ namespace MyCompanyName.MyProjectName } app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 4a6578146d..71c7708ad6 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index 5c1318e32b..03b19172ee 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -2,6 +2,7 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using System.IO; using Microsoft.AspNetCore.Authentication; @@ -176,7 +177,7 @@ namespace MyCompanyName.MyProjectName services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -230,12 +231,11 @@ namespace MyCompanyName.MyProjectName app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); + }); app.UseAuditing(); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj index 3c597f160c..3820eddadf 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index ccfc845eaf..912c532e40 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -80,7 +81,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -124,12 +125,11 @@ namespace MyCompanyName.MyProjectName app.UseMultiTenancy(); } - //TODO: Enabled when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAbpRequestLocalization(); app.UseAuditing();