From 88df506c76d0e0885cc9ef22659ff76bf54913d0 Mon Sep 17 00:00:00 2001 From: Denis Prokharchyk Date: Sun, 11 Dec 2022 20:35:24 +0300 Subject: [PATCH] feat(issue-499): update dotnet core 5.0 to 6.0 for cgen-api --- .../O2NextGen.Sdk.NetCore.Models.csproj | 4 +-- src/Services/c-gen/Dockerfile | 4 +-- src/Services/c-gen/O2NextGen.CGen.sln | 22 +++++------- .../Controllers/VersionController.cs | 4 +-- .../Dockerfile | 25 +++++++++++++ .../IoC/ServiceCollectionExtensions.cs | 2 +- ...O2NextGen.CertificateManagement.Api.csproj | 36 +++++++++---------- .../Properties/launchSettings.json | 16 +-------- .../Startup.cs | 14 ++++---- .../appsettings.json | 2 +- ...tGen.CertificateManagement.Business.csproj | 2 +- .../CertificateManagementDbContext.cs | 2 +- ...2NextGen.CertificateManagement.Data.csproj | 13 +++---- ...2NextGen.CertificateManagement.Impl.csproj | 2 +- ...O2NextGen.CertificateManagement.Api.csproj | 2 +- ...O2NextGen.CertificateManagement.Api.csproj | 10 +++--- ...2NextGen.CertificateManagement.Impl.csproj | 2 +- src/Services/c-gen/docker-compose.yml | 2 +- 18 files changed, 86 insertions(+), 78 deletions(-) create mode 100644 src/Services/c-gen/O2NextGen.CertificateManagement.Api/Dockerfile diff --git a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj index bb1cb3f2..b0c49147 100644 --- a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj +++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj @@ -1,11 +1,11 @@  - net5.0 + net6.0 - + diff --git a/src/Services/c-gen/Dockerfile b/src/Services/c-gen/Dockerfile index 09ea108b..5c6e50c2 100644 --- a/src/Services/c-gen/Dockerfile +++ b/src/Services/c-gen/Dockerfile @@ -1,10 +1,10 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:2.2 AS base +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:2.2 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src COPY ["O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj", "O2NextGen.CertificateManagement.Api/"] COPY ["../../SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj", "../../SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/"] diff --git a/src/Services/c-gen/O2NextGen.CGen.sln b/src/Services/c-gen/O2NextGen.CGen.sln index ecc6033c..9da04b6a 100644 --- a/src/Services/c-gen/O2NextGen.CGen.sln +++ b/src/Services/c-gen/O2NextGen.CGen.sln @@ -3,27 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32112.339 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.CertificateManagement.Api", "O2NextGen.CertificateManagement.Api\O2NextGen.CertificateManagement.Api.csproj", "{EA540B06-8A73-49C7-A799-49423B316458}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.CertificateManagement.Api", "O2NextGen.CertificateManagement.Api\O2NextGen.CertificateManagement.Api.csproj", "{EA540B06-8A73-49C7-A799-49423B316458}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.CertificateManagement.Business", "O2NextGen.CertificateManagement.Business\O2NextGen.CertificateManagement.Business.csproj", "{C6E0B2A5-6349-4C1D-8E14-82249AF8F58A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.CertificateManagement.Business", "O2NextGen.CertificateManagement.Business\O2NextGen.CertificateManagement.Business.csproj", "{C6E0B2A5-6349-4C1D-8E14-82249AF8F58A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.CertificateManagement.Impl", "O2NextGen.CertificateManagement.Impl\O2NextGen.CertificateManagement.Impl.csproj", "{01805439-2954-49CE-93D2-5EB06B82146C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.CertificateManagement.Impl", "O2NextGen.CertificateManagement.Impl\O2NextGen.CertificateManagement.Impl.csproj", "{01805439-2954-49CE-93D2-5EB06B82146C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{12E83C2A-23C7-4E71-B137-AC56CE28F9E4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.CertificateManagement.Data", "O2NextGen.CertificateManagement.Data\O2NextGen.CertificateManagement.Data.csproj", "{B8C8A05D-0D30-40FF-8BDD-B2FBA2ED7AB0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.CertificateManagement.Data", "O2NextGen.CertificateManagement.Data\O2NextGen.CertificateManagement.Data.csproj", "{B8C8A05D-0D30-40FF-8BDD-B2FBA2ED7AB0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.O2NextGen.CertificateManagement.Api", "Tests\IntegrationTests.O2NextGen.CertificateManagement.Api\IntegrationTests.O2NextGen.CertificateManagement.Api.csproj", "{454CB1E8-8060-49CB-9752-140F93E7829C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.O2NextGen.CertificateManagement.Api", "Tests\IntegrationTests.O2NextGen.CertificateManagement.Api\IntegrationTests.O2NextGen.CertificateManagement.Api.csproj", "{454CB1E8-8060-49CB-9752-140F93E7829C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.O2NextGen.CertificateManagement.Api", "Tests\Tests.O2NextGen.CertificateManagement.Api\Tests.O2NextGen.CertificateManagement.Api.csproj", "{CEA7184F-87D5-4141-A4BC-A983BF257AC6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.CertificateManagement.Api", "Tests\Tests.O2NextGen.CertificateManagement.Api\Tests.O2NextGen.CertificateManagement.Api.csproj", "{CEA7184F-87D5-4141-A4BC-A983BF257AC6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.O2NextGen.CertificateManagement.Impl", "Tests\Tests.O2NextGen.CertificateManagement.Impl\Tests.O2NextGen.CertificateManagement.Impl.csproj", "{6FB50F98-47E7-4960-80F0-58562914ADDE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.CertificateManagement.Impl", "Tests\Tests.O2NextGen.CertificateManagement.Impl\Tests.O2NextGen.CertificateManagement.Impl.csproj", "{6FB50F98-47E7-4960-80F0-58562914ADDE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDKs", "SDKs", "{629874CA-6688-43CA-9716-48FB42D41150}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.Sdk.NetCore.Models", "..\..\SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NextGen.Sdk.NetCore.Models.csproj", "{8C88AA87-9C8E-42D7-BAF1-28401C563FDF}" -EndProject -Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{24414F70-A58D-4802-A437-B15D9F98AC8E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.Sdk.NetCore.Models", "..\..\SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NextGen.Sdk.NetCore.Models.csproj", "{8C88AA87-9C8E-42D7-BAF1-28401C563FDF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -63,10 +61,6 @@ Global {8C88AA87-9C8E-42D7-BAF1-28401C563FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C88AA87-9C8E-42D7-BAF1-28401C563FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU {8C88AA87-9C8E-42D7-BAF1-28401C563FDF}.Release|Any CPU.Build.0 = Release|Any CPU - {24414F70-A58D-4802-A437-B15D9F98AC8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24414F70-A58D-4802-A437-B15D9F98AC8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24414F70-A58D-4802-A437-B15D9F98AC8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24414F70-A58D-4802-A437-B15D9F98AC8E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs index 8034c294..d639422f 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs @@ -12,7 +12,7 @@ public class VersionController:ControllerBase { #region Fields - private readonly IHostingEnvironment _environment; + private readonly IWebHostEnvironment _environment; private readonly ILogger _logger; #endregion @@ -20,7 +20,7 @@ public class VersionController:ControllerBase #region Ctors - public VersionController(IHostingEnvironment environment, ILogger logger) + public VersionController(IWebHostEnvironment environment, ILogger logger) { _environment = environment; _logger = logger; diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Dockerfile b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Dockerfile new file mode 100644 index 00000000..5c6e50c2 --- /dev/null +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Dockerfile @@ -0,0 +1,25 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +WORKDIR /app +EXPOSE 80 + +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +WORKDIR /src +COPY ["O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj", "O2NextGen.CertificateManagement.Api/"] +COPY ["../../SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj", "../../SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/"] +COPY ["O2NextGen.CertificateManagement.Business/O2NextGen.CertificateManagement.Business.csproj", "O2NextGen.CertificateManagement.Business/"] +COPY ["O2NextGen.CertificateManagement.Data/O2NextGen.CertificateManagement.Data.csproj", "O2NextGen.CertificateManagement.Data/"] +COPY ["O2NextGen.CertificateManagement.Impl/O2NextGen.CertificateManagement.Impl.csproj", "O2NextGen.CertificateManagement.Impl/"] +RUN dotnet restore "O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj" +COPY . . +WORKDIR "/src/O2NextGen.CertificateManagement.Api" +RUN dotnet build "O2NextGen.CertificateManagement.Api.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "O2NextGen.CertificateManagement.Api.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "O2NextGen.CertificateManagement.Api.dll"] diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/IoC/ServiceCollectionExtensions.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/IoC/ServiceCollectionExtensions.cs index 41739ca2..91fa50c2 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/IoC/ServiceCollectionExtensions.cs +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/IoC/ServiceCollectionExtensions.cs @@ -41,7 +41,7 @@ public static IServiceCollection AddRequiredMvcComponents(this IServiceCollectio }); mvcBuilder.AddApiExplorer(); //for swagger - mvcBuilder.SetCompatibilityVersion(CompatibilityVersion.Version_3_0); + //mvcBuilder.SetCompatibilityVersion(CompatibilityVersion.Version_3_0); mvcBuilder.AddNewtonsoftJson(o => { o.SerializerSettings.Converters.Add(new StringEnumConverter()); diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj index c20394c1..baf54af8 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj @@ -1,35 +1,25 @@  - net5.0 + net6.0 e238f36a-3514-4436-b624-9b4f799bb82d Linux ..\..\.. ../docker-compose.dcproj - - - - - - - - - - - - - - - - - + + + + + + + @@ -59,9 +49,19 @@ + + + + + + + + + + diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Properties/launchSettings.json b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Properties/launchSettings.json index 1402772a..bcc6375f 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Properties/launchSettings.json +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "O2NextGen.CertificateManagement.Web": { + "O2NextGen.CertificateManagement.Api": { "commandName": "Project", "launchBrowser": true, "launchUrl": "swagger", @@ -8,20 +8,6 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } - }, - "Docker": { - "commandName": "Docker", - "launchBrowser": true, - "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", - "environmentVariables": {} - }, - "O2NextGen.CertificateManagement.Api": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "https://localhost:8166;http://localhost:59600", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } } } } \ No newline at end of file diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Startup.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Startup.cs index 615f3ad4..80d72e28 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Startup.cs +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Startup.cs @@ -11,16 +11,18 @@ using O2NextGen.CertificateManagement.Api.Helpers; using O2NextGen.CertificateManagement.Api.IoC; using Swashbuckle.AspNetCore.Swagger; +using Microsoft.Extensions.Hosting; +using Microsoft.OpenApi.Models; [assembly: ApiController] namespace O2NextGen.CertificateManagement.Api { public class Startup { - public IHostingEnvironment HostingEnvironment { get; private set; } + public IWebHostEnvironment HostingEnvironment { get; private set; } public IConfiguration AppConfiguration { get; private set; } - public Startup(IConfiguration appConfiguration, IHostingEnvironment env) + public Startup(IConfiguration appConfiguration, IWebHostEnvironment env) { this.HostingEnvironment = env; this.AppConfiguration = appConfiguration; @@ -31,20 +33,20 @@ public void ConfigureServices(IServiceCollection services) services.AddBusiness(); services.AddSwaggerGen(options => { - options.DescribeAllEnumsAsStrings(); - options.SwaggerDoc("v1",new Info() + options.DescribeAllParametersInCamelCase(); + options.SwaggerDoc("v1",new OpenApiInfo() { Title = "O2NextGen Platform. C-Gen HTTP API", Version = "v1", Description = "C-Gen API Service. The service allows you to create certificates", - TermsOfService = "Terms of Service" + //TermsOfService = "Terms of Service" }); }); services.AddConfigEf(AppConfiguration); services.ConfigurePOCO(AppConfiguration.GetSection("Urls")); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { if (env.IsDevelopment()) { diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/appsettings.json b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/appsettings.json index f4efaeef..cc0c3503 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/appsettings.json +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/appsettings.json @@ -1,5 +1,5 @@ { - "ConnectionString": "Server=localhost;Initial Catalog=O2NextGen.CertificateDb;Persist Security Info=False;User ID=sa;Password=your@Password;Connection Timeout=30;", + "ConnectionString": "Server=20.112.192.201;Initial Catalog=O2NextGen.CertificateDb;Persist Security Info=False;User ID=sa;Password=yourStrong(!)Password;Connection Timeout=30;", "Urls": { "Auth": "http://localhost:10001" }, diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Business/O2NextGen.CertificateManagement.Business.csproj b/src/Services/c-gen/O2NextGen.CertificateManagement.Business/O2NextGen.CertificateManagement.Business.csproj index 380a6635..e012af3e 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Business/O2NextGen.CertificateManagement.Business.csproj +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Business/O2NextGen.CertificateManagement.Business.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Data/CertificateManagementDbContext.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Data/CertificateManagementDbContext.cs index 4e7ddc81..8fb7bc4b 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Data/CertificateManagementDbContext.cs +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Data/CertificateManagementDbContext.cs @@ -35,7 +35,7 @@ private void ConfigureCertificateEntity(EntityTypeBuilder bui builder.Property(ci => ci.Id) .HasColumnType("bigint") - .ForSqlServerUseSequenceHiLo("certificate_hilo") + .UseHiLo("certificate_hilo") .IsRequired(); } diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Data/O2NextGen.CertificateManagement.Data.csproj b/src/Services/c-gen/O2NextGen.CertificateManagement.Data/O2NextGen.CertificateManagement.Data.csproj index 131a4710..d5302b71 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Data/O2NextGen.CertificateManagement.Data.csproj +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Data/O2NextGen.CertificateManagement.Data.csproj @@ -1,14 +1,15 @@ - net5.0 + net6.0 - - - - + + + + + + - diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/O2NextGen.CertificateManagement.Impl.csproj b/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/O2NextGen.CertificateManagement.Impl.csproj index 45dfa5b6..23207484 100644 --- a/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/O2NextGen.CertificateManagement.Impl.csproj +++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/O2NextGen.CertificateManagement.Impl.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/Services/c-gen/Tests/IntegrationTests.O2NextGen.CertificateManagement.Api/IntegrationTests.O2NextGen.CertificateManagement.Api.csproj b/src/Services/c-gen/Tests/IntegrationTests.O2NextGen.CertificateManagement.Api/IntegrationTests.O2NextGen.CertificateManagement.Api.csproj index fc80c7d6..12676734 100644 --- a/src/Services/c-gen/Tests/IntegrationTests.O2NextGen.CertificateManagement.Api/IntegrationTests.O2NextGen.CertificateManagement.Api.csproj +++ b/src/Services/c-gen/Tests/IntegrationTests.O2NextGen.CertificateManagement.Api/IntegrationTests.O2NextGen.CertificateManagement.Api.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false diff --git a/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Api/Tests.O2NextGen.CertificateManagement.Api.csproj b/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Api/Tests.O2NextGen.CertificateManagement.Api.csproj index 8c071235..a91b6ea1 100644 --- a/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Api/Tests.O2NextGen.CertificateManagement.Api.csproj +++ b/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Api/Tests.O2NextGen.CertificateManagement.Api.csproj @@ -1,16 +1,16 @@ - net5.0 + net6.0 false - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Impl/Tests.O2NextGen.CertificateManagement.Impl.csproj b/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Impl/Tests.O2NextGen.CertificateManagement.Impl.csproj index 8c071235..e899dc0c 100644 --- a/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Impl/Tests.O2NextGen.CertificateManagement.Impl.csproj +++ b/src/Services/c-gen/Tests/Tests.O2NextGen.CertificateManagement.Impl/Tests.O2NextGen.CertificateManagement.Impl.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false diff --git a/src/Services/c-gen/docker-compose.yml b/src/Services/c-gen/docker-compose.yml index e37ff1e4..38500f3f 100644 --- a/src/Services/c-gen/docker-compose.yml +++ b/src/Services/c-gen/docker-compose.yml @@ -5,4 +5,4 @@ services: image: ${DOCKER_REGISTRY-}o2nextgencertificatemanagement build: context: . - dockerfile: O2NextGen.CertificateManagement.Api/Dockerfile + dockerfile: Dockerfile