From 9e451d99a90091f3ed6feebe2f4ae59cafde6fe2 Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 6 Apr 2024 01:52:26 +0200 Subject: [PATCH] ci --- .drone.yml | 6 ++++-- src/HeartTrackAPI/HeartTrackAPI.csproj | 1 + src/HeartTrackAPI/Utils/AppBootstrap.cs | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4a7087f..a4ce432 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,12 +59,14 @@ steps: - dotnet restore HeartTrack.sln - cd HeartTrackAPI - dotnet new tool-manifest - - dotnet tool install -g --version 6.5.0 Swashbuckle.AspNetCore.Cli + #- dotnet tool install -g --version 6.5.0 Swashbuckle.AspNetCore.Cli + - dotnet tool install -g NSwag.ConsoleCore - cd ../ - dotnet build HeartTrack.sln -c Release --no-restore - dotnet publish HeartTrack.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release - export PATH="$PATH:/root/.dotnet/tools" - - swagger tofile --output /docs/swagger.json HeartTrackAPI/bin/Release/net8.0/HeartTrackAPI.dll v1 + - nswag aspnetcore2openapi HeartTrackAPI/bin/Release/net8.0/HeartTrackAPI.dll /output:/docs/swagger.json + #- swagger tofile --output /docs/swagger.json HeartTrackAPI/bin/Release/net8.0/HeartTrackAPI.dll v1 depends_on: [build,tests] - name: generate-and-deploy-docs diff --git a/src/HeartTrackAPI/HeartTrackAPI.csproj b/src/HeartTrackAPI/HeartTrackAPI.csproj index ab6b8d3..42066a1 100644 --- a/src/HeartTrackAPI/HeartTrackAPI.csproj +++ b/src/HeartTrackAPI/HeartTrackAPI.csproj @@ -17,6 +17,7 @@ + diff --git a/src/HeartTrackAPI/Utils/AppBootstrap.cs b/src/HeartTrackAPI/Utils/AppBootstrap.cs index e15d89f..21fc0e0 100644 --- a/src/HeartTrackAPI/Utils/AppBootstrap.cs +++ b/src/HeartTrackAPI/Utils/AppBootstrap.cs @@ -24,6 +24,7 @@ public class AppBootstrap(IConfiguration configuration) public void ConfigureServices(IServiceCollection services) { services.AddControllers(); + services.AddOpenApiDocument(); services.AddEndpointsApiExplorer(); AddSwagger(services); @@ -264,6 +265,7 @@ public class AppBootstrap(IConfiguration configuration) } }); }); + app.UseOpenApi(); app.UseSwaggerUI(); app.MapSwagger(); }