Merge branch 'v55' into font-rework

aardvark-platform · Aug 1, 2024 · d344e77 · d344e77
2 parents 683c923 + 4cd87b6
commit d344e77
Show file tree

Hide file tree

Showing 343 changed files with 58,896 additions and 61,554 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
     "isRoot": true,
     "tools": {
       "paket": {
-        "version": "7.1.5",
+        "version": "8.0.0",
         "commands": [
           "paket"
         ]
       },
       "aardpack": {
-          "version": "1.0.19",
+          "version": "1.0.24",
           "commands": [
             "aardpack"
           ]

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         global-json-file: global.json
     - name: Build

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         global-json-file: global.json
     - name: Build

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,8 +3,7 @@ on:
   push:
     branches:
       - master
-      - v54
-      - font-rework
+      - v55
     paths:
       - RELEASE_NOTES.md 
       - .github/workflows/publish.yml
@@ -14,9 +13,9 @@ jobs:
     runs-on: windows-latest
     steps:  
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           global-json-file: global.json
       - name: Restore Tools
@@ -28,7 +27,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: dotnet aardpack src\Aardvark.Rendering.sln --notag
       - name: Upload Packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: packages
           path: bin\pack

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         global-json-file: global.json
     - name: Build

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,10 @@
+### 5.5.0-prerelease0002
+- Renamed `PixImageCube` to `PixCube`
+- Renamed `Aardvark.SceneGraph.IO` to `Aardvark.SceneGraph.Assimp`
+
+### 5.5.0-prerelease0001
+- Initial prerelease
+
 ### 5.4.12
 - [GL] Fixed potential memory leak after ContextHandle is disposed
 - Optimized generic dispatch
@@ -42,6 +49,9 @@
 - [LodRenderer] Handle exceptions in background threads
 - [GL] Implemented GLSL shader caches for platforms that do not support program binaries (e.g. MacOS)
 
+### 5.4.9-prerelease0001
+- [GL] experimental support for quad-buffer stereo(is back again?)
+
 ### 5.4.8
 - [GL] Fixed locking order of GlobalResourceLock and context locks to avoid potential deadlocks
 - [GL] Added workaround for layered rendering and GLSL < 430

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
@@ -3,60 +3,63 @@ source https://api.nuget.org/v3/index.json
 
 storage: none
 
-nuget FSharp.Core                        >= 5.0.1 lowest_matching: true
-nuget Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0 lowest_matching: true
-nuget Aardvark.Build                     ~> 1.0.21
+nuget Aardvark.Build                                ~> 1.0.24
+nuget FSharp.Core                                   >= 8.0.0 lowest_matching: true
+nuget Microsoft.NETFramework.ReferenceAssemblies    >= 1.0.0 lowest_matching: true
 
-nuget FSharp.Data.Adaptive               ~> 1.2.13
-nuget CSharp.Data.Adaptive               ~> 1.2.13
+nuget FSharp.Data.Adaptive                          ~> 1.2.13
+nuget CSharp.Data.Adaptive                          ~> 1.2.13
 
-nuget Aardvark.Base.TypeProviders        ~> 4.5.15
+nuget Aardvark.Base.TypeProviders                   ~> 4.5.15
 
-nuget Aardvark.Base.FSharp               ~> 5.2.27
-nuget Aardvark.Base.IO                   ~> 5.2.27
-nuget Aardvark.Base.Incremental          ~> 5.2.27
-nuget Aardvark.Base.Runtime              ~> 5.2.27
-nuget Aardvark.Base.Essentials           ~> 5.2.27
-nuget Aardvark.Geometry                  ~> 5.2.27
-nuget Aardvark.Base.Tensors              ~> 5.2.27
+nuget Aardvark.Base.FSharp                          ~> 5.3.0-prerelease0005
+nuget Aardvark.Base.IO                              ~> 5.3.0-prerelease0005
+nuget Aardvark.Base.Incremental                     ~> 5.3.0-prerelease0005
+nuget Aardvark.Base.Essentials                      ~> 5.3.0-prerelease0005
+nuget Aardvark.Geometry                             ~> 5.3.0-prerelease0005
+nuget Aardvark.Base.Tensors                         ~> 5.3.0-prerelease0005
 
-nuget Aardvark.Assembler                 ~> 0.0.8
+nuget Aardvark.Assembler                            ~> 0.1.0-prerelease0001
 
-nuget FShade.Core                        ~> 5.5.3
-nuget FShade                             ~> 5.5.3
-nuget FShade.Debug                       ~> 5.5.3
+nuget FShade.Core                                   ~> 5.6.0-prerelease0001
+nuget FShade                                        ~> 5.6.0-prerelease0001
+nuget FShade.Debug                                  ~> 5.6.0-prerelease0001
 
-nuget Unofficial.OpenVR					 ~> 1.1.0
-nuget Unofficial.Typography              ~> 0.1.0
-nuget CommonMark.NET                     ~> 0.15.1
-nuget GLSLangSharp                       ~> 0.4.14
+nuget Unofficial.OpenVR					            ~> 1.1.0
+nuget Unofficial.Typography                         ~> 0.1.0
+nuget CommonMark.NET                                ~> 0.15.1
+nuget GLSLangSharp                                  ~> 0.4.14
 
-nuget Unofficial.LibTessDotNet           ~> 2.0.2
-nuget AssimpNet                          ~> 5.0.0-beta1
-nuget Offler                             ~> 2.0.3
-nuget FSharp.Data                        ~> 4.2.10
+nuget Unofficial.LibTessDotNet                      ~> 2.0.2
+nuget AssimpNet                                     ~> 5.0.0-beta1
+nuget Offler                                        ~> 2.1.1-prerelease0001
+nuget FSharp.Data                                   ~> 6.4.0
 
-nuget Unofficial.OpenTK                  ~> 3.0.21
-nuget Unofficial.OpenTK.GLControl        ~> 3.0.21
-nuget Silk.NET.GLFW                      = 2.15.0
-nuget Silk.NET.Core                      = 2.15.0
-nuget Silk.NET.Direct3D9                 = 2.15.0
+nuget Unofficial.OpenTK                             ~> 3.0.21
+nuget Unofficial.OpenTK.GLControl                   ~> 3.0.21
+nuget Silk.NET.GLFW                                 = 2.15.0
+nuget Silk.NET.Core                                 = 2.15.0
+nuget Silk.NET.Direct3D9                            = 2.15.0
 
-nuget SharpZipLib                        ~> 1.4.1
-nuget FuzzySharp                         ~> 2.0.2
+nuget SharpZipLib                                   ~> 1.4.1
+nuget FuzzySharp                                    ~> 2.0.2
 
-nuget Aardvark.PixImage.Pfim             ~> 0.9.2
+// Examples
+nuget Aardvark.PixImage.DevIL                       ~> 5.2.33-prerelease0001
+nuget Aardvark.PixImage.ImageSharp                  ~> 2.0.1-prerelease0001
+nuget Aardvark.Data.GLTF                            ~> 1.0.0-prerelease0001
 
 group Test
-framework: net6.0
-source https://api.nuget.org/v3/index.json
+    framework: net8.0
+    source https://api.nuget.org/v3/index.json
 
-storage: none
+    storage: none
+
+    nuget Aardvark.PixImage.ImageSharp              ~> 2.0.1-prerelease0001
 
-nuget FSharp.Core                        >= 5.0.1 lowest_matching: true
-nuget Expecto                            ~> 9.0.4
-nuget Expecto.FsCheck                    ~> 9.0.4
-nuget Expecto.Hopac                      ~> 9.0.4
-nuget BenchmarkDotNet                    ~> 0.13.1
-nuget YoloDev.Expecto.TestSdk            ~> 0.13.3
-nuget Microsoft.NET.Test.Sdk             ~> 17.8.0
+    nuget Expecto                                   ~> 9.0.4
+    nuget Expecto.FsCheck                           ~> 9.0.4
+    nuget Expecto.Hopac                             ~> 9.0.4
+    nuget BenchmarkDotNet                           ~> 0.13.1
+    nuget YoloDev.Expecto.TestSdk                   ~> 0.13.3
+    nuget Microsoft.NET.Test.Sdk                    ~> 17.5.0