From 9c07c3120bdad1c086babb03ad169c47df22d366 Mon Sep 17 00:00:00 2001
From: James Chapman <jchapman3000@gmail.com>
Date: Fri, 11 Aug 2023 19:10:45 +0100
Subject: [PATCH] Update to .NET 8 release candidate

---
 Dockerfile                           | 5 +++--
 Groceries.Data/Groceries.Data.csproj | 8 ++++----
 Groceries/Groceries.csproj           | 5 ++---
 Groceries/Home/HomeController.cs     | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6bbee6f..e4848c9 100644
--- a/Dockerfile
+++ b/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 /src
 
 COPY ./.config ./
@@ -16,7 +16,7 @@ RUN dotnet libman restore
 COPY . ../
 RUN dotnet publish --no-restore --output /out
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine-composite AS base
 WORKDIR /groceries
 
 COPY --from=build /out .
@@ -24,6 +24,7 @@ COPY --from=build /src/Groceries/config.ini /config/
 
 RUN apk add --no-cache icu-libs tzdata
 
+ENV ASPNETCORE_HTTP_PORTS=80
 ENV DOTNET_ENABLEDIAGNOSTICS=0
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
diff --git a/Groceries.Data/Groceries.Data.csproj b/Groceries.Data/Groceries.Data.csproj
index 9c54245..f8cc019 100644
--- a/Groceries.Data/Groceries.Data.csproj
+++ b/Groceries.Data/Groceries.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
@@ -9,10 +9,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DbUp-PostgreSQL" Version="5.0.8" />
-        <PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
+        <PackageReference Include="DbUp-PostgreSQL" Version="5.0.37" />
+        <PackageReference Include="EFCore.NamingConventions" Version="8.0.0-rc.2" />
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Groceries/Groceries.csproj b/Groceries/Groceries.csproj
index 7aada9c..c9f3867 100644
--- a/Groceries/Groceries.csproj
+++ b/Groceries/Groceries.csproj
@@ -1,18 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
         <AnalysisMode>recommended</AnalysisMode>
 
-        <PublishRelease>true</PublishRelease>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.11" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0-rc.*" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Groceries/Home/HomeController.cs b/Groceries/Home/HomeController.cs
index bacfc06..fd68401 100644
--- a/Groceries/Home/HomeController.cs
+++ b/Groceries/Home/HomeController.cs
@@ -26,8 +26,8 @@ public class HomeController : Controller
                         unnest(tags) AS tag,
                         round(sum((item_quantity->'amount')::numeric * quantity), 1) AS quantity,
                         item_quantity->>'unit' AS unit,
-                        item_quantity->'is_metric' AS is_metric,
-                        item_quantity->'is_divisible' AS is_divisible
+                        (item_quantity->'is_metric')::boolean AS is_metric,
+                        (item_quantity->'is_divisible')::boolean AS is_divisible
                     FROM item_purchases
                     JOIN items USING (item_id)
                     CROSS JOIN item_quantity(name)