Update Aardvark.Data packages

aardvark-platform · Aug 6, 2024 · 764ac8f · 764ac8f
1 parent 92da4f3
commit 764ac8f
Show file tree

Hide file tree

Showing 11 changed files with 188 additions and 15 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,8 +25,7 @@ jobs:
       - name: Pack
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        # run: dotnet aardpack src\Aardvark.Rendering.sln --notag
-        run: dotnet aardpack src\Aardvark.Rendering.NoExamples.slnf --notag
+        run: dotnet aardpack src\Aardvark.Rendering.sln --notag
       - name: Upload Packages
         uses: actions/upload-artifact@v4
         with:

diff --git a/paket.dependencies b/paket.dependencies
@@ -46,17 +46,17 @@ nuget Silk.NET.Direct3D9                            = 2.15.0
 nuget SharpZipLib                                   ~> 1.4.1
 
 // 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
+nuget Aardvark.PixImage.DevIL                       ~> 5.2.33
+nuget Aardvark.PixImage.ImageSharp                  ~> 2.0.1
+nuget Aardvark.Data.GLTF                            ~> 1.0.0
 
 group Test
     framework: net8.0
     source https://api.nuget.org/v3/index.json
 
     storage: none
 
-    //nuget Aardvark.PixImage.ImageSharp              ~> 2.0.1-prerelease0001
+    nuget Aardvark.PixImage.ImageSharp              ~> 2.0.1
 
     nuget Expecto                                   ~> 9.0.4
     nuget Expecto.FsCheck                           ~> 9.0.4

diff --git a/paket.lock b/paket.lock
@@ -51,6 +51,11 @@ NUGET
       FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
       FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
     Aardvark.Build (1.0.24)
+    Aardvark.Data.GLTF (1.0)
+      Aardvark.Base.Tensors (>= 5.3 < 5.4)
+      Aardvark.Rendering.Common (>= 5.5)
+      FSharp.Core (>= 8.0)
+      glTF2Loader (>= 1.1.4-alpha < 1.2.0-alpha)
     Aardvark.FontProvider (0.1)
       Aardvark.Base.Fonts (>= 5.3)
       FSharp.Core (>= 8.0.100)
@@ -63,13 +68,26 @@ NUGET
       FSharp.Data.Adaptive (>= 1.2 < 1.3)
       FsPickler (>= 5.3.2 < 5.4)
       Unofficial.LibTessDotNet (>= 2.0.2 < 2.1)
+    Aardvark.PixImage.DevIL (5.2.33)
+      Aardvark.Base.Tensors (>= 5.3 < 5.4)
+      DevILSharp
+    Aardvark.PixImage.ImageSharp (2.0.1)
+      Aardvark.Base.Tensors (>= 5.3 < 5.4)
+      FSharp.Core (>= 8.0)
+      SixLabors.ImageSharp (>= 2.1.9 < 2.2)
+    Aardvark.Rendering.Common (5.5)
+      Aardvark.Base (>= 5.3)
+      FSharp.Core (>= 8.0)
+      System.Reflection.Emit.Lightweight (>= 4.7)
     AssimpNet (5.0.0-beta1)
       NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net471) (< net35)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
     CommonMark.NET (0.15.1)
     CSharp.Data.Adaptive (1.2.15)
       FSharp.Core (>= 4.7)
       FSharp.Data.Adaptive (1.2.15)
       System.Reflection.Emit.Lightweight (>= 4.6)
+    DevILSharp (0.2.20)
+      FSharp.Core (>= 5.0)
     FShade (5.6)
       FShade.Core (5.6)
       FShade.GLSL (5.6)
@@ -150,6 +168,9 @@ NUGET
     FuzzySharp (2.0.2)
     GLSLangSharp (0.4.15)
       FSharp.Core (>= 5.0)
+    glTF2Loader (1.1.4-alpha)
+      NETStandard.Library (>= 1.6.1)
+      Newtonsoft.Json (>= 10.0.3)
     Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net6.0)) (== netstandard2.0)
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)
     Microsoft.Bcl.HashCode (1.1.1) - restriction: || (== net471) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)
@@ -168,7 +189,7 @@ NUGET
     Microsoft.NETFramework.ReferenceAssemblies (1.0)
       Microsoft.NETFramework.ReferenceAssemblies.net471 (>= 1.0) - restriction: || (== net471) (&& (== net8.0) (>= net471)) (&& (== net8.0-windows10.0.17763.0) (>= net471)) (&& (== netstandard2.0) (>= net471))
     Microsoft.NETFramework.ReferenceAssemblies.net471 (1.0.2) - restriction: || (== net471) (&& (== net8.0) (>= net471)) (&& (== net8.0-windows10.0.17763.0) (>= net471)) (&& (== netstandard2.0) (>= net471))
-    NETStandard.Library (2.0.3) - restriction: || (&& (== net471) (< net35)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
+    NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (13.0.1)
     Offler (2.1.1)
@@ -197,6 +218,12 @@ NUGET
     Silk.NET.Maths (2.21)
       Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (== net471) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)
       Ultz.Bcl.Half (>= 1.0) - restriction: || (== net471) (&& (== net8.0) (< net5.0)) (&& (== net8.0) (>= net6.0-android)) (&& (== net8.0) (>= net6.0-ios)) (&& (== net8.0) (< netcoreapp3.1)) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< net5.0)) (&& (== net8.0-windows10.0.17763.0) (>= net6.0-android)) (&& (== net8.0-windows10.0.17763.0) (>= net6.0-ios)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp3.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)
+    SixLabors.ImageSharp (2.1.9)
+      System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net8.0) (>= net472)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0-windows10.0.17763.0) (>= net472)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.1)) (== netstandard2.0)
+      System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net8.0) (>= net472)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0-windows10.0.17763.0) (>= net472)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.1)) (== netstandard2.0)
+      System.Numerics.Vectors (>= 4.5) - restriction: || (== net471) (&& (== net8.0) (>= net472)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0-windows10.0.17763.0) (>= net472)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.1)) (== netstandard2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 5.0)
+      System.Text.Encoding.CodePages (>= 5.0)
     System.Buffers (4.5.1)
     System.Collections (4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
@@ -313,6 +340,9 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
+    System.Text.Encoding.CodePages (8.0)
+      System.Memory (>= 4.5.5) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net6.0)) (== netstandard2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net6.0)) (&& (== net8.0-windows10.0.17763.0) (< net7.0)) (== netstandard2.0)
     System.Text.Encodings.Web (8.0)
       System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net6.0)) (== netstandard2.0)
       System.Memory (>= 4.5.5) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net6.0)) (== netstandard2.0)
@@ -354,6 +384,29 @@ STORAGE: NONE
 RESTRICTION: == net8.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
+    Aardvark.Base (5.3)
+      Aardvark.Base.Telemetry (5.3)
+      System.Collections.Immutable (>= 8.0)
+      System.Reflection.Metadata (>= 8.0)
+      System.Text.Json (>= 8.0.4)
+    Aardvark.Base.FSharp (5.3)
+      Aardvark.Base (5.3)
+      Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
+      FSharp.Core (>= 8.0)
+      FSharp.Data.Adaptive (>= 1.2 < 1.3)
+      FsPickler (>= 5.3.2 < 5.4)
+      System.Dynamic.Runtime (>= 4.3 < 4.4)
+    Aardvark.Base.Telemetry (5.3)
+    Aardvark.Base.Tensors (5.3)
+      Aardvark.Base (5.3)
+      Aardvark.Base.FSharp (5.3)
+      FSharp.Core (>= 8.0)
+    Aardvark.Base.TypeProviders (4.5.15)
+      FSharp.Core (>= 4.2.3)
+    Aardvark.PixImage.ImageSharp (2.0.1)
+      Aardvark.Base.Tensors (>= 5.3 < 5.4)
+      FSharp.Core (>= 8.0)
+      SixLabors.ImageSharp (>= 2.1.9 < 2.2)
     BenchmarkDotNet (0.13.12)
       BenchmarkDotNet.Annotations (>= 0.13.12)
       CommandLineParser (>= 2.9.1)
@@ -379,6 +432,12 @@ NUGET
     FsCheck (2.16.6)
       FSharp.Core (>= 4.2.3)
     FSharp.Core (8.0.301)
+    FSharp.Data.Adaptive (1.2.15)
+      FSharp.Core (>= 4.7)
+      System.Reflection.Emit.Lightweight (>= 4.6)
+    FsPickler (5.3.2)
+      FSharp.Core (>= 4.3.2)
+      System.Reflection.Emit.Lightweight (>= 4.3)
     Gee.External.Capstone (2.3)
     Hopac (0.5.1)
       FSharp.Core (>= 4.5.2)
@@ -411,6 +470,8 @@ NUGET
     Microsoft.NET.Test.Sdk (17.5)
       Microsoft.CodeCoverage (>= 17.5)
       Microsoft.TestPlatform.TestHost (>= 17.5)
+    Microsoft.NETCore.Platforms (7.0.4)
+    Microsoft.NETCore.Targets (5.0)
     Microsoft.TestPlatform.ObjectModel (17.10)
       System.Reflection.Metadata (>= 1.6)
     Microsoft.TestPlatform.TestHost (17.10)
@@ -423,17 +484,129 @@ NUGET
     Newtonsoft.Json (13.0.3)
     Perfolizer (0.2.1)
       System.Memory (>= 4.5.3)
+    SixLabors.ImageSharp (2.1.9)
+      System.Runtime.CompilerServices.Unsafe (>= 5.0)
+      System.Text.Encoding.CodePages (>= 5.0)
     System.CodeDom (8.0)
+    System.Collections (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
     System.Collections.Immutable (8.0)
+    System.Diagnostics.Debug (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Dynamic.Runtime (4.3)
+      System.Collections (>= 4.3)
+      System.Diagnostics.Debug (>= 4.3)
+      System.Linq (>= 4.3)
+      System.Linq.Expressions (>= 4.3)
+      System.ObjectModel (>= 4.3)
+      System.Reflection (>= 4.3)
+      System.Reflection.Emit (>= 4.3)
+      System.Reflection.Emit.ILGeneration (>= 4.3)
+      System.Reflection.Primitives (>= 4.3)
+      System.Reflection.TypeExtensions (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+      System.Threading (>= 4.3)
+    System.Globalization (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.IO (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+    System.Linq (4.3)
+      System.Collections (>= 4.3)
+      System.Diagnostics.Debug (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+    System.Linq.Expressions (4.3)
+      System.Collections (>= 4.3)
+      System.Diagnostics.Debug (>= 4.3)
+      System.Globalization (>= 4.3)
+      System.IO (>= 4.3)
+      System.Linq (>= 4.3)
+      System.ObjectModel (>= 4.3)
+      System.Reflection (>= 4.3)
+      System.Reflection.Emit (>= 4.3)
+      System.Reflection.Emit.ILGeneration (>= 4.3)
+      System.Reflection.Emit.Lightweight (>= 4.3)
+      System.Reflection.Extensions (>= 4.3)
+      System.Reflection.Primitives (>= 4.3)
+      System.Reflection.TypeExtensions (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+      System.Threading (>= 4.3)
     System.Management (8.0)
       System.CodeDom (>= 8.0)
     System.Memory (4.5.5)
+    System.ObjectModel (4.3)
+      System.Collections (>= 4.3)
+      System.Diagnostics.Debug (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Threading (>= 4.3)
+    System.Reflection (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.IO (>= 4.3)
+      System.Reflection.Primitives (>= 4.3)
+      System.Runtime (>= 4.3)
+    System.Reflection.Emit (4.7)
+    System.Reflection.Emit.ILGeneration (4.7)
+    System.Reflection.Emit.Lightweight (4.7)
+    System.Reflection.Extensions (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Reflection (>= 4.3)
+      System.Runtime (>= 4.3)
     System.Reflection.Metadata (8.0)
       System.Collections.Immutable (>= 8.0)
+    System.Reflection.Primitives (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
     System.Reflection.TypeExtensions (4.7)
+    System.Resources.ResourceManager (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Globalization (>= 4.3)
+      System.Reflection (>= 4.3)
+      System.Runtime (>= 4.3)
+    System.Runtime (4.3.1)
+      Microsoft.NETCore.Platforms (>= 1.1.1)
+      Microsoft.NETCore.Targets (>= 1.1.3)
     System.Runtime.CompilerServices.Unsafe (6.0)
+    System.Runtime.Extensions (4.3.1)
+      Microsoft.NETCore.Platforms (>= 1.1.1)
+      Microsoft.NETCore.Targets (>= 1.1.3)
+      System.Runtime (>= 4.3.1)
     System.Security.AccessControl (6.0.1)
     System.Security.Principal.Windows (5.0)
+    System.Text.Encoding (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Text.Encoding.CodePages (8.0)
+    System.Text.Encodings.Web (8.0)
+    System.Text.Json (8.0.4)
+      System.Text.Encodings.Web (>= 8.0)
+    System.Threading (4.3)
+      System.Runtime (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+    System.Threading.Tasks (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
     YoloDev.Expecto.TestSdk (0.13.3)
       Expecto (>= 9.0 < 10.0)
       FSharp.Core (>= 4.6.2)

diff --git a/src/Demo/Examples/paket.references b/src/Demo/Examples/paket.references
@@ -1,6 +1,6 @@
 Aardvark.Base.Essentials
 Aardvark.Base.Incremental
-//Aardvark.PixImage.ImageSharp
+Aardvark.PixImage.ImageSharp
 AssimpNet
 FShade.Core
 FShade.GLSL

diff --git a/src/Examples (netcore)/20 - VolumeRendering/paket.references b/src/Examples (netcore)/20 - VolumeRendering/paket.references
@@ -1,6 +1,6 @@
 Aardvark.Base.Essentials
 Aardvark.Base.Incremental
-//Aardvark.PixImage.ImageSharp
+Aardvark.PixImage.ImageSharp
 AssimpNet
 FShade.Core
 FShade.GLSL

diff --git a/src/Examples (netcore)/21 - LoD/paket.references b/src/Examples (netcore)/21 - LoD/paket.references
@@ -1,6 +1,6 @@
 Aardvark.Base.Essentials
 Aardvark.Base.Incremental
-//Aardvark.PixImage.ImageSharp
+Aardvark.PixImage.ImageSharp
 AssimpNet
 FShade.Core
 FShade.GLSL

diff --git a/src/Examples (netcore)/33 - Opc/paket.references b/src/Examples (netcore)/33 - Opc/paket.references
@@ -1,2 +1,2 @@
 FShade.Core
-//Aardvark.PixImage.DevIL
+Aardvark.PixImage.DevIL
diff --git a/src/Examples (netcore)/38 - GLTF/paket.references b/src/Examples (netcore)/38 - GLTF/paket.references
@@ -1,4 +1,4 @@
 Aardvark.Build
 FSharp.Core
-//Aardvark.Data.GLTF
-//Aardvark.PixImage.ImageSharp
+Aardvark.Data.GLTF
+Aardvark.PixImage.ImageSharp
diff --git a/src/Scratch (netcore)/04 - ManyTexts/Program.fs b/src/Scratch (netcore)/04 - ManyTexts/Program.fs
@@ -1,4 +1,5 @@
 open Aardvark.Base
+open Aardvark.Base.Fonts
 open Aardvark.Rendering
 open FSharp.Data.Adaptive
 open FSharp.Data.Adaptive.Operators

diff --git a/src/Scratch (netcore)/05 - ConjugateGradient/paket.references b/src/Scratch (netcore)/05 - ConjugateGradient/paket.references
@@ -1,6 +1,6 @@
 Aardvark.Base.Essentials
 Aardvark.Base.Incremental
-//Aardvark.PixImage.ImageSharp
+Aardvark.PixImage.ImageSharp
 
 AssimpNet
 FShade.Core

diff --git a/src/Tests/Aardvark.Rendering.Tests/paket.references b/src/Tests/Aardvark.Rendering.Tests/paket.references
@@ -1,5 +1,5 @@
 group Test
-	//Aardvark.PixImage.ImageSharp
+	Aardvark.PixImage.ImageSharp
 
 	Expecto
 	Expecto.FsCheck