From d36dcbf2be144a43a348c658d69d02b78c8ce841 Mon Sep 17 00:00:00 2001 From: Scott Arbeit Date: Wed, 12 Jun 2024 19:09:43 -0700 Subject: [PATCH] Updated solution to .NET 9.0. --- src/CosmosSerializer/CosmosJsonSerializer.csproj | 4 ++-- src/Dockerfile | 4 ++-- src/Grace.Actors/Grace.Actors.fsproj | 4 ++-- src/Grace.Aspire.AppHost/Grace.Aspire.AppHost.csproj | 2 +- .../Grace.Aspire.ServiceDefaults.csproj | 2 +- src/Grace.CLI/Grace.CLI.fsproj | 4 ++-- src/Grace.Load/Grace.Load.fsproj | 4 ++-- src/Grace.SDK/Grace.SDK.fsproj | 4 ++-- src/Grace.Server.Tests/Grace.Server.Tests.fsproj | 4 ++-- src/Grace.Server/Grace.Server.fsproj | 4 ++-- src/Grace.Shared/Grace.Shared.fsproj | 4 ++-- src/Grace.Shared/Utilities.Shared.fs | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/CosmosSerializer/CosmosJsonSerializer.csproj b/src/CosmosSerializer/CosmosJsonSerializer.csproj index df12df0..fe3a8f4 100644 --- a/src/CosmosSerializer/CosmosJsonSerializer.csproj +++ b/src/CosmosSerializer/CosmosJsonSerializer.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net9.0 enable enable 1057,3391 diff --git a/src/Dockerfile b/src/Dockerfile index 49ff1ff..5c16998 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -2,12 +2,12 @@ # Using the SDK image as the base instead of the aspnet image lets us run a shell for debugging. #FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 5000 EXPOSE 5001 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["Grace.Server/Grace.Server.fsproj", "./Grace.Server/"] COPY ["Grace.Actors/Grace.Actors.fsproj", "./Grace.Actors/"] diff --git a/src/Grace.Actors/Grace.Actors.fsproj b/src/Grace.Actors/Grace.Actors.fsproj index 58beab1..3518b99 100644 --- a/src/Grace.Actors/Grace.Actors.fsproj +++ b/src/Grace.Actors/Grace.Actors.fsproj @@ -1,7 +1,7 @@ - + - net8.0 + net9.0 preview false true diff --git a/src/Grace.Aspire.AppHost/Grace.Aspire.AppHost.csproj b/src/Grace.Aspire.AppHost/Grace.Aspire.AppHost.csproj index 7469978..29da74b 100644 --- a/src/Grace.Aspire.AppHost/Grace.Aspire.AppHost.csproj +++ b/src/Grace.Aspire.AppHost/Grace.Aspire.AppHost.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable true diff --git a/src/Grace.Aspire.ServiceDefaults/Grace.Aspire.ServiceDefaults.csproj b/src/Grace.Aspire.ServiceDefaults/Grace.Aspire.ServiceDefaults.csproj index 179faeb..fb3d1db 100644 --- a/src/Grace.Aspire.ServiceDefaults/Grace.Aspire.ServiceDefaults.csproj +++ b/src/Grace.Aspire.ServiceDefaults/Grace.Aspire.ServiceDefaults.csproj @@ -2,7 +2,7 @@ Library - net8.0 + net9.0 enable enable true diff --git a/src/Grace.CLI/Grace.CLI.fsproj b/src/Grace.CLI/Grace.CLI.fsproj index 9871f46..16b9b3e 100644 --- a/src/Grace.CLI/Grace.CLI.fsproj +++ b/src/Grace.CLI/Grace.CLI.fsproj @@ -1,7 +1,7 @@ - + - net8.0 + net9.0 preview true Exe diff --git a/src/Grace.Load/Grace.Load.fsproj b/src/Grace.Load/Grace.Load.fsproj index bb57e9b..6e93195 100644 --- a/src/Grace.Load/Grace.Load.fsproj +++ b/src/Grace.Load/Grace.Load.fsproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net9.0 preview 1057,3391 true diff --git a/src/Grace.SDK/Grace.SDK.fsproj b/src/Grace.SDK/Grace.SDK.fsproj index 0ce2f9e..487c442 100644 --- a/src/Grace.SDK/Grace.SDK.fsproj +++ b/src/Grace.SDK/Grace.SDK.fsproj @@ -1,7 +1,7 @@ - + - net8.0 + net9.0 preview true true diff --git a/src/Grace.Server.Tests/Grace.Server.Tests.fsproj b/src/Grace.Server.Tests/Grace.Server.Tests.fsproj index 5a26bd6..2212039 100644 --- a/src/Grace.Server.Tests/Grace.Server.Tests.fsproj +++ b/src/Grace.Server.Tests/Grace.Server.Tests.fsproj @@ -1,7 +1,7 @@ - + - net8.0 + net9.0 false preview false diff --git a/src/Grace.Server/Grace.Server.fsproj b/src/Grace.Server/Grace.Server.fsproj index 67d2dea..39ca3a1 100644 --- a/src/Grace.Server/Grace.Server.fsproj +++ b/src/Grace.Server/Grace.Server.fsproj @@ -1,13 +1,13 @@ - net8.0 + net9.0 AnyCPU;x64 preview 0.1 The server module for Grace Version Control System. f1167a88-7f15-49c3-8ea1-30c2608081c9 - mcr.microsoft.com/dotnet/aspnet:8.0 + mcr.microsoft.com/dotnet/aspnet:9.0.0-preview.5 0.1;latest scottarbeit/grace-server diff --git a/src/Grace.Shared/Grace.Shared.fsproj b/src/Grace.Shared/Grace.Shared.fsproj index 347d558..8132fc2 100644 --- a/src/Grace.Shared/Grace.Shared.fsproj +++ b/src/Grace.Shared/Grace.Shared.fsproj @@ -1,6 +1,6 @@ - + - net8.0 + net9.0 preview true 0.1 diff --git a/src/Grace.Shared/Utilities.Shared.fs b/src/Grace.Shared/Utilities.Shared.fs index 8b55ea0..add6100 100644 --- a/src/Grace.Shared/Utilities.Shared.fs +++ b/src/Grace.Shared/Utilities.Shared.fs @@ -150,7 +150,7 @@ module Utilities = let serialize<'T> item = JsonSerializer.Serialize<'T>(item, Constants.JsonSerializerOptions) /// Serializes an object to JSON and writes it to a stream, using Grace's custom JsonSerializerOptions. - let serializeAsync<'T> stream item = task { return! JsonSerializer.SerializeAsync<'T>(stream, item, Constants.JsonSerializerOptions) } + let serializeAsync<'T> (stream: Stream) item = task { return! JsonSerializer.SerializeAsync<'T>(stream, item, Constants.JsonSerializerOptions) } /// Deserializes a JSON string to a provided type, using Grace's custom JsonSerializerOptions. let deserialize<'T> (s: string) = JsonSerializer.Deserialize<'T>(s, Constants.JsonSerializerOptions)