From e88019300c51e58973d5bd8b63222b3d6328fcc9 Mon Sep 17 00:00:00 2001 From: Denis Prokharhcyk Date: Wed, 19 Oct 2022 23:51:56 +0300 Subject: [PATCH 1/2] feat(issue-460): update dotnet core 5.0 to 6.0 for ontracker-api --- src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile | 6 +++--- .../O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj | 2 +- .../O2NextGen.OnTracker.Business.csproj | 2 +- .../O2NextGen.OnTracker.Data.csproj | 2 +- .../O2NextGen.OnTracker.Impl.csproj | 2 +- .../O2NextGen.Tracker.DbUtility.csproj | 2 +- .../IntegrationTests.O2NextGen.OnTracker.Api.csproj | 2 +- .../Tests.O2NextGen.OnTracker.Api.csproj | 2 +- .../Tests.O2NextGen.OnTracker.Business.csproj | 2 +- .../Tests.O2NextGen.OnTracker.Data.csproj | 2 +- .../Tests.O2NextGen.OnTracker.Impl.csproj | 2 +- .../Tests.O2NextGen.Tracker.DbUtility.csproj | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile index ba6142f0..1bcc04e6 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/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:5.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src COPY ["O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj", "O2NextGen.OnTracker.Api/"] COPY ["O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj", "O2NextGen.OnTracker.Business/"] @@ -17,7 +17,7 @@ WORKDIR "/src/O2NextGen.OnTracker.Api" RUN dotnet build "O2NextGen.OnTracker.Api.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "O2NextGen.OnTracker.Api.csproj" -c Release -o /app/publish +RUN dotnet publish "O2NextGen.OnTracker.Api.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj index 896b97db..7d7038ef 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 ../docker-compose.dcproj diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj index f208d303..dbc15171 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj index f208d303..dbc15171 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj index f208d303..dbc15171 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj b/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj index cccdc0e2..36b38322 100644 --- a/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj +++ b/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj index e804290d..0db5b5f9 100644 --- a/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj +++ b/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj index 8836b31f..2a066c77 100644 --- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj +++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj index 8836b31f..2a066c77 100644 --- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj +++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj index 8836b31f..2a066c77 100644 --- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj +++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj index 8836b31f..2a066c77 100644 --- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj +++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj index 8836b31f..2a066c77 100644 --- a/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj +++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 false From f1e7d2fd7b6e62c6796dc12fbfeeb34166f464d5 Mon Sep 17 00:00:00 2001 From: Denis Prokharhcyk Date: Fri, 21 Oct 2022 17:43:53 +0300 Subject: [PATCH 2/2] feat(issue-460): update version of swagger --- .../O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj index 7d7038ef..0a30912c 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj @@ -13,8 +13,8 @@ - - + +