diff --git a/SkredvarselGarminWeb/Dockerfile b/SkredvarselGarminWeb/Dockerfile index 73b97d9f..13af8b95 100644 --- a/SkredvarselGarminWeb/Dockerfile +++ b/SkredvarselGarminWeb/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0.401-1-bookworm-slim AS base +FROM mcr.microsoft.com/dotnet/sdk:9.0.100-bookworm-slim AS base RUN apt-get update RUN apt-get install -y ca-certificates curl gnupg RUN mkdir -p /etc/apt/keyrings @@ -16,7 +16,7 @@ COPY . . RUN dotnet test RUN dotnet publish SkredvarselGarminWeb -c Release -o publish -FROM mcr.microsoft.com/dotnet/sdk:8.0.401-1-bookworm-slim +FROM mcr.microsoft.com/dotnet/sdk:9.0.100-bookworm-slim EXPOSE 8080 WORKDIR /app COPY --from=builder /app/publish ./ diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb.Tests/SkredvarselGarminWeb.Tests.csproj b/SkredvarselGarminWeb/SkredvarselGarminWeb.Tests/SkredvarselGarminWeb.Tests.csproj index 1cad66c6..98febb5b 100644 --- a/SkredvarselGarminWeb/SkredvarselGarminWeb.Tests/SkredvarselGarminWeb.Tests.csproj +++ b/SkredvarselGarminWeb/SkredvarselGarminWeb.Tests/SkredvarselGarminWeb.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable @@ -10,9 +10,9 @@ - - - + + + diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/StripeSubscriptionEndpointsRouteBuilderExtensions.cs b/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/StripeSubscriptionEndpointsRouteBuilderExtensions.cs index 813d85c9..fb597f40 100644 --- a/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/StripeSubscriptionEndpointsRouteBuilderExtensions.cs +++ b/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/StripeSubscriptionEndpointsRouteBuilderExtensions.cs @@ -42,7 +42,7 @@ public static void MapStripeSubscriptionEndpoints(this IEndpointRouteBuilder app SuccessUrl = $"{baseUrl}/stripe-subscribe-callback?session_id={{CHECKOUT_SESSION_ID}}", CancelUrl = $"{baseUrl}/account", Mode = "subscription", - CustomerEmail = user.StripeCustomerId.IsNullOrEmpty() ? user.Email : null, + CustomerEmail = string.IsNullOrEmpty(user.StripeCustomerId) ? user.Email : null, Customer = user.StripeCustomerId, ClientReferenceId = user.Id, LineItems = [ diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/WatchApiRouteBuilderExtensions.cs b/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/WatchApiRouteBuilderExtensions.cs index 7790bc5f..ae6c5994 100644 --- a/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/WatchApiRouteBuilderExtensions.cs +++ b/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/WatchApiRouteBuilderExtensions.cs @@ -74,7 +74,7 @@ public static void MapWatchApiEndpoints(this IEndpointRouteBuilder app) [FromHeader(Name = "Authorization")] string authorizationHeader, IGarminAuthenticationService garminAuthenticationService) => { - if (authorizationHeader.IsNullOrEmpty()) + if (string.IsNullOrEmpty(authorizationHeader)) { return Results.Unauthorized(); } diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/SkredvarselGarminWeb.csproj b/SkredvarselGarminWeb/SkredvarselGarminWeb/SkredvarselGarminWeb.csproj index 96d06550..0a443a7d 100644 --- a/SkredvarselGarminWeb/SkredvarselGarminWeb/SkredvarselGarminWeb.csproj +++ b/SkredvarselGarminWeb/SkredvarselGarminWeb/SkredvarselGarminWeb.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable enable Frontend\ @@ -9,38 +9,36 @@ npm run dev - - - + + + - - - - - - - - - + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - - - + + + - - + +