jamsch0/groceries
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

Update to .NET 8 release candidate

Browse Source
This commit is contained in:
James Chapman 2023-08-11 19:10:45 +01:00
parent 00fd7b8ef0
commit 9c07c3120b
Signed by: jamsch0
GPG Key ID: 765FE58130277547
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -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

8
Groceries.Data/Groceries.Data.csproj
View File

@ -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>

5
Groceries/Groceries.csproj
View File

@ -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>

4
Groceries/Home/HomeController.cs
View File

@ -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)