From 131012b32031437aeab3dafd19a283a32d4b466d Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Wed, 5 Jun 2024 22:32:00 -0400 Subject: [PATCH] Update to .NET 8 - Update dependencies - Replace document library --- src/Directory.Build.props | 8 ++++---- src/Dockerfile | 6 +++--- src/PrayerTracker.Data/Access.fs | 2 +- src/PrayerTracker.Data/DistributedCache.fs | 2 +- src/PrayerTracker.Data/PrayerTracker.Data.fsproj | 10 +++++----- src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj | 4 ++-- src/PrayerTracker.UI/PrayerTracker.UI.fsproj | 6 +++--- src/PrayerTracker/App.fs | 2 +- src/PrayerTracker/PrayerTracker.fsproj | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 72b2f28..df2dd06 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,11 +1,11 @@ - net7.0 - 8.2.0.0 - 8.2.0.0 + net8.0 + 8.3.0.0 + 8.3.0.0 danieljsummers Bit Badger Solutions - 8.2.0 + 8.3.0 Embedded diff --git a/src/Dockerfile b/src/Dockerfile index d652e29..642fd31 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build WORKDIR /pt COPY ./PrayerTracker.sln ./ COPY ./Directory.Build.props ./ @@ -15,11 +15,11 @@ RUN dotnet run WORKDIR /pt/PrayerTracker RUN dotnet publish -c Release -r linux-x64 -FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine as final +FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine as final WORKDIR /app RUN apk add --no-cache icu-libs ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false -COPY --from=build /pt/PrayerTracker/bin/Release/net7.0/linux-x64/publish/ ./ +COPY --from=build /pt/PrayerTracker/bin/Release/net8.0/linux-x64/publish/ ./ EXPOSE 80 CMD [ "dotnet", "/app/PrayerTracker.dll" ] diff --git a/src/PrayerTracker.Data/Access.fs b/src/PrayerTracker.Data/Access.fs index 6794496..a9e6163 100644 --- a/src/PrayerTracker.Data/Access.fs +++ b/src/PrayerTracker.Data/Access.fs @@ -103,7 +103,7 @@ module private Helpers = } -open BitBadger.Npgsql.FSharp.Documents +open BitBadger.Documents.Postgres /// Functions to manipulate churches module Churches = diff --git a/src/PrayerTracker.Data/DistributedCache.fs b/src/PrayerTracker.Data/DistributedCache.fs index e6b669e..c3684fe 100644 --- a/src/PrayerTracker.Data/DistributedCache.fs +++ b/src/PrayerTracker.Data/DistributedCache.fs @@ -47,7 +47,7 @@ module private CacheHelpers = p.ParameterName, Sql.parameter p -open BitBadger.Npgsql.FSharp.Documents +open BitBadger.Documents.Postgres /// A distributed cache implementation in PostgreSQL used to handle sessions for myWebLog type DistributedCache () = diff --git a/src/PrayerTracker.Data/PrayerTracker.Data.fsproj b/src/PrayerTracker.Data/PrayerTracker.Data.fsproj index 52b7df9..9284996 100644 --- a/src/PrayerTracker.Data/PrayerTracker.Data.fsproj +++ b/src/PrayerTracker.Data/PrayerTracker.Data.fsproj @@ -7,12 +7,12 @@ - - - + + + - - + + diff --git a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj b/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj index d6ad743..5b9db06 100644 --- a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj +++ b/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/PrayerTracker.UI/PrayerTracker.UI.fsproj b/src/PrayerTracker.UI/PrayerTracker.UI.fsproj index 7995a7c..d8909fc 100644 --- a/src/PrayerTracker.UI/PrayerTracker.UI.fsproj +++ b/src/PrayerTracker.UI/PrayerTracker.UI.fsproj @@ -15,14 +15,14 @@ - - + + - + diff --git a/src/PrayerTracker/App.fs b/src/PrayerTracker/App.fs index 2b9178a..9254290 100644 --- a/src/PrayerTracker/App.fs +++ b/src/PrayerTracker/App.fs @@ -35,7 +35,7 @@ module Configure = (ctx.Configuration.GetSection >> opts.Configure >> ignore) "Kestrel" open System.Globalization - open BitBadger.Npgsql.FSharp.Documents + open BitBadger.Documents.Postgres open Microsoft.AspNetCore.Authentication.Cookies open Microsoft.AspNetCore.Localization open Microsoft.Extensions.Caching.Distributed diff --git a/src/PrayerTracker/PrayerTracker.fsproj b/src/PrayerTracker/PrayerTracker.fsproj index 19dc847..424217f 100644 --- a/src/PrayerTracker/PrayerTracker.fsproj +++ b/src/PrayerTracker/PrayerTracker.fsproj @@ -25,9 +25,9 @@ - - - + + +