Skip to content

Commit

Permalink
Updated solution to .NET 9.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottArbeit committed Jun 13, 2024
1 parent 80575f0 commit d36dcbf
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions src/CosmosSerializer/CosmosJsonSerializer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NoWarn>1057,3391</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"]
Expand Down
4 changes: 2 additions & 2 deletions src/Grace.Actors/Grace.Actors.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<PublishReadyToRun>false</PublishReadyToRun>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Grace.Aspire.AppHost/Grace.Aspire.AppHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand Down
4 changes: 2 additions & 2 deletions src/Grace.CLI/Grace.CLI.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<PublishReadyToRun>true</PublishReadyToRun>
<OutputType>Exe</OutputType>
Expand Down
4 changes: 2 additions & 2 deletions src/Grace.Load/Grace.Load.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<NoWarn>1057,3391</NoWarn>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
Expand Down
4 changes: 2 additions & 2 deletions src/Grace.SDK/Grace.SDK.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<PublishReadyToRun>true</PublishReadyToRun>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
4 changes: 2 additions & 2 deletions src/Grace.Server.Tests/Grace.Server.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<PublishReadyToRun>false</PublishReadyToRun>
<LangVersion>preview</LangVersion>
<IsPackable>false</IsPackable>
Expand Down
4 changes: 2 additions & 2 deletions src/Grace.Server/Grace.Server.fsproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<!--<RuntimeIdentifiers>linux-x64;win-x64</RuntimeIdentifiers>-->
<Platforms>AnyCPU;x64</Platforms>
<LangVersion>preview</LangVersion>
<Version>0.1</Version>
<Description>The server module for Grace Version Control System.</Description>
<UserSecretsId>f1167a88-7f15-49c3-8ea1-30c2608081c9</UserSecretsId>
<ContainerBaseImage>mcr.microsoft.com/dotnet/aspnet:8.0</ContainerBaseImage>
<ContainerBaseImage>mcr.microsoft.com/dotnet/aspnet:9.0.0-preview.5</ContainerBaseImage>
<ContainerImageTags>0.1;latest</ContainerImageTags>
<!--<ContainerRegistry>registry.hub.docker.com</ContainerRegistry>-->
<ContainerRepository>scottarbeit/grace-server</ContainerRepository>
Expand Down
4 changes: 2 additions & 2 deletions src/Grace.Shared/Grace.Shared.fsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<PublishReadyToRun>true</PublishReadyToRun>
<Version>0.1</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Grace.Shared/Utilities.Shared.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d36dcbf

Please sign in to comment.