Update to net8 and F# 8

The version constraints for the System.* packages are still up for debate.
aardvark-platform · Mar 27, 2024 · 91e1681 · 91e1681
1 parent 4d50a4d
commit 91e1681
Show file tree

Hide file tree

Showing 23 changed files with 716 additions and 285 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.2.1",
+      "version": "8.0.3",
       "commands": [
         "paket"
       ]
     },
     "aardpack": {
-      "version": "1.0.19",
+      "version": "1.0.21",
       "commands": [
         "aardpack"
       ]

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "6.0.0",
+      "version": "8.0.0",
       "rollForward": "latestFeature",
       "allowPrerelease": false
     }

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,35 +1,48 @@
-framework: netstandard2.0, net472, net6.0, net6.0-windows
+framework: netstandard2.0, net472, net8.0, net8.0-windows
 storage: none
 source https://api.nuget.org/v3/index.json
 
+nuget Aardvark.Build               ~> 1.0.22
 
-nuget FSharp.Core                  >= 5.0.0 lowest_matching: true
-nuget Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0 lowest_matching: true
-nuget Aardvark.Build               ~> 1.0.19
+nuget FSharp.Core                  >= 8.0.0 lowest_matching: true
+nuget System.Collections.Immutable >= 8.0.0 lowest_matching: true
+nuget System.Reflection.Metadata   >= 8.0.0 lowest_matching: true
+nuget System.Drawing.Common        >= 8.0.0 lowest_matching: true
+nuget System.Text.Json             >= 8.0.0 lowest_matching: true
+
+nuget System.Dynamic.Runtime       ~> 4.3.0
 
 nuget Aardvark.Base.TypeProviders  ~> 4.5.15
-nuget System.Collections.Immutable >= 5.0.0 lowest_matching: true
 
-nuget System.Dynamic.Runtime       ~> 4.3.0
-nuget DevILSharp                   ~> 0.2.9
-nuget SixLabors.ImageSharp         ~> 2.1.3
-nuget System.Reflection.Metadata   >= 5.0.0 lowest_matching: true
-nuget System.Drawing.Common        >= 4.7.0 lowest_matching: true
+nuget DevILSharp                   ~> 0.2.20
+nuget SixLabors.ImageSharp         ~> 2.1.7
 
 nuget FSharp.Data.Adaptive         ~> 1.2.0
 nuget CSharp.Data.Adaptive         ~> 1.2.0
 nuget Unofficial.LibTessDotNet     ~> 2.0.2
 
-nuget System.Reactive              
-nuget Microsoft.CodeAnalysis.CSharp ~> 4.1.0
-
 nuget FsPickler                    ~> 5.3.2
 nuget FsPickler.Json               ~> 5.3.2
 
-nuget System.Text.Json             >= 4.7.2 lowest_matching: true
+group CodeGenerator
+    framework net8.0
+    storage: none
+    source https://api.nuget.org/v3/index.json
+
+    nuget Microsoft.NETFramework.ReferenceAssemblies  = 1.0.0
+    nuget Microsoft.CodeAnalysis.CSharp              ~> 4.1.0
+
+group Demo
+    framework net8.0
+    storage: none
+    source https://api.nuget.org/v3/index.json
+
+    nuget System.Reactive          ~> 6.0.0
+    nuget CSharp.Data.Adaptive     ~> 1.2.0
 
 group Test
-    framework: net6.0, net6.0-windows
+    framework: net8.0, net8.0-windows
+    storage: none
     source https://api.nuget.org/v3/index.json
 
     nuget NUnit                    ~> 3.13.3

diff --git a/paket.lock b/paket.lock
diff --git a/src/Aardvark.Base.IO/Aardvark.Base.IO.csproj b/src/Aardvark.Base.IO/Aardvark.Base.IO.csproj
@@ -16,10 +16,15 @@
   <ItemGroup>
 	<Compile Remove="**\*_template.cs" />
 	<Compile Remove="**\*_generator.cs" />
+	<Compile Remove="Properties\**" />
   </ItemGroup>
   <ItemGroup>
 	<None Include="**\*_template.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="Properties\**" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aardvark.Base.Tensors.CSharp\Aardvark.Base.Tensors.CSharp.csproj" />
     <ProjectReference Include="..\Aardvark.Base.Tensors\Aardvark.Base.Tensors.fsproj" />
@@ -28,8 +33,5 @@
       <Name>Aardvark.Base</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/Aardvark.Base/Aardvark.Base.csproj b/src/Aardvark.Base/Aardvark.Base.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/Aardvark.PixImage.WindowsMedia/Aardvark.PixImage.WindowsMedia.csproj b/src/Aardvark.PixImage.WindowsMedia/Aardvark.PixImage.WindowsMedia.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows7.0;net472</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>

diff --git a/src/CodeGenerator/CodeGenerator.csproj b/src/CodeGenerator/CodeGenerator.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/src/CodeGenerator/paket.references b/src/CodeGenerator/paket.references
@@ -1,3 +1,4 @@
+group CodeGenerator
+
 Microsoft.NETFramework.ReferenceAssemblies
-Aardvark.Build
 Microsoft.CodeAnalysis.CSharp
diff --git a/src/Demo/CoreTest/CoreTest.fsproj b/src/Demo/CoreTest/CoreTest.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <WarnOn>3389;3390;3395</WarnOn>
   </PropertyGroup>

diff --git a/src/Demo/ExamplesCSharp/ExamplesCSharp.csproj b/src/Demo/ExamplesCSharp/ExamplesCSharp.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\..\bin\Debug</OutputPath>

diff --git a/src/Demo/ExamplesCSharp/paket.references b/src/Demo/ExamplesCSharp/paket.references
@@ -1,7 +1,4 @@
-FSharp.Core
-Aardvark.Build
-FsPickler
-Aardvark.Base.TypeProviders
-FSharp.Data.Adaptive
+group Demo
+
 CSharp.Data.Adaptive
 System.Reactive
diff --git a/src/Demo/IncrementalDemo.CSharp/IncrementalDemo.CSharp.csproj b/src/Demo/IncrementalDemo.CSharp/IncrementalDemo.CSharp.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\..\bin\Debug</OutputPath>

diff --git a/src/Demo/PixImageDemo/PixImageDemo.csproj b/src/Demo/PixImageDemo/PixImageDemo.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\..\bin\Debug</OutputPath>
@@ -11,7 +11,7 @@
     <OutputPath>..\..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-	<RunWorkingDirectory>$(OutputPath)\net6.0</RunWorkingDirectory>
+	<RunWorkingDirectory>$(OutputPath)\net8.0</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Aardvark.Base.Tensors\Aardvark.Base.Tensors.fsproj" />

diff --git a/src/Demo/RandomSampleDemo/RandomSampleDemo.csproj b/src/Demo/RandomSampleDemo/RandomSampleDemo.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\..\bin\Debug</OutputPath>
@@ -11,7 +11,7 @@
     <OutputPath>..\..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-	<RunWorkingDirectory>$(OutputPath)\net6.0</RunWorkingDirectory>
+	<RunWorkingDirectory>$(OutputPath)\net8.0</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Aardvark.Base.Tensors\Aardvark.Base.Tensors.fsproj" />

diff --git a/src/Demo/Scratch/Scratch.fsproj b/src/Demo/Scratch/Scratch.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <WarnOn>3389;3390;3395</WarnOn>
   </PropertyGroup>
@@ -13,7 +13,7 @@
     <OutputPath>..\..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-	<RunWorkingDirectory>$(OutputPath)\net6.0</RunWorkingDirectory>
+	<RunWorkingDirectory>$(OutputPath)\net8.0</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
     <None Include="paket.references" />

diff --git a/src/Tests/Aardvark.Base.Benchmarks/Aardvark.Base.Benchmarks.csproj b/src/Tests/Aardvark.Base.Benchmarks/Aardvark.Base.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ApplicationIcon />
     <GenerateProgramFile>false</GenerateProgramFile>
     <OutputType>Exe</OutputType>

diff --git a/src/Tests/Aardvark.Base.FSharp.Benchmarks/Aardvark.Base.FSharp.Benchmarks.fsproj b/src/Tests/Aardvark.Base.FSharp.Benchmarks/Aardvark.Base.FSharp.Benchmarks.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <WarnOn>3389;3390;3395</WarnOn>

diff --git a/src/Tests/Aardvark.Base.FSharp.Tests/Aardvark.Base.FSharp.Tests.fsproj b/src/Tests/Aardvark.Base.FSharp.Tests/Aardvark.Base.FSharp.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <WarnOn>3389;3390;3395</WarnOn>
@@ -14,7 +14,7 @@
     <OutputPath>..\..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-    <RunWorkingDirectory>$(OutputPath)\net6.0</RunWorkingDirectory>
+    <RunWorkingDirectory>$(OutputPath)\net8.0</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="data\test.jpg" />

diff --git a/src/Tests/Aardvark.Base.Runtime.Tests/Aardvark.Base.Runtime.Tests.fsproj b/src/Tests/Aardvark.Base.Runtime.Tests/Aardvark.Base.Runtime.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <WarnOn>3389;3390;3395</WarnOn>
   </PropertyGroup>
@@ -13,7 +13,7 @@
     <OutputPath>..\..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-	<RunWorkingDirectory>$(OutputPath)\net6.0</RunWorkingDirectory>
+	<RunWorkingDirectory>$(OutputPath)\net8.0</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DynamicCode.fs" />

diff --git a/src/Tests/Aardvark.Base.Tests/Aardvark.Base.Tests.csproj b/src/Tests/Aardvark.Base.Tests/Aardvark.Base.Tests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\..\bin\Debug</OutputPath>
@@ -13,7 +13,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
-	<RunWorkingDirectory>$(OutputPath)\net6.0</RunWorkingDirectory>
+	<RunWorkingDirectory>$(OutputPath)\net8.0</RunWorkingDirectory>
 	<GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Tests/Aardvark.Base.Windows.Tests/Aardvark.Base.Windows.Tests.fsproj b/src/Tests/Aardvark.Base.Windows.Tests/Aardvark.Base.Windows.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <WarnOn>3389;3390;3395</WarnOn>

diff --git a/src/Tests/Aardvark.Geometry.Tests/Aardvark.Geometry.Tests.fsproj b/src/Tests/Aardvark.Geometry.Tests/Aardvark.Geometry.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <GenerateProgramFile>false</GenerateProgramFile>
     <WarnOn>3389;3390;3395</WarnOn>
@@ -14,7 +14,7 @@
     <OutputPath>..\..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-	<RunWorkingDirectory>$(OutputPath)\net6.0</RunWorkingDirectory>
+	<RunWorkingDirectory>$(OutputPath)\net8.0</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PolyRegion2dTests.fs" />