⬆️ Upgrade to .NET 9

sleepyfran · Nov 18, 2024 · 8667b34 · 8667b34
1 parent 675c65e
commit 8667b34
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '8.0'
+        dotnet-version: '9.0'
         include-prerelease: true
     - name: Restore dependencies
       run: dotnet restore

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <DotnetVersion>net9.0</DotnetVersion>
+    </PropertyGroup>
+</Project>
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0
+FROM mcr.microsoft.com/dotnet/sdk:9.0
 
 COPY *.sln .
 COPY deps ./deps

diff --git a/src/Duets.Agents/Duets.Agents.fsproj b/src/Duets.Agents/Duets.Agents.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 

diff --git a/src/Duets.Cli/Duets.Cli.fsproj b/src/Duets.Cli/Duets.Cli.fsproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
         <Version>0.1.0</Version>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <RootNamespace>Cli</RootNamespace>
+        <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="Scenes.fs"/>

diff --git a/src/Duets.Common/Duets.Common.fsproj b/src/Duets.Common/Duets.Common.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <RootNamespace>Common</RootNamespace>

diff --git a/src/Duets.Common/Files.fs b/src/Duets.Common/Files.fs
@@ -68,13 +68,13 @@ let readAll path =
 /// created already. Notice that while the file is automatically created the
 /// parent folders are not, so if the path is `/a/b/c.txt` and the b folder
 /// is not present, the file will not be written.
-let write path content = File.WriteAllText(path, content)
+let write (path: string) (content: string) = File.WriteAllText(path, content)
 
 /// Appends the content to the specified path. Creates the file if it's not
 /// created already. Notice that while the file is automatically created the
 /// parent folders are not, so if the path is `/a/b/c.txt` and the b folder
 /// is not present, the file will not be written.
-let append path content = File.AppendAllText(path, content)
+let append (path: string) (content: string) = File.AppendAllText(path, content)
 
 /// Deletes the file at the specified path.
 let delete path = File.Delete path
diff --git a/src/Duets.Data/Duets.Data.fsproj b/src/Duets.Data/Duets.Data.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <RootNamespace>Data</RootNamespace>
     </PropertyGroup>

diff --git a/src/Duets.Entities/Duets.Entities.fsproj b/src/Duets.Entities/Duets.Entities.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <RootNamespace>Entities</RootNamespace>
     </PropertyGroup>

diff --git a/src/Duets.Simulation/Duets.Simulation.fsproj b/src/Duets.Simulation/Duets.Simulation.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(DotnetVersion)</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>

diff --git a/tests/Data.Tests/Data.Tests.fsproj b/tests/Data.Tests/Data.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
 
         <IsPackable>false</IsPackable>
         <GenerateProgramFile>false</GenerateProgramFile>

diff --git a/tests/Entities.Tests/Entities.Tests.fsproj b/tests/Entities.Tests/Entities.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
 
         <IsPackable>false</IsPackable>
         <GenerateProgramFile>false</GenerateProgramFile>

diff --git a/tests/Simulation.Tests/Simulation.Tests.fsproj b/tests/Simulation.Tests/Simulation.Tests.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(DotnetVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
     <RootNamespace>Simulation.Tests</RootNamespace>

diff --git a/tests/Test.Common/Test.Common.fsproj b/tests/Test.Common/Test.Common.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>