From 4b77815570acf017f78e72814cf72983ff0e3983 Mon Sep 17 00:00:00 2001 From: Dhanalakshmi Gopalswamy <34273718+acn-dgopa@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:29:55 +0100 Subject: [PATCH] Updated to .net 8 and diverse package versions across all projects (#82) * Updated diverse package versions across all projects * Updated dotnet version in dockerfile --------- Co-authored-by: acn-dgopa --- ...ltinn.Auth.AuditLog.Functions.Tests.csproj | 12 +++++------ Dockerfile | 4 ++-- .../Altinn.Auth.AuditLog.Core.csproj | 4 ++-- .../Altinn.Auth.AuditLog.Persistence.csproj | 4 ++-- .../Altinn.Auth.AuditLog.csproj | 20 +++++++++---------- src/Altinn.Auth.AuditLog/Program.cs | 4 ++-- .../Altinn.Auth.AuditLog.Functions.csproj | 20 +++++++++---------- .../Altinn.Auth.AuditLog.Tests.csproj | 14 ++++++------- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Altinn.Auth.AuditLog.Functions.Tests/Altinn.Auth.AuditLog.Functions.Tests.csproj b/Altinn.Auth.AuditLog.Functions.Tests/Altinn.Auth.AuditLog.Functions.Tests.csproj index e0a6b42..5909ee8 100644 --- a/Altinn.Auth.AuditLog.Functions.Tests/Altinn.Auth.AuditLog.Functions.Tests.csproj +++ b/Altinn.Auth.AuditLog.Functions.Tests/Altinn.Auth.AuditLog.Functions.Tests.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -10,14 +10,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Dockerfile b/Dockerfile index 8f4656b..fe686a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # Building the auditlog api -FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build COPY src . WORKDIR Altinn.Auth.AuditLog/ RUN dotnet build Altinn.Auth.AuditLog.csproj -c Release -o /app_output RUN dotnet publish Altinn.Auth.AuditLog.csproj -c Release -o /app_output # Building the final image -FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS final +FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS final EXPOSE 5166 WORKDIR /app COPY --from=build /app_output . diff --git a/src/Altinn.Auth.AuditLog.Core/Altinn.Auth.AuditLog.Core.csproj b/src/Altinn.Auth.AuditLog.Core/Altinn.Auth.AuditLog.Core.csproj index 46873e5..c5171f3 100644 --- a/src/Altinn.Auth.AuditLog.Core/Altinn.Auth.AuditLog.Core.csproj +++ b/src/Altinn.Auth.AuditLog.Core/Altinn.Auth.AuditLog.Core.csproj @@ -1,13 +1,13 @@ - net7.0 + net8.0 enable enable - + diff --git a/src/Altinn.Auth.AuditLog.Persistence/Altinn.Auth.AuditLog.Persistence.csproj b/src/Altinn.Auth.AuditLog.Persistence/Altinn.Auth.AuditLog.Persistence.csproj index 3b73dc9..7284e46 100644 --- a/src/Altinn.Auth.AuditLog.Persistence/Altinn.Auth.AuditLog.Persistence.csproj +++ b/src/Altinn.Auth.AuditLog.Persistence/Altinn.Auth.AuditLog.Persistence.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 enable enable - + diff --git a/src/Altinn.Auth.AuditLog/Altinn.Auth.AuditLog.csproj b/src/Altinn.Auth.AuditLog/Altinn.Auth.AuditLog.csproj index f72ddc4..810b88e 100644 --- a/src/Altinn.Auth.AuditLog/Altinn.Auth.AuditLog.csproj +++ b/src/Altinn.Auth.AuditLog/Altinn.Auth.AuditLog.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable cd7f3135-73f2-4dbb-a8df-a928ba70d031 @@ -9,18 +9,18 @@ - - + + - + - - - - - - + + + + + + diff --git a/src/Altinn.Auth.AuditLog/Program.cs b/src/Altinn.Auth.AuditLog/Program.cs index ba996b2..7894fbb 100644 --- a/src/Altinn.Auth.AuditLog/Program.cs +++ b/src/Altinn.Auth.AuditLog/Program.cs @@ -24,8 +24,8 @@ string postgreDbAdminConnectionStringSecretName = "PostgreSQLSettings--AdminConnectionString"; string postgreDbConnectionStringSecretName = "PostgreSQLSettings--ConnectionString"; string applicationInsightsConnectionString = string.Empty; -string postgreDbAdminConnectionString = string.Empty; -string postgreDbConnectionString = string.Empty; +string postgreDbAdminConnectionString = "Host=localhost;Port=5432;Username=auth_auditlog_admin;Password=Password;Database=authauditlogdb"; +string postgreDbConnectionString = "Host=localhost;Port=5432;Username=auth_auditlog;Password=Password;Database=authauditlogdb"; ConfigureSetupLogging(); diff --git a/src/Functions/Altinn.Auth.AuditLog.Functions/Altinn.Auth.AuditLog.Functions.csproj b/src/Functions/Altinn.Auth.AuditLog.Functions/Altinn.Auth.AuditLog.Functions.csproj index d31d4c9..8f31ed9 100644 --- a/src/Functions/Altinn.Auth.AuditLog.Functions/Altinn.Auth.AuditLog.Functions.csproj +++ b/src/Functions/Altinn.Auth.AuditLog.Functions/Altinn.Auth.AuditLog.Functions.csproj @@ -1,21 +1,21 @@ - net7.0 + net8.0 v4 Exe enable enable - - - - - - - - - + + + + + + + + + diff --git a/src/test/Altinn.Auth.AuditLog.Tests/Altinn.Auth.AuditLog.Tests.csproj b/src/test/Altinn.Auth.AuditLog.Tests/Altinn.Auth.AuditLog.Tests.csproj index be0e08f..44f019f 100644 --- a/src/test/Altinn.Auth.AuditLog.Tests/Altinn.Auth.AuditLog.Tests.csproj +++ b/src/test/Altinn.Auth.AuditLog.Tests/Altinn.Auth.AuditLog.Tests.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -10,15 +10,15 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all