Generate NSwag client using .NET 8

sillsdev · Jan 23, 2024 · e5ab806 · e5ab806
1 parent d17b3e6
commit e5ab806
Show file tree

Hide file tree

Showing 4 changed files with 480 additions and 262 deletions.
diff --git a/src/Serval.ApiServer/Serval.ApiServer.csproj b/src/Serval.ApiServer/Serval.ApiServer.csproj
@@ -18,8 +18,8 @@
 		<PackageReference Include="Hangfire" Version="1.7.33" />
 		<PackageReference Include="Hangfire.Mongo" Version="1.9.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.14" />
-		<PackageReference Include="NSwag.AspNetCore" Version="13.20.0" />
-		<PackageReference Include="NSwag.MSBuild" Version="13.20.0">
+		<PackageReference Include="NSwag.AspNetCore" Version="14.0.2" />
+		<PackageReference Include="NSwag.MSBuild" Version="14.0.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -50,6 +50,6 @@
 	</PropertyGroup>
 
 	<Target Name="NSwag" AfterTargets="PostBuildEvent" Condition=" '$(Configuration)' == 'Debug' ">
-		<Exec WorkingDirectory="$(ProjectDir)" EnvironmentVariables="ASPNETCORE_ENVIRONMENT=Development;NSWAG=1" Command="$(NSwagExe_Net60) run nswag.json /variables:Configuration=$(Configuration)" />
+		<Exec WorkingDirectory="$(ProjectDir)" EnvironmentVariables="ASPNETCORE_ENVIRONMENT=Development;NSWAG=1" Command="$(NSwagExe_Net80) run nswag.json /variables:Configuration=$(Configuration)" />
 	</Target>
 </Project>
diff --git a/src/Serval.ApiServer/Startup.cs b/src/Serval.ApiServer/Startup.cs
@@ -136,14 +136,14 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddSwaggerDocument(o =>
             {
-                o.SchemaType = SchemaType.Swagger2;
+                o.SchemaSettings.SchemaType = SchemaType.Swagger2;
                 o.Title = "Serval API";
                 o.Description = "Natural language processing services for minority language Bible translation.";
                 o.DocumentName = "v" + version.Major;
                 o.ApiGroupNames = new[] { "v" + version.Major };
                 o.Version = version.Major + "." + version.Minor;
 
-                o.SchemaNameGenerator = new ServalSchemaNameGenerator();
+                o.SchemaSettings.SchemaNameGenerator = new ServalSchemaNameGenerator();
                 o.UseControllerSummaryAsTagDescription = true;
                 o.AddSecurity(
                     "bearer",
@@ -165,7 +165,7 @@ public void ConfigureServices(IServiceCollection services)
                 );
                 o.OperationProcessors.Add(new AspNetCoreOperationSecurityScopeProcessor("bearer"));
 
-                o.AllowReferencesWithProperties = true;
+                o.SchemaSettings.AllowReferencesWithProperties = true;
                 o.PostProcess = document =>
                 {
                     var prefix = "/api/v" + version.Major;
@@ -223,7 +223,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 document.Servers.First().Url += prefix;
             };
         });
-        app.UseSwaggerUi3(settings =>
+        app.UseSwaggerUi(settings =>
         {
             settings.OAuth2Client = new OAuth2ClientSettings
             {

diff --git a/src/Serval.ApiServer/nswag.json b/src/Serval.ApiServer/nswag.json
@@ -1,5 +1,5 @@
 {
-  "runtime": "Net60",
+  "runtime": "Net80",
   "defaultVariables": null,
   "documentGenerator": {
     "aspNetCoreToOpenApi": {