diff --git a/dependencies.props b/dependencies.props index db91843..0940690 100644 --- a/dependencies.props +++ b/dependencies.props @@ -1,16 +1,14 @@ - 6.0.0 - 6.1.0 - 5.2.2 - 5.6.1 - 12.0.1 - 12.0.0 - 9.0.0 - 6.0.1 - 13.0.1 - 1.0.7 - 1.2.0 - 1.0.0 + 8.0.3 + 8.0.0 + 8.1.1 + 14.0.0 + 12.4.1 + 8.0.14 + 13.0.3 + 1.1.0 + 1.3.0 + 1.1.0 \ No newline at end of file diff --git a/src/Tuitio.Application/Tuitio.Application.csproj b/src/Tuitio.Application/Tuitio.Application.csproj index fefc3fb..753d422 100644 --- a/src/Tuitio.Application/Tuitio.Application.csproj +++ b/src/Tuitio.Application/Tuitio.Application.csproj @@ -1,16 +1,16 @@  - net6.0 + net8.0 - - - - + + + + diff --git a/src/Tuitio.Domain.Data/Tuitio.Domain.Data.csproj b/src/Tuitio.Domain.Data/Tuitio.Domain.Data.csproj index cb073f1..7d72134 100644 --- a/src/Tuitio.Domain.Data/Tuitio.Domain.Data.csproj +++ b/src/Tuitio.Domain.Data/Tuitio.Domain.Data.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/src/Tuitio.Domain/Tuitio.Domain.csproj b/src/Tuitio.Domain/Tuitio.Domain.csproj index de8aa76..6e340ea 100644 --- a/src/Tuitio.Domain/Tuitio.Domain.csproj +++ b/src/Tuitio.Domain/Tuitio.Domain.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/Tuitio.PublishedLanguage/Tuitio.PublishedLanguage.csproj b/src/Tuitio.PublishedLanguage/Tuitio.PublishedLanguage.csproj index 009ca0f..bcf0347 100644 --- a/src/Tuitio.PublishedLanguage/Tuitio.PublishedLanguage.csproj +++ b/src/Tuitio.PublishedLanguage/Tuitio.PublishedLanguage.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Tuitio's published language package facilitates communication with a Tuitio instance in a .NET environment by exposing DTOs (Data Transfer Objects) and constants. https://lab.code-rove.com/gitea/tudor.stanciu/tuitio https://lab.code-rove.com/gitea/tudor.stanciu/tuitio diff --git a/src/Tuitio.Wrapper/Tuitio.Wrapper.csproj b/src/Tuitio.Wrapper/Tuitio.Wrapper.csproj index a5e559e..9bcd2c0 100644 --- a/src/Tuitio.Wrapper/Tuitio.Wrapper.csproj +++ b/src/Tuitio.Wrapper/Tuitio.Wrapper.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 Tuitio.Wrapper facilitates integration with a Tuitio instance in a .NET environment by registering a service called ITuitioService in the application’s service collection. It contains three methods that provide a simple and convenient way for developers to handle authentication and authorization when communicating with Tuitio’s API. https://lab.code-rove.com/gitea/tudor.stanciu/tuitio https://lab.code-rove.com/gitea/tudor.stanciu/tuitio @@ -17,8 +17,8 @@ - - + + diff --git a/src/Tuitio/Dockerfile b/src/Tuitio/Dockerfile index e090566..baa6fa7 100644 --- a/src/Tuitio/Dockerfile +++ b/src/Tuitio/Dockerfile @@ -1,10 +1,12 @@ #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-bullseye-slim AS base +mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS build +# This stage is used to build the service project +FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build +ARG BUILD_CONFIGURATION=Release WORKDIR /workspace COPY ["dependencies.props", "."] COPY ["Directory.Build.props", "."] @@ -18,11 +20,14 @@ COPY ["src/Tuitio.PublishedLanguage/ReleaseNotes.txt", "src/Tuitio.PublishedLang RUN dotnet restore "src/Tuitio/Tuitio.csproj" COPY . . WORKDIR "/workspace/src/Tuitio" -RUN dotnet build "Tuitio.csproj" -c Release -o /app/build +RUN dotnet build "Tuitio.csproj" -c $BUILD_CONFIGURATION -o /app/build +# This stage is used to publish the service project to be copied to the final stage FROM build AS publish -RUN dotnet publish "Tuitio.csproj" -c Release -o /app/publish /p:UseAppHost=false +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "Tuitio.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false +# This stage is used in production FROM base AS final WORKDIR /app COPY --from=publish /app/publish . diff --git a/src/Tuitio/Extensions/StartupExtensions.cs b/src/Tuitio/Extensions/StartupExtensions.cs index b2c57f8..a706d6f 100644 --- a/src/Tuitio/Extensions/StartupExtensions.cs +++ b/src/Tuitio/Extensions/StartupExtensions.cs @@ -25,7 +25,7 @@ namespace Tuitio.Extensions services.AddHttpContextAccessor(); // MediatR - services.AddMediatR(typeof(Application.CommandHandlers.AccountLoginHandler).Assembly); + services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining()); services.AddScoped(typeof(IPipelineBehavior<,>), typeof(RequestPreProcessorBehavior<,>)); services.AddScoped(typeof(IPipelineBehavior<,>), typeof(RequestPostProcessorBehavior<,>)); diff --git a/src/Tuitio/Tuitio.csproj b/src/Tuitio/Tuitio.csproj index 1fed3de..8c52c36 100644 --- a/src/Tuitio/Tuitio.csproj +++ b/src/Tuitio/Tuitio.csproj @@ -1,23 +1,21 @@  - net6.0 + net8.0 Linux - - - - + + + + - + - - - + diff --git a/test/UnitTests/Tuitio.Application.Tests/Fixtures/DependencyInjectionFixture.cs b/test/UnitTests/Tuitio.Application.Tests/Fixtures/DependencyInjectionFixture.cs index 77ab408..7e2558d 100644 --- a/test/UnitTests/Tuitio.Application.Tests/Fixtures/DependencyInjectionFixture.cs +++ b/test/UnitTests/Tuitio.Application.Tests/Fixtures/DependencyInjectionFixture.cs @@ -60,7 +60,7 @@ namespace Tuitio.Application.Tests.Fixtures }); // MediatR - services.AddMediatR(typeof(Application.CommandHandlers.AccountLoginHandler).Assembly); + services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining()); services.AddScoped(typeof(IPipelineBehavior<,>), typeof(RequestPreProcessorBehavior<,>)); // AutoMapper diff --git a/test/UnitTests/Tuitio.Application.Tests/Tuitio.Application.Tests.csproj b/test/UnitTests/Tuitio.Application.Tests/Tuitio.Application.Tests.csproj index 7f590cf..6e84596 100644 --- a/test/UnitTests/Tuitio.Application.Tests/Tuitio.Application.Tests.csproj +++ b/test/UnitTests/Tuitio.Application.Tests/Tuitio.Application.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 @@ -15,15 +15,13 @@ - - - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/UnitTests/Tuitio.Wrapper.Tests/Tuitio.Wrapper.Tests.csproj b/test/UnitTests/Tuitio.Wrapper.Tests/Tuitio.Wrapper.Tests.csproj index 6964cf2..1d02063 100644 --- a/test/UnitTests/Tuitio.Wrapper.Tests/Tuitio.Wrapper.Tests.csproj +++ b/test/UnitTests/Tuitio.Wrapper.Tests/Tuitio.Wrapper.Tests.csproj @@ -1,13 +1,13 @@  - net6.0 + net8.0 - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive