Trying to set up Swagger in the Web app

OrchardCMS · Jul 11, 2024 · c3714d5 · c3714d5
1 parent 6431354
commit c3714d5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj b/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj
@@ -10,6 +10,7 @@
     <RazorRuntimeCompilation>false</RazorRuntimeCompilation>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <OpenApiGenerateDocumentsOnBuild>false</OpenApiGenerateDocumentsOnBuild>
   </PropertyGroup>
   <!-- For Unit Tests-->
   <ItemGroup>
@@ -28,6 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OrchardCore.Cms.Web/Program.cs b/src/OrchardCore.Cms.Web/Program.cs
@@ -1,17 +1,25 @@
+using Microsoft.OpenApi.Models;
 using OrchardCore.Logging;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Host.UseNLogHost();
 
 builder.Services
-    .AddOrchardCms()
-    .AddSetupFeatures("OrchardCore.AutoSetup");
+    .AddOrchardCms(orchardCoreBuilder =>
+    {
+        orchardCoreBuilder.ApplicationServices.AddSwaggerGen(c =>
+        {
+            c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
+        });
+    });
 
 var app = builder.Build();
 
 if (!app.Environment.IsDevelopment())
 {
+    app.UseSwagger();
+
     app.UseExceptionHandler("/Error");
 }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj b/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj
@@ -8,7 +8,6 @@
 
     Provides features to manage tenants from the Admin UI</Description>
     <PackageTags>$(PackageTags) OrchardCoreCMS</PackageTags>
-    <OpenApiGenerateDocumentsOnBuild>false</OpenApiGenerateDocumentsOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,7 +32,6 @@
 
   <ItemGroup>
     <PackageReference Include="NJsonSchema" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
-using Microsoft.OpenApi.Models;
 using OrchardCore.Deployment;
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Environment.Shell;
@@ -75,11 +74,6 @@ public override void ConfigureServices(IServiceCollection services)
             {
                 return serviceProvider.GetRequiredService<ITenantFileProvider>();
             });
-
-            services.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
-            });
         }
 
         public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
@@ -98,8 +92,6 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
                     ctx.Context.Response.Headers[HeaderNames.CacheControl] = $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-max-age={TimeSpan.FromDays(365.25).TotalSeconds}";
                 }
             });
-
-            app.UseSwagger();
         }
 
         private static string GetContentRoot(ShellOptions shellOptions, ShellSettings shellSettings) =>