Merge pull request 'Update to .NET 8 (#50 )' (#52 ) from 8.3 into main

Reviewed-on: #52
Merge branch 'main' into 8.3
2024-06-07 01:03:23 +00:00 · 2024-06-07 01:02:51 +00:00 · 2024-06-07 00:54:04 +00:00 · 2024-06-07 00:53:50 +00:00 · 2024-06-05 22:32:00 -04:00 · 2023-08-08 20:26:42 +00:00
10 changed files with 24 additions and 24 deletions
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
      execjs
    coffee-script-source (1.11.1)
    colorator (1.1.0)
-    commonmarker (0.23.9)
+    commonmarker (0.23.10)
    concurrent-ruby (1.2.2)
    dnsruby (1.70.0)
      simpleidn (~> 0.2.1)
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,11 +1,11 @@
 <Project>
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <AssemblyVersion>8.2.0.0</AssemblyVersion>
-    <FileVersion>8.2.0.0</FileVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyVersion>8.3.0.0</AssemblyVersion>
+    <FileVersion>8.3.0.0</FileVersion>
    <Authors>danieljsummers</Authors>
    <Company>Bit Badger Solutions</Company>
-    <Version>8.2.0</Version>
+    <Version>8.3.0</Version>
    <DebugType>Embedded</DebugType>
  </PropertyGroup>
 </Project>
--- 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" ]
--- 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 =
--- 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 () =
--- a/src/PrayerTracker.Data/PrayerTracker.Data.fsproj
+++ b/src/PrayerTracker.Data/PrayerTracker.Data.fsproj
@@ -7,12 +7,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="BitBadger.Npgsql.FSharp.Documents" Version="1.0.0-beta3" />
-    <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="NodaTime" Version="3.1.9" />
+    <PackageReference Include="BitBadger.Documents.Postgres" Version="3.1.0" />
+    <PackageReference Include="Giraffe" Version="6.4.0" />
+    <PackageReference Include="NodaTime" Version="3.1.11" />
    <PackageReference Include="Npgsql.FSharp" Version="5.7.0" />
-    <PackageReference Include="Npgsql.NodaTime" Version="7.0.4" />
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Include="Npgsql.NodaTime" Version="8.0.3" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
  </ItemGroup>

 </Project>
--- a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
+++ b/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
@@ -15,8 +15,8 @@

  <ItemGroup>
    <PackageReference Include="Expecto" Version="9.0.4" />
-    <PackageReference Include="NodaTime.Testing" Version="3.1.9" />
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Include="NodaTime.Testing" Version="3.1.11" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
  </ItemGroup>

  <ItemGroup>
--- a/src/PrayerTracker.UI/PrayerTracker.UI.fsproj
+++ b/src/PrayerTracker.UI/PrayerTracker.UI.fsproj
@@ -15,14 +15,14 @@

  <ItemGroup>
    <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
-    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.2" />
-    <PackageReference Include="MailKit" Version="4.1.0" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.12" />
+    <PackageReference Include="MailKit" Version="4.6.0" />
    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
  </ItemGroup>

  <ItemGroup>
--- 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
--- a/src/PrayerTracker/PrayerTracker.fsproj
+++ b/src/PrayerTracker/PrayerTracker.fsproj
@@ -25,9 +25,9 @@

  <ItemGroup>
    <PackageReference Include="BitBadger.AspNetCore.CanonicalDomains" Version="1.0.0" />
-    <PackageReference Include="Giraffe.Htmx" Version="1.9.2" />
-    <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.1" />
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.9.12" />
+    <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.1.0" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
  </ItemGroup>

  <ItemGroup>
Author	SHA1	Message	Date
Daniel J. Summers	fdb8f2ebf1	Merge pull request 'Update to .NET 8 (#50 )' (#52 ) from 8.3 into main Reviewed-on: #52	2024-06-07 01:03:23 +00:00
Daniel J. Summers	0f9837c257	Merge branch 'main' into 8.3	2024-06-07 01:02:51 +00:00
Daniel J. Summers	51ad71074c	Merge pull request 'Bump commonmarker from 0.23.9 to 0.23.10 in /docs' (#48 ) from dependabot/bundler/docs/commonmarker-0.23.10 into main Reviewed-on: #48	2024-06-07 00:54:04 +00:00
Daniel J. Summers	377e19ca78	Merge branch 'main' into dependabot/bundler/docs/commonmarker-0.23.10	2024-06-07 00:53:50 +00:00
Daniel J. Summers	131012b320	Update to .NET 8 - Update dependencies - Replace document library	2024-06-05 22:32:00 -04:00
dependabot[bot]	8aa3e41f50	Bump commonmarker from 0.23.9 to 0.23.10 in /docs Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.23.9 to 0.23.10. - [Release notes](https://github.com/gjtorikian/commonmarker/releases) - [Changelog](https://github.com/gjtorikian/commonmarker/blob/v0.23.10/CHANGELOG.md) - [Commits](https://github.com/gjtorikian/commonmarker/compare/v0.23.9...v0.23.10) --- updated-dependencies: - dependency-name: commonmarker dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-08 20:26:42 +00:00