diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 038f1ecb3..21449e9bd 100644 --- 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/global.json b/global.json index c2082dd6c..19f8dc216 100644 --- 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 index fe712c7c2..7252c9dee 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,57 +3,58 @@ 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-prerelease0002 +nuget Aardvark.Base.IO ~> 5.3.0-prerelease0002 +nuget Aardvark.Base.Incremental ~> 5.3.0-prerelease0002 +nuget Aardvark.Base.Essentials ~> 5.3.0-prerelease0002 +nuget Aardvark.Geometry ~> 5.3.0-prerelease0002 +nuget Aardvark.Base.Tensors ~> 5.3.0-prerelease0002 -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 SharpZipLib ~> 1.4.1 group Test -framework: net6.0 -source https://api.nuget.org/v3/index.json - -storage: none - -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.5.0 + framework: net8.0 + source https://api.nuget.org/v3/index.json + + storage: none + + 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 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 diff --git a/paket.lock b/paket.lock index 70e04202f..46c9d5161 100644 --- a/paket.lock +++ b/paket.lock @@ -1,152 +1,177 @@ STORAGE: NONE -RESTRICTION: || (== net471) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) +RESTRICTION: || (== net471) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardium (2.0.9) - FSharp.Core (>= 4.7) + Aardium (2.1.1-prerelease0001) + Aardvark.Base (>= 5.3.0-prerelease0002 < 5.4.0-prerelease) + FSharp.Core (>= 8.0) FSys (>= 0.0.1 < 0.1) - Aardvark.Assembler (0.0.8) - Aardvark.Base (>= 5.2.7 < 5.3) - Aardvark.Base.Runtime (>= 5.2.7 < 5.3) - FSharp.Core (>= 5.0) + Aardvark.Assembler (0.1.0-prerelease0001) + Aardvark.Base.FSharp (>= 5.3.0-prerelease0002) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Base (5.2.28) - Aardvark.Base.Telemetry (5.2.28) - System.Collections.Immutable (>= 5.0) - System.Reflection.Metadata (>= 5.0) - restriction: || (== net471) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Text.Json (>= 4.7.2) - Aardvark.Base.Essentials (5.2.28) - Aardvark.Base (5.2.28) - System.Collections.Immutable (>= 5.0) - Aardvark.Base.FSharp (5.2.28) - Aardvark.Base (5.2.28) + Aardvark.Base (5.3.0-prerelease0002) + Aardvark.Base.Telemetry (5.3.0-prerelease0002) + System.Collections.Immutable (>= 8.0) + System.Reflection.Metadata (>= 8.0) - restriction: || (== net471) (&& (== net8.0) (< netcoreapp3.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Json (>= 8.0.4) + Aardvark.Base.Essentials (5.3.0-prerelease0002) + Aardvark.Base (5.3.0-prerelease0002) + System.Collections.Immutable (>= 8.0) + Aardvark.Base.FSharp (5.3.0-prerelease0002) + Aardvark.Base (5.3.0-prerelease0002) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + 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.Incremental (5.2.28) - Aardvark.Base (5.2.28) - Aardvark.Base.FSharp (5.2.28) + Aardvark.Base.Incremental (5.3.0-prerelease0002) + Aardvark.Base (5.3.0-prerelease0002) + Aardvark.Base.FSharp (5.3.0-prerelease0002) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) - Aardvark.Base.IO (5.2.28) - Aardvark.Base (5.2.28) - Aardvark.Base.Tensors (5.2.28) + Aardvark.Base.IO (5.3.0-prerelease0002) + Aardvark.Base (5.3.0-prerelease0002) + Aardvark.Base.Tensors (5.3.0-prerelease0002) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Runtime (5.2.28) - Aardvark.Base.FSharp (5.2.28) - Aardvark.Base.Incremental (5.2.28) - Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) - FSharp.Data.Adaptive (>= 1.2 < 1.3) - FsPickler (>= 5.3.2 < 5.4) - Aardvark.Base.Telemetry (5.2.28) - Aardvark.Base.Tensors (5.2.28) - Aardvark.Base (5.2.28) - Aardvark.Base.FSharp (5.2.28) - FSharp.Core (>= 5.0) - SixLabors.ImageSharp (>= 2.1.3 < 2.2) + Aardvark.Base.Telemetry (5.3.0-prerelease0002) + Aardvark.Base.Tensors (5.3.0-prerelease0002) + Aardvark.Base (5.3.0-prerelease0002) + Aardvark.Base.FSharp (5.3.0-prerelease0002) + FSharp.Core (>= 8.0) Aardvark.Base.TypeProviders (4.5.15) - FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net6.0) (>= net45)) (&& (== net6.0-windows7.0) (>= net45)) (&& (== netstandard2.0) (>= net45)) - FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Aardvark.Build (1.0.21) - Aardvark.Geometry (5.2.28) - Aardvark.Base (5.2.28) - Aardvark.Base.FSharp (5.2.28) - Aardvark.Base.Tensors (5.2.28) + 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.Geometry (5.3.0-prerelease0002) + Aardvark.Base (5.3.0-prerelease0002) + Aardvark.Base.FSharp (5.3.0-prerelease0002) + Aardvark.Base.Tensors (5.3.0-prerelease0002) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) AssimpNet (5.0.0-beta1) - NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net471) (< net35)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + 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.14) + CSharp.Data.Adaptive (1.2.15) FSharp.Core (>= 4.7) - FSharp.Data.Adaptive (1.2.14) + FSharp.Data.Adaptive (1.2.15) System.Reflection.Emit.Lightweight (>= 4.6) - FShade (5.5.3) - FShade.Core (5.5.3) - FShade.GLSL (5.5.3) - FShade.Imperative (5.5.3) - FShade.SpirV (5.5.3) - FShade.Core (5.5.3) - Aardvark.Base (>= 5.2.19 < 5.3) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FShade.Imperative (5.5.3) - FSharp.Core (>= 5.0) - FShade.Debug (5.5.3) - Aardvark.Base (>= 5.2.19 < 5.3) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FShade.Core (5.5.3) - FShade.Imperative (5.5.3) - FSharp.Core (>= 5.0) - FShade.GLSL (5.5.3) - Aardvark.Base (>= 5.2.19 < 5.3) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FShade.Core (5.5.3) - FShade.Imperative (5.5.3) - FSharp.Core (>= 5.0) - FShade.Imperative (5.5.3) - Aardvark.Base (>= 5.2.19 < 5.3) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FSharp.Core (>= 5.0) + FShade (5.6.0-prerelease0001) + FShade.Core (5.6.0-prerelease0001) + FShade.GLSL (5.6.0-prerelease0001) + FShade.Imperative (5.6.0-prerelease0001) + FShade.SpirV (5.6.0-prerelease0001) + FShade.Core (5.6.0-prerelease0001) + Aardvark.Base (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + Aardvark.Base.FSharp (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + FShade.Imperative (5.6.0-prerelease0001) + FSharp.Core (>= 8.0) + FShade.Debug (5.6.0-prerelease0001) + Aardvark.Base (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + Aardvark.Base.FSharp (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + FShade.Core (5.6.0-prerelease0001) + FShade.Imperative (5.6.0-prerelease0001) + FSharp.Core (>= 8.0) + FShade.GLSL (5.6.0-prerelease0001) + Aardvark.Base (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + Aardvark.Base.FSharp (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + FShade.Core (5.6.0-prerelease0001) + FShade.Imperative (5.6.0-prerelease0001) + FSharp.Core (>= 8.0) + FShade.Imperative (5.6.0-prerelease0001) + Aardvark.Base (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + Aardvark.Base.FSharp (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + FSharp.Core (>= 8.0) FsPickler (>= 5.3.2 < 5.4) - FShade.SpirV (5.5.3) - Aardvark.Base (>= 5.2.19 < 5.3) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FShade.Core (5.5.3) - FShade.Imperative (5.5.3) - FSharp.Core (>= 5.0) - FSharp.Core (5.0.1) - FSharp.Data (4.2.10) - FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (1.2.14) + FShade.SpirV (5.6.0-prerelease0001) + Aardvark.Base (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + Aardvark.Base.FSharp (>= 5.3.0-prerelease0001 < 5.4.0-prerelease) + FShade.Core (5.6.0-prerelease0001) + FShade.Imperative (5.6.0-prerelease0001) + FSharp.Core (>= 8.0) + FSharp.Core (8.0.100) + FSharp.Data (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Csv.Core (>= 6.4) + FSharp.Data.Html.Core (>= 6.4) + FSharp.Data.Http (>= 6.4) + FSharp.Data.Json.Core (>= 6.4) + FSharp.Data.Runtime.Utilities (>= 6.4) + FSharp.Data.WorldBank.Core (>= 6.4) + FSharp.Data.Xml.Core (>= 6.4) + FSharp.Data.Adaptive (1.2.15) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) + FSharp.Data.Csv.Core (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Runtime.Utilities (>= 6.4) + FSharp.Data.Html.Core (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Csv.Core (>= 6.4) + FSharp.Data.Runtime.Utilities (>= 6.4) + FSharp.Data.Http (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Json.Core (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Http (>= 6.4) + FSharp.Data.Runtime.Utilities (>= 6.4) + FSharp.Data.Runtime.Utilities (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Http (>= 6.4) + FSharp.Data.WorldBank.Core (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Http (>= 6.4) + FSharp.Data.Json.Core (>= 6.4) + FSharp.Data.Runtime.Utilities (>= 6.4) + FSharp.Data.Xml.Core (6.4) + FSharp.Core (>= 6.0.1) + FSharp.Data.Http (>= 6.4) + FSharp.Data.Json.Core (>= 6.4) + FSharp.Data.Runtime.Utilities (>= 6.4) FsPickler (5.3.2) FSharp.Core (>= 4.3.2) - System.Reflection.Emit.Lightweight (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + System.Reflection.Emit.Lightweight (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) FSys (0.0.1) FSharp.Core (>= 4.7) GLSLangSharp (0.4.15) FSharp.Core (>= 5.0) - Microsoft.Bcl.AsyncInterfaces (6.0) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.Bcl.HashCode (1.1.1) - restriction: || (== net471) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + 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) Microsoft.CSharp (4.7) Microsoft.DotNet.PlatformAbstractions (3.1.6) - System.Runtime.InteropServices.RuntimeInformation (>= 4.0) - restriction: || (== net471) (&& (== net6.0) (>= net45)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= net45)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== netstandard2.0) (>= net45)) + System.Runtime.InteropServices.RuntimeInformation (>= 4.0) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== netstandard2.0) (>= net45)) Microsoft.Extensions.DependencyModel (6.0) System.Buffers (>= 4.5.1) System.Memory (>= 4.5.4) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Runtime.InteropServices.RuntimeInformation (>= 4.3) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + System.Runtime.InteropServices.RuntimeInformation (>= 4.3) - restriction: || (== net471) (&& (== net8.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) System.Text.Encodings.Web (>= 6.0) System.Text.Json (>= 6.0) - Microsoft.NETCore.Platforms (6.0.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + Microsoft.NETCore.Platforms (6.0.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) Microsoft.NETFramework.ReferenceAssemblies (1.0) - Microsoft.NETFramework.ReferenceAssemblies.net471 (>= 1.0) - restriction: || (== net471) (&& (== net6.0) (>= net471)) (&& (== net6.0-windows7.0) (>= net471)) (&& (== netstandard2.0) (>= net471)) - Microsoft.NETFramework.ReferenceAssemblies.net471 (1.0.2) - restriction: || (== net471) (&& (== net6.0) (>= net471)) (&& (== net6.0-windows7.0) (>= net471)) (&& (== netstandard2.0) (>= net471)) - NETStandard.Library (2.0.3) - restriction: || (&& (== net471) (< net35)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.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) Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.1) - Offler (2.0.9) - Aardium (2.0.9) - Aardvark.Base.Tensors (>= 5.1.9) - FSharp.Core (>= 4.7) + Offler (2.1.1-prerelease0001) + Aardium (2.1.1-prerelease0001) + Aardvark.Base.Tensors (>= 5.3.0-prerelease0002 < 5.4.0-prerelease) + FSharp.Core (>= 8.0) FSys (>= 0.0.1 < 0.1) - Newtonsoft.Json (>= 12.0.3) + Newtonsoft.Json (>= 13.0) SharpZipLib (1.4.2) - System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (>= 4.5.2) - restriction: || (== net471) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.2) - restriction: || (== net471) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0) Silk.NET.Core (2.15) - Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (== net471) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.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) Microsoft.CSharp (>= 4.7) Microsoft.DotNet.PlatformAbstractions (>= 3.1.6) Microsoft.Extensions.DependencyModel (>= 5.0) @@ -160,158 +185,149 @@ NUGET Silk.NET.Core (>= 2.15) Ultz.Native.GLFW (>= 3.3.3.1) Silk.NET.Maths (2.21) - Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (== net471) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - Ultz.Bcl.Half (>= 1.0) - restriction: || (== net471) (&& (== net6.0) (< net5.0)) (&& (== net6.0) (>= net6.0-android)) (&& (== net6.0) (>= net6.0-ios)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< net5.0)) (&& (== net6.0-windows7.0) (>= net6.0-android)) (&& (== net6.0-windows7.0) (>= net6.0-ios)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - SixLabors.ImageSharp (2.1.3) - System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (== net471) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - System.Text.Encoding.CodePages (>= 5.0) + 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) System.Buffers (4.5.1) - System.Collections (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Collections.Immutable (6.0) - System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< net6.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Diagnostics.Debug (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + 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) + 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.Collections.Immutable (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.Diagnostics.Debug (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) + 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.Dynamic.Runtime (4.3) - System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Linq (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Linq.Expressions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.ObjectModel (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Emit (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Primitives (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Globalization (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.IO (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Text.Encoding (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Linq (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Linq.Expressions (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Globalization (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.IO (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Linq (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.ObjectModel (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Emit (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Emit.Lightweight (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Primitives (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Linq (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Linq.Expressions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.ObjectModel (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Emit (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Primitives (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Resources.ResourceManager (>= 4.3) - 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.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Threading (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Globalization (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) + 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.IO (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) + 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 (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Linq (4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Resources.ResourceManager (>= 4.3) - 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.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Linq.Expressions (4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Globalization (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.IO (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Linq (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.ObjectModel (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Emit (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Emit.Lightweight (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Primitives (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Resources.ResourceManager (>= 4.3) - 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.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Threading (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) System.Memory (4.5.5) - System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net6.0-windows7.0) (>= monotouch)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netstandard1.1)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= xamarinios)) (&& (== net6.0-windows7.0) (>= xamarinmac)) (&& (== net6.0-windows7.0) (>= xamarintvos)) (&& (== net6.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net471) (== net6.0)) (&& (== net471) (== net6.0-windows7.0)) (&& (== net471) (< net45)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net471) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net6.0-windows7.0) (>= monotouch)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (< netstandard1.1)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= uap10.1)) (&& (== net6.0-windows7.0) (>= xamarinios)) (&& (== net6.0-windows7.0) (>= xamarinmac)) (&& (== net6.0-windows7.0) (>= xamarintvos)) (&& (== net6.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (&& (== net8.0-windows10.0.17763.0) (>= monotouch)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinios)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinmac)) (&& (== net8.0-windows10.0.17763.0) (>= xamarintvos)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net471) (== net8.0)) (&& (== net471) (== net8.0-windows10.0.17763.0)) (&& (== net471) (< net45)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.5) - restriction: || (== net471) (&& (== net8.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net471) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (&& (== net8.0-windows10.0.17763.0) (>= monotouch)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinios)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinmac)) (&& (== net8.0-windows10.0.17763.0) (>= xamarintvos)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (4.5) - System.ObjectModel (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.IO (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Primitives (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Emit (4.7) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (== net6.0)) (&& (== net471) (== net6.0-windows7.0)) (&& (== net471) (< net45)) (&& (== net471) (< netstandard1.1)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (>= uap10.1)) (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0-windows7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard1.1)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= uap10.1)) (== netstandard2.0) - System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net471) (< net45)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (< portable-net45+wp8)) (&& (== net471) (>= uap10.1)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + System.ObjectModel (4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Collections (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Resources.ResourceManager (>= 4.3) - 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.Threading (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection (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) + Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.IO (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Primitives (>= 4.3) - 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.Reflection.Emit (4.7) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (== net8.0)) (&& (== net471) (== net8.0-windows10.0.17763.0)) (&& (== net471) (< net45)) (&& (== net471) (< netstandard1.1)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (>= uap10.1)) (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net471) (< net45)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (< portable-net45+wp8)) (&& (== net471) (>= uap10.1)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) System.Reflection.Emit.Lightweight (4.7) - System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (== net6.0)) (&& (== net471) (== net6.0-windows7.0)) (&& (== net471) (< net45)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (< portable-net45+wp8)) (&& (== net471) (>= uap10.1)) (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (< portable-net45+wp8)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0-windows7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (< portable-net45+wp8)) (&& (== net6.0-windows7.0) (>= uap10.1)) (== netstandard2.0) - System.Reflection.Extensions (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.Metadata (6.0.1) - restriction: || (== net471) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Collections.Immutable (>= 6.0) - System.Reflection.Primitives (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection.TypeExtensions (4.7) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Resources.ResourceManager (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Globalization (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Reflection (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (4.3.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (== net8.0)) (&& (== net471) (== net8.0-windows10.0.17763.0)) (&& (== net471) (< net45)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (< portable-net45+wp8)) (&& (== net471) (>= uap10.1)) (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (< portable-net45+wp8)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (< portable-net45+wp8)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (== netstandard2.0) + System.Reflection.Extensions (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) + Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection (>= 4.3) - 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.Reflection.Metadata (8.0) - restriction: || (== net471) (&& (== net8.0) (< netcoreapp3.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Collections.Immutable (>= 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.Reflection.Primitives (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) + 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.Reflection.TypeExtensions (4.7) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Resources.ResourceManager (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) + Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Globalization (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Reflection (>= 4.3) - 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.Runtime (4.3.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (6.0) - System.Runtime.Extensions (4.3.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) - System.Text.Encoding (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Text.Encoding.CodePages (6.0) - System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (6.0) - System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.4) - Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.ValueTuple (>= 4.5) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) - System.Threading (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading.Tasks (4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading.Tasks.Extensions (4.5.4) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (< netstandard1.0)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= wp8)) (== netstandard2.0) - System.ValueTuple (4.5) - restriction: || (== net471) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) - Ultz.Bcl.Half (1.0) - restriction: || (== net471) (&& (== net6.0) (< net5.0)) (&& (== net6.0) (>= net6.0-android)) (&& (== net6.0) (>= net6.0-ios)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< net5.0)) (&& (== net6.0-windows7.0) (>= net6.0-android)) (&& (== net6.0-windows7.0) (>= net6.0-ios)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - Ultz.Bcl.Half.Fallback (>= 1.0) - restriction: || (== net471) (&& (== net6.0) (< net5.0)) (&& (== net6.0-windows7.0) (< net5.0)) (== netstandard2.0) - Ultz.Bcl.Half.Fallback (1.0) - restriction: || (== net471) (&& (== net6.0) (< net5.0)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< net5.0)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + System.Runtime.Extensions (4.3.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Runtime (>= 4.3.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (== net471) (&& (== net8.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + System.Text.Encoding (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) + 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.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) + 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.Json (8.0.4) + 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.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) + 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.Threading.Tasks.Extensions (>= 4.5.4) - 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.ValueTuple (>= 4.5) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== netstandard2.0) (>= net462)) + System.Threading (4.3) - 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.Threading.Tasks (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) + System.Threading.Tasks (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) + 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.Threading.Tasks.Extensions (4.5.4) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net6.0)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net471) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.0)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= wp8)) (== netstandard2.0) + System.ValueTuple (4.5) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== netstandard2.0) (>= net462)) + 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) + Ultz.Bcl.Half.Fallback (>= 1.0) - restriction: || (== net471) (&& (== net8.0) (< net5.0)) (&& (== net8.0-windows10.0.17763.0) (< net5.0)) (== netstandard2.0) + Ultz.Bcl.Half.Fallback (1.0) - restriction: || (== net471) (&& (== net8.0) (< net5.0)) (&& (== net8.0) (< netcoreapp3.1)) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< net5.0)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp3.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0) System.Memory (>= 4.5.4) System.Runtime.CompilerServices.Unsafe (>= 4.7.1) Ultz.Native.GLFW (3.3.3.1) @@ -325,26 +341,21 @@ NUGET GROUP Test STORAGE: NONE -RESTRICTION: == net6.0 +RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - BenchmarkDotNet (0.13.1) - BenchmarkDotNet.Annotations (>= 0.13.1) - CommandLineParser (>= 2.4.3) - Iced (>= 1.8) - Microsoft.CodeAnalysis.CSharp (>= 2.10) - Microsoft.Diagnostics.NETCore.Client (>= 0.2.61701) - Microsoft.Diagnostics.Runtime (>= 1.1.126102) - Microsoft.Diagnostics.Tracing.TraceEvent (>= 2.0.61) - Microsoft.DotNet.PlatformAbstractions (>= 2.1) - Microsoft.Win32.Registry (>= 4.5) - Perfolizer (>= 0.2.1) - System.Management (>= 4.5) - System.Reflection.Emit (>= 4.3) - System.Reflection.Emit.Lightweight (>= 4.3) - System.Threading.Tasks.Extensions (>= 4.5.2) - System.ValueTuple (>= 4.5) - BenchmarkDotNet.Annotations (0.13.1) + BenchmarkDotNet (0.13.12) + BenchmarkDotNet.Annotations (>= 0.13.12) + CommandLineParser (>= 2.9.1) + Gee.External.Capstone (>= 2.3) + Iced (>= 1.17) + Microsoft.CodeAnalysis.CSharp (>= 4.1) + Microsoft.Diagnostics.Runtime (>= 2.2.332302) + Microsoft.Diagnostics.Tracing.TraceEvent (>= 3.0.2) + Microsoft.DotNet.PlatformAbstractions (>= 3.1.6) + Perfolizer (0.2.1) + System.Management (>= 5.0) + BenchmarkDotNet.Annotations (0.13.12) CommandLineParser (2.9.1) Expecto (9.0.4) FSharp.Core (>= 4.6) @@ -357,11 +368,11 @@ NUGET Hopac (>= 0.4.1) FsCheck (2.16.5) FSharp.Core (>= 4.2.3) - FSharp.Core (5.0.1) + FSharp.Core (8.0.100) + Gee.External.Capstone (2.3) Hopac (0.5.1) FSharp.Core (>= 4.5.2) Iced (1.17) - Microsoft.Bcl.AsyncInterfaces (6.0) Microsoft.CodeAnalysis.Analyzers (3.3.3) Microsoft.CodeAnalysis.Common (4.2) Microsoft.CodeAnalysis.Analyzers (>= 3.3.3) @@ -374,32 +385,17 @@ NUGET Microsoft.CodeAnalysis.CSharp (4.2) Microsoft.CodeAnalysis.Common (4.2) Microsoft.CodeCoverage (17.5) - Microsoft.Diagnostics.NETCore.Client (0.2.328102) - Microsoft.Bcl.AsyncInterfaces (>= 1.1) - Microsoft.Extensions.Logging (>= 2.1.1) - Microsoft.Diagnostics.Runtime (2.1.327703) - Microsoft.Diagnostics.NETCore.Client (>= 0.2.251802) - System.Collections.Immutable (>= 5.0) + Microsoft.Diagnostics.NETCore.Client (0.2.532401) + Microsoft.Extensions.Logging.Abstractions (>= 6.0.4) + Microsoft.Diagnostics.Runtime (3.1.512801) + Microsoft.Diagnostics.NETCore.Client (>= 0.2.410101) + Microsoft.Diagnostics.Tracing.TraceEvent (3.1.8) + Microsoft.Win32.Registry (>= 4.4) System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.Diagnostics.Tracing.TraceEvent (3.0.1) - System.Runtime.CompilerServices.Unsafe (>= 4.5.2) Microsoft.DotNet.PlatformAbstractions (3.1.6) - Microsoft.Extensions.DependencyInjection (6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (6.0) - Microsoft.Extensions.Logging (6.0) - Microsoft.Extensions.DependencyInjection (>= 6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - Microsoft.Extensions.Logging.Abstractions (>= 6.0) - Microsoft.Extensions.Options (>= 6.0) - System.Diagnostics.DiagnosticSource (>= 6.0) - Microsoft.Extensions.Logging.Abstractions (6.0.1) - Microsoft.Extensions.Options (6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - Microsoft.Extensions.Primitives (>= 6.0) - Microsoft.Extensions.Primitives (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) + Microsoft.Extensions.DependencyInjection.Abstractions (8.0.1) + Microsoft.Extensions.Logging.Abstractions (8.0.1) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.1) Microsoft.NET.Test.Sdk (17.5) Microsoft.CodeCoverage (>= 17.5) Microsoft.TestPlatform.TestHost (>= 17.5) @@ -418,24 +414,18 @@ NUGET Perfolizer (0.2.1) System.Memory (>= 4.5.3) System.CodeDom (6.0) - System.Collections.Immutable (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Diagnostics.DiagnosticSource (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Collections.Immutable (8.0) System.Management (6.0) System.CodeDom (>= 6.0) System.Memory (4.5.5) - System.Reflection.Emit (4.7) - System.Reflection.Emit.Lightweight (4.7) - System.Reflection.Metadata (6.0.1) - System.Collections.Immutable (>= 6.0) + System.Reflection.Metadata (8.0) + System.Collections.Immutable (>= 8.0) System.Runtime.CompilerServices.Unsafe (6.0) System.Security.AccessControl (6.0) System.Security.Principal.Windows (5.0) System.Text.Encoding.CodePages (6.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Threading.Tasks.Extensions (4.5.4) - System.ValueTuple (4.5) YoloDev.Expecto.TestSdk (0.13.3) Expecto (>= 9.0 < 10.0) FSharp.Core (>= 4.6.2) diff --git a/src/Aardvark.Rendering.GL/Management/AssemblerExtensions.fs b/src/Aardvark.Rendering.GL/Management/AssemblerExtensions.fs index 95b7e0fb0..022edf4ce 100644 --- a/src/Aardvark.Rendering.GL/Management/AssemblerExtensions.fs +++ b/src/Aardvark.Rendering.GL/Management/AssemblerExtensions.fs @@ -2,9 +2,8 @@ open Aardvark.Base open Aardvark.Rendering +open Aardvark.Assembler open FSharp.Data.Adaptive -open Aardvark.Rendering.ShaderReflection -open Aardvark.Base.Runtime open Microsoft.FSharp.NativeInterop open OpenTK.Graphics.OpenGL4 open Aardvark.Rendering.GL diff --git a/src/Aardvark.Rendering.GL/Management/PreparedRenderObject.fs b/src/Aardvark.Rendering.GL/Management/PreparedRenderObject.fs index e9650a466..8c1609d48 100644 --- a/src/Aardvark.Rendering.GL/Management/PreparedRenderObject.fs +++ b/src/Aardvark.Rendering.GL/Management/PreparedRenderObject.fs @@ -11,7 +11,7 @@ open Aardvark.Rendering open Microsoft.FSharp.NativeInterop open OpenTK.Graphics.OpenGL4 open Aardvark.Rendering.GL -open Aardvark.Base.Runtime +open Aardvark.Assembler open FShade.GLSL open System.Threading diff --git a/src/Aardvark.Rendering.GL/Resources/Textures/StreamingTexture.fs b/src/Aardvark.Rendering.GL/Resources/Textures/StreamingTexture.fs index 1b60d4490..99fbec1d7 100644 --- a/src/Aardvark.Rendering.GL/Resources/Textures/StreamingTexture.fs +++ b/src/Aardvark.Rendering.GL/Resources/Textures/StreamingTexture.fs @@ -171,39 +171,38 @@ type StreamingTextureOld(ctx : Context, mipMap : bool) = gc.Free() match pixelType with - | PixelType.UnsignedByte -> - match pixelFormat with - | PixelFormat.Rgba -> C4b(data.[0], data.[1], data.[2], data.[3]).ToC4f() - | PixelFormat.Bgra -> C4b(data.[2], data.[1], data.[0], data.[3]).ToC4f() - | PixelFormat.Rgb -> C4b(data.[0], data.[1], data.[2], 255uy).ToC4f() - | PixelFormat.Bgr -> C4b(data.[2], data.[1], data.[0], 255uy).ToC4f() - | PixelFormat.Luminance -> C4b(data.[0], data.[0], data.[0], 255uy).ToC4f() - | PixelFormat.Alpha -> C4b(0uy, 0uy, 0uy, data.[0]).ToC4f() - | PixelFormat.Red -> C4b(data.[0], 0uy, 0uy, 255uy).ToC4f() - | PixelFormat.Green -> C4b(0uy, data.[0], 0uy, 255uy).ToC4f() - | PixelFormat.Blue -> C4b(0uy, 0uy, data.[0], 255uy).ToC4f() - | PixelFormat.LuminanceAlpha -> C4b(data.[0], data.[0], data.[0], data.[1]).ToC4f() - | _ -> failwithf "[GL] unsupported format %A" pixelFormat - - | PixelType.UnsignedShort -> - let data = data.UnsafeCoerce() - match pixelFormat with - | PixelFormat.Rgba -> C4us(data.[0], data.[1], data.[2], data.[3]).ToC4f() - | PixelFormat.Bgra -> C4us(data.[2], data.[1], data.[0], data.[3]).ToC4f() - | PixelFormat.Rgb -> C4us(data.[0], data.[1], data.[2], 65535us).ToC4f() - | PixelFormat.Bgr -> C4us(data.[2], data.[1], data.[0], 65535us).ToC4f() - | PixelFormat.Luminance -> C4us(data.[0], data.[0], data.[0], 65535us).ToC4f() - | PixelFormat.Alpha -> C4us(0us, 0us, 0us, data.[0]).ToC4f() - | PixelFormat.Red -> C4us(data.[0], 0us, 0us, 65535us).ToC4f() - | PixelFormat.Green -> C4us(0us, data.[0], 0us, 65535us).ToC4f() - | PixelFormat.Blue -> C4us(0us, 0us, data.[0], 65535us).ToC4f() - | PixelFormat.LuminanceAlpha -> C4us(data.[0], data.[0], data.[0], data.[1]).ToC4f() - | _ -> failwithf "[GL] unsupported format %A" pixelFormat - - - - | _ -> - failwithf "[GL] unsupported type %A" pixelType + | PixelType.UnsignedByte -> + match pixelFormat with + | PixelFormat.Rgba -> C4b(data.[0], data.[1], data.[2], data.[3]).ToC4f() + | PixelFormat.Bgra -> C4b(data.[2], data.[1], data.[0], data.[3]).ToC4f() + | PixelFormat.Rgb -> C4b(data.[0], data.[1], data.[2], 255uy).ToC4f() + | PixelFormat.Bgr -> C4b(data.[2], data.[1], data.[0], 255uy).ToC4f() + | PixelFormat.Luminance -> C4b(data.[0], data.[0], data.[0], 255uy).ToC4f() + | PixelFormat.Alpha -> C4b(0uy, 0uy, 0uy, data.[0]).ToC4f() + | PixelFormat.Red -> C4b(data.[0], 0uy, 0uy, 255uy).ToC4f() + | PixelFormat.Green -> C4b(0uy, data.[0], 0uy, 255uy).ToC4f() + | PixelFormat.Blue -> C4b(0uy, 0uy, data.[0], 255uy).ToC4f() + | PixelFormat.LuminanceAlpha -> C4b(data.[0], data.[0], data.[0], data.[1]).ToC4f() + | _ -> failwithf "[GL] unsupported format %A" pixelFormat + + | PixelType.UnsignedShort -> + let data = data.AsCastSpan<_, uint16>() + + match pixelFormat with + | PixelFormat.Rgba -> C4us(data.[0], data.[1], data.[2], data.[3]).ToC4f() + | PixelFormat.Bgra -> C4us(data.[2], data.[1], data.[0], data.[3]).ToC4f() + | PixelFormat.Rgb -> C4us(data.[0], data.[1], data.[2], 65535us).ToC4f() + | PixelFormat.Bgr -> C4us(data.[2], data.[1], data.[0], 65535us).ToC4f() + | PixelFormat.Luminance -> C4us(data.[0], data.[0], data.[0], 65535us).ToC4f() + | PixelFormat.Alpha -> C4us(0us, 0us, 0us, data.[0]).ToC4f() + | PixelFormat.Red -> C4us(data.[0], 0us, 0us, 65535us).ToC4f() + | PixelFormat.Green -> C4us(0us, data.[0], 0us, 65535us).ToC4f() + | PixelFormat.Blue -> C4us(0us, 0us, data.[0], 65535us).ToC4f() + | PixelFormat.LuminanceAlpha -> C4us(data.[0], data.[0], data.[0], data.[1]).ToC4f() + | _ -> failwithf "[GL] unsupported format %A" pixelFormat + + | _ -> + failwithf "[GL] unsupported type %A" pixelType ) member x.Dispose() = @@ -430,39 +429,38 @@ type StreamingTexture(ctx : Context, mipMap : bool) = gc.Free() match pixelType with - | PixelType.UnsignedByte -> - match pixelFormat with - | PixelFormat.Rgba -> C4b(data.[0], data.[1], data.[2], data.[3]).ToC4f() - | PixelFormat.Bgra -> C4b(data.[2], data.[1], data.[0], data.[3]).ToC4f() - | PixelFormat.Rgb -> C4b(data.[0], data.[1], data.[2], 255uy).ToC4f() - | PixelFormat.Bgr -> C4b(data.[2], data.[1], data.[0], 255uy).ToC4f() - | PixelFormat.Luminance -> C4b(data.[0], data.[0], data.[0], 255uy).ToC4f() - | PixelFormat.Alpha -> C4b(0uy, 0uy, 0uy, data.[0]).ToC4f() - | PixelFormat.Red -> C4b(data.[0], 0uy, 0uy, 255uy).ToC4f() - | PixelFormat.Green -> C4b(0uy, data.[0], 0uy, 255uy).ToC4f() - | PixelFormat.Blue -> C4b(0uy, 0uy, data.[0], 255uy).ToC4f() - | PixelFormat.LuminanceAlpha -> C4b(data.[0], data.[0], data.[0], data.[1]).ToC4f() - | _ -> failwithf "[GL] unsupported format %A" pixelFormat - - | PixelType.UnsignedShort -> - let data = data.UnsafeCoerce() - match pixelFormat with - | PixelFormat.Rgba -> C4us(data.[0], data.[1], data.[2], data.[3]).ToC4f() - | PixelFormat.Bgra -> C4us(data.[2], data.[1], data.[0], data.[3]).ToC4f() - | PixelFormat.Rgb -> C4us(data.[0], data.[1], data.[2], 65535us).ToC4f() - | PixelFormat.Bgr -> C4us(data.[2], data.[1], data.[0], 65535us).ToC4f() - | PixelFormat.Luminance -> C4us(data.[0], data.[0], data.[0], 65535us).ToC4f() - | PixelFormat.Alpha -> C4us(0us, 0us, 0us, data.[0]).ToC4f() - | PixelFormat.Red -> C4us(data.[0], 0us, 0us, 65535us).ToC4f() - | PixelFormat.Green -> C4us(0us, data.[0], 0us, 65535us).ToC4f() - | PixelFormat.Blue -> C4us(0us, 0us, data.[0], 65535us).ToC4f() - | PixelFormat.LuminanceAlpha -> C4us(data.[0], data.[0], data.[0], data.[1]).ToC4f() - | _ -> failwithf "[GL] unsupported format %A" pixelFormat - - - - | _ -> - failwithf "[GL] unsupported type %A" pixelType + | PixelType.UnsignedByte -> + match pixelFormat with + | PixelFormat.Rgba -> C4b(data.[0], data.[1], data.[2], data.[3]).ToC4f() + | PixelFormat.Bgra -> C4b(data.[2], data.[1], data.[0], data.[3]).ToC4f() + | PixelFormat.Rgb -> C4b(data.[0], data.[1], data.[2], 255uy).ToC4f() + | PixelFormat.Bgr -> C4b(data.[2], data.[1], data.[0], 255uy).ToC4f() + | PixelFormat.Luminance -> C4b(data.[0], data.[0], data.[0], 255uy).ToC4f() + | PixelFormat.Alpha -> C4b(0uy, 0uy, 0uy, data.[0]).ToC4f() + | PixelFormat.Red -> C4b(data.[0], 0uy, 0uy, 255uy).ToC4f() + | PixelFormat.Green -> C4b(0uy, data.[0], 0uy, 255uy).ToC4f() + | PixelFormat.Blue -> C4b(0uy, 0uy, data.[0], 255uy).ToC4f() + | PixelFormat.LuminanceAlpha -> C4b(data.[0], data.[0], data.[0], data.[1]).ToC4f() + | _ -> failwithf "[GL] unsupported format %A" pixelFormat + + | PixelType.UnsignedShort -> + let data = data.AsCastSpan<_, uint16>() + + match pixelFormat with + | PixelFormat.Rgba -> C4us(data.[0], data.[1], data.[2], data.[3]).ToC4f() + | PixelFormat.Bgra -> C4us(data.[2], data.[1], data.[0], data.[3]).ToC4f() + | PixelFormat.Rgb -> C4us(data.[0], data.[1], data.[2], 65535us).ToC4f() + | PixelFormat.Bgr -> C4us(data.[2], data.[1], data.[0], 65535us).ToC4f() + | PixelFormat.Luminance -> C4us(data.[0], data.[0], data.[0], 65535us).ToC4f() + | PixelFormat.Alpha -> C4us(0us, 0us, 0us, data.[0]).ToC4f() + | PixelFormat.Red -> C4us(data.[0], 0us, 0us, 65535us).ToC4f() + | PixelFormat.Green -> C4us(0us, data.[0], 0us, 65535us).ToC4f() + | PixelFormat.Blue -> C4us(0us, 0us, data.[0], 65535us).ToC4f() + | PixelFormat.LuminanceAlpha -> C4us(data.[0], data.[0], data.[0], data.[1]).ToC4f() + | _ -> failwithf "[GL] unsupported format %A" pixelFormat + + | _ -> + failwithf "[GL] unsupported type %A" pixelType ) member x.Dispose() = diff --git a/src/Aardvark.Rendering.GL/Resources/Textures/TextureUpload.fs b/src/Aardvark.Rendering.GL/Resources/Textures/TextureUpload.fs index 3848a8da5..986d0deb5 100644 --- a/src/Aardvark.Rendering.GL/Resources/Textures/TextureUpload.fs +++ b/src/Aardvark.Rendering.GL/Resources/Textures/TextureUpload.fs @@ -208,7 +208,7 @@ module internal TextureUploadImplementation = let uploadPixImageCube (texture : Texture) (wantMipmap : bool) (baseLevel : int) (slice : int) (offset : V2i) (data : PixImageCube) = let generateMipmap = - wantMipmap && data.MipMapArray |> Array.forany (fun i -> i.LevelCount < texture.MipMapLevels) + wantMipmap && data.MipMapArray |> Array.exists (fun i -> i.LevelCount < texture.MipMapLevels) for i = 0 to 5 do let data = data.[unbox i] @@ -347,14 +347,14 @@ module ContextTextureUploadExtensions = this.CreateTexture(PixTexture2d(pi, info), properties) | PixTexture2D(info, data) -> - let texture = this |> Texture.createOfFormat2D data.PixFormat data.[0].Size data.LevelCount info + let texture = this |> Texture.createOfFormat2D data.BaseImage.PixFormat data.[0].Size data.LevelCount info Texture.uploadPixImageMipMap texture info.wantMipMaps 0 0 V2i.Zero data texture | PixTextureCube(info, data) -> let img = data.[CubeSide.NegativeX] let levels = data.MipMapArray |> Array.map (fun pi -> pi.LevelCount) |> Array.min - let texture = this |> Texture.createOfFormatCube img.PixFormat img.[0].Size.X levels info + let texture = this |> Texture.createOfFormatCube img.BaseImage.PixFormat img.[0].Size.X levels info Texture.uploadPixImageCube texture info.wantMipMaps 0 0 V2i.Zero data texture diff --git a/src/Aardvark.Rendering.GL/Runtime/Compute.fs b/src/Aardvark.Rendering.GL/Runtime/Compute.fs index 08ebe6b5a..e38f0bd60 100644 --- a/src/Aardvark.Rendering.GL/Runtime/Compute.fs +++ b/src/Aardvark.Rendering.GL/Runtime/Compute.fs @@ -1,7 +1,6 @@ namespace Aardvark.Rendering.GL open Aardvark.Base -open Aardvark.Base.Runtime open Aardvark.Base.Monads.State open Aardvark.Assembler open OpenTK.Graphics.OpenGL4 diff --git a/src/Aardvark.Rendering.GL/Runtime/GeometryPool.fs b/src/Aardvark.Rendering.GL/Runtime/GeometryPool.fs index d545b9cba..e7eadcbac 100644 --- a/src/Aardvark.Rendering.GL/Runtime/GeometryPool.fs +++ b/src/Aardvark.Rendering.GL/Runtime/GeometryPool.fs @@ -11,7 +11,7 @@ open Aardvark.Base open FSharp.Data.Adaptive open Aardvark.Rendering open Aardvark.Rendering.Management -open Aardvark.Base.Runtime +open Aardvark.Assembler open Aardvark.Rendering.GL #nowarn "9" @@ -1536,7 +1536,7 @@ type DrawPool(ctx : Context, alphaToCoverage : bool, bounds : bool, renderBounds let updateFun = Marshal.PinDelegate(new System.Action(this.Update)) let mutable oldCalls : list * nativeptr * VertexInputBindingHandle * array * IndirectBuffer> = [] let program = - new Aardvark.Assembler.FragmentProgram<_>(fun a (s : IAssemblerStream) -> compile a (AssemblerCommandStream s :> ICommandStream) |> ignore) + new FragmentProgram<_>(fun a (s : IAssemblerStream) -> compile a (AssemblerCommandStream s :> ICommandStream) |> ignore) //new ChangeableNativeProgram<_, _>((fun a s -> compile a (AssemblerCommandStream s)), NativeStats.Zero, (+), (-)) let puller = { new AdaptiveObject() with diff --git a/src/Aardvark.Rendering.GL/Runtime/RenderTasks.fs b/src/Aardvark.Rendering.GL/Runtime/RenderTasks.fs index ae2a5e619..da6201296 100644 --- a/src/Aardvark.Rendering.GL/Runtime/RenderTasks.fs +++ b/src/Aardvark.Rendering.GL/Runtime/RenderTasks.fs @@ -9,7 +9,7 @@ open System.Diagnostics open System.Collections.Generic open Aardvark.Base open Aardvark.Rendering -open Aardvark.Base.Runtime +open Aardvark.Assembler open FSharp.Data.Adaptive open OpenTK.Graphics.OpenGL4 open Microsoft.FSharp.NativeInterop @@ -244,9 +244,6 @@ module RenderTasks = let mutable program = new Aardvark.Assembler.FragmentProgram(compile) - let mutable stats = NativeProgramUpdateStatistics.Zero - member x.Count = stats.Count - member x.Update(token : AdaptiveToken) = x.EvaluateIfNeeded token () (fun token -> let ops = reader.GetChanges token @@ -278,24 +275,8 @@ module RenderTasks = member x.Dispose() = if not (isNull state) then program.Dispose() - stats <- NativeProgramUpdateStatistics.Zero state <- null reader <- Unchecked.defaultof<_> - - interface IAdaptiveProgram with - member x.Dispose() = x.Dispose() - member x.Disassemble() = null - member x.Run(_) = x.Run() - member x.Update(t) = x.Update(t); AdaptiveProgramStatistics.Zero - member x.StartDefragmentation() = Threading.Tasks.Task.FromResult(TimeSpan.Zero) - member x.AutoDefragmentation - with get() = false - and set _ = () - member x.FragmentCount = 10 - member x.NativeCallCount = 10 - member x.ProgramSizeInBytes = 10L - member x.TotalJumpDistanceInBytes = 10L - type StaticOrderSubTask(ctx : Context, scope : CompilerInfo, debug : bool) = diff --git a/src/Aardvark.Rendering.GL/Runtime/Runtime.fs b/src/Aardvark.Rendering.GL/Runtime/Runtime.fs index d9f571eef..d630ff4c8 100644 --- a/src/Aardvark.Rendering.GL/Runtime/Runtime.fs +++ b/src/Aardvark.Rendering.GL/Runtime/Runtime.fs @@ -588,13 +588,13 @@ type Runtime(debug : IDebugConfig) = let (pfmt, ptype) = TextureFormat.toFormatAndType format let cfmt = TextureFormat.toDownloadFormat format let res = PixImage.Create(cfmt, int64 size.X, int64 size.Y) - let gc = GCHandle.Alloc(res.Array, GCHandleType.Pinned) + let gc = GCHandle.Alloc(res.Data, GCHandleType.Pinned) try GL.ReadPixels(offset.X, src.Size.Y - size.Y - offset.Y, size.X, size.Y, pfmt, ptype, gc.AddrOfPinnedObject()) GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, 0) - res.Transformed(ImageTrafo.MirrorY) + res.TransformedPixImage(ImageTrafo.MirrorY) finally gc.Free() diff --git a/src/Aardvark.Rendering.GL/paket.references b/src/Aardvark.Rendering.GL/paket.references index 003869eef..eeaa00d55 100644 --- a/src/Aardvark.Rendering.GL/paket.references +++ b/src/Aardvark.Rendering.GL/paket.references @@ -1,5 +1,4 @@ Aardvark.Base.Incremental -Aardvark.Base.Runtime Aardvark.Base.Essentials Aardvark.Geometry FShade diff --git a/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj b/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj index 80547f7a3..f558fde0c 100644 --- a/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj +++ b/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj @@ -1,7 +1,7 @@ - net471;net6.0-windows + net471;net8.0-windows10.0.17763.0 Library true true diff --git a/src/Aardvark.Rendering.Interactive/LoadReferences.fsx b/src/Aardvark.Rendering.Interactive/LoadReferences.fsx index 82b92a021..6e1e81236 100644 --- a/src/Aardvark.Rendering.Interactive/LoadReferences.fsx +++ b/src/Aardvark.Rendering.Interactive/LoadReferences.fsx @@ -3,7 +3,6 @@ #r "Aardvark.Base.Essentials.dll" #r "Aardvark.Base.FSharp.dll" #r "Aardvark.Base.Incremental.dll" -#r "Aardvark.Base.Runtime.dll" #r "Aardvark.Rendering.dll" #r "FShade.dll" #r "FShade.Compiler.dll" diff --git a/src/Aardvark.Rendering.Interactive/paket.references b/src/Aardvark.Rendering.Interactive/paket.references index fa0be02f3..5ed3bdcfa 100644 --- a/src/Aardvark.Rendering.Interactive/paket.references +++ b/src/Aardvark.Rendering.Interactive/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime FShade.Core FShade.GLSL FSharp.Core diff --git a/src/Aardvark.Rendering.Vulkan.Wrapper/paket.references b/src/Aardvark.Rendering.Vulkan.Wrapper/paket.references index e356840be..1e69fc487 100644 --- a/src/Aardvark.Rendering.Vulkan.Wrapper/paket.references +++ b/src/Aardvark.Rendering.Vulkan.Wrapper/paket.references @@ -1,5 +1,4 @@ Aardvark.Base.Incremental -Aardvark.Base.Runtime Aardvark.Base.FSharp FSharp.Core Aardvark.Build \ No newline at end of file diff --git a/src/Aardvark.Rendering.Vulkan/Resources/Image/ImageUpload.fs b/src/Aardvark.Rendering.Vulkan/Resources/Image/ImageUpload.fs index c716b54d1..5e68a3ef6 100644 --- a/src/Aardvark.Rendering.Vulkan/Resources/Image/ImageUpload.fs +++ b/src/Aardvark.Rendering.Vulkan/Resources/Image/ImageUpload.fs @@ -150,7 +150,7 @@ module ImageUploadExtensions = buffers |> create levelCount let ofPixImageMipMaps (info : TextureParams) (pix : PixImageMipMap[]) (device : Device) = - let format = PixFormat.toTextureFormat info pix.[0].PixFormat + let format = PixFormat.toTextureFormat info pix.[0].BaseImage.PixFormat let levelCount = if info.wantMipMaps then Fun.MipmapLevels(pix.[0].[0].Size) else 1 diff --git a/src/Aardvark.Rendering.Vulkan/paket.references b/src/Aardvark.Rendering.Vulkan/paket.references index 72063e869..52f61f744 100644 --- a/src/Aardvark.Rendering.Vulkan/paket.references +++ b/src/Aardvark.Rendering.Vulkan/paket.references @@ -1,5 +1,4 @@ Aardvark.Base.Incremental -Aardvark.Base.Runtime FShade GLSLangSharp FSharp.Core diff --git a/src/Aardvark.Rendering/Effects/Interop/FShade.fs b/src/Aardvark.Rendering/Effects/Interop/FShade.fs index f525e5b7e..4a2b2a962 100644 --- a/src/Aardvark.Rendering/Effects/Interop/FShade.fs +++ b/src/Aardvark.Rendering/Effects/Interop/FShade.fs @@ -452,7 +452,7 @@ module FShadeInterop = effect // TODO: other topologies???? - |> Effect.toLayered semantic customSemantic layerCount perLayerUniforms top + |> Effect.toLayeredEffect' semantic customSemantic layerCount perLayerUniforms top |> withDeviceIndex deviceCount |> Effect.toModule config diff --git a/src/Aardvark.Rendering/Resources/Adaptive/ManagedBuffer.fs b/src/Aardvark.Rendering/Resources/Adaptive/ManagedBuffer.fs index 1de606ff5..5355418bb 100644 --- a/src/Aardvark.Rendering/Resources/Adaptive/ManagedBuffer.fs +++ b/src/Aardvark.Rendering/Resources/Adaptive/ManagedBuffer.fs @@ -107,6 +107,22 @@ type ManagedBufferExtensions private() = this.Set(src, nativeint values.Length * nativeint sizeof<'T>, range) ) + /// + /// Sets the given offset range to the given values. The buffer is resized if necessary. + /// The data are repeated if not enough are provided for the specified range. + /// + /// The buffer to write to. + /// The values to write. + /// The range (i.e. min and max offsets) in the buffer to write to. + [] + static member Set(this : IManagedBuffer, values : Array, range : Range1l) = + let elementSize = values.GetType().GetElementType().GetCLRSize() + let sizeInBytes = nativeint values.Length * nativeint elementSize + + pinned values (fun src -> + this.Set(src, sizeInBytes, range) + ) + module internal ManagedBufferImplementation = diff --git a/src/Aardvark.Rendering/Resources/Textures/PixTextureCube.fs b/src/Aardvark.Rendering/Resources/Textures/PixTextureCube.fs index 6a5d6fa4e..dcd1cdab7 100644 --- a/src/Aardvark.Rendering/Resources/Textures/PixTextureCube.fs +++ b/src/Aardvark.Rendering/Resources/Textures/PixTextureCube.fs @@ -11,13 +11,6 @@ type PixTextureCube(data : PixImageCube, textureParams : TextureParams) = new(data : PixImageCube, [] wantMipMaps : bool) = PixTextureCube(data, { TextureParams.empty with wantMipMaps = wantMipMaps }) - new(data : PixCube, textureParams : TextureParams) = - let faces = data.MipMapArray |> Array.map (fun p -> PixImageMipMap(p.MipArray |> Array.map (fun pi -> pi :?> PixImage))) - PixTextureCube(PixImageCube(faces), textureParams) - - new(data : PixCube, [] wantMipMaps : bool) = - PixTextureCube(data, { TextureParams.empty with wantMipMaps = wantMipMaps }) - override x.GetHashCode() = HashCode.Combine(data.GetHashCode(), textureParams.GetHashCode()) diff --git a/src/Aardvark.SceneGraph.Opc/Aara.fs b/src/Aardvark.SceneGraph.Opc/Aara.fs index db529a6d5..ee2fd10ee 100644 --- a/src/Aardvark.SceneGraph.Opc/Aara.fs +++ b/src/Aardvark.SceneGraph.Opc/Aara.fs @@ -28,7 +28,7 @@ module Aara = if cnt <> read then failwith "" System.Text.Encoding.Default.GetString target - let loadRaw<'a when 'a : (new : unit -> 'a) and 'a : struct and 'a :> ValueType> (elementCount : int) (f : Stream) = + let loadRaw<'a when 'a : unmanaged> (elementCount : int) (f : Stream) = let result = Array.zeroCreate<'a> elementCount let buffer = Array.zeroCreate (1 <<< 22) @@ -45,13 +45,9 @@ module Aara = gc.Free() result + [] let loadRaw2<'a when 'a : unmanaged> (elementCount : int) (f : Stream) : 'a[] = - let target = Array.zeroCreate elementCount - target.UnsafeCoercedApply(fun arr -> - let r = f.Read(arr, 0, arr.Length) - if r <> arr.Length then failwith "asdfj2" - ) - target + loadRaw elementCount f let loadFromStream<'a when 'a : unmanaged> (f : Stream) = let binaryReader = new BinaryReader(f,Text.Encoding.ASCII, true) @@ -63,7 +59,7 @@ module Aara = let result = if typeof<'a>.Name = typeName then - loadRaw2<'a> elementCount f + loadRaw<'a> elementCount f else match typeName with | "V3d" -> f |> loadRaw elementCount |> PrimitiveValueConverter.arrayConverter typeof diff --git a/src/Aardvark.SceneGraph/Pools/ManagedPool.fs b/src/Aardvark.SceneGraph/Pools/ManagedPool.fs index 80c53f7a5..09c7f6736 100644 --- a/src/Aardvark.SceneGraph/Pools/ManagedPool.fs +++ b/src/Aardvark.SceneGraph/Pools/ManagedPool.fs @@ -296,7 +296,7 @@ and ManagedPool(runtime : IRuntime, signature : GeometrySignature, if isNew then let conv = PrimitiveValueConverter.getArrayConverter typeof signature.IndexType let data = Array.init fvc id |> conv - indexBuffer.Set(data.UnsafeCoerce(), indexRange) + indexBuffer.Set(data, indexRange) let resources = { diff --git a/src/Aardvark.SceneGraph/Pools/ManagedTracePool.fs b/src/Aardvark.SceneGraph/Pools/ManagedTracePool.fs index 60f003f12..5c104e543 100644 --- a/src/Aardvark.SceneGraph/Pools/ManagedTracePool.fs +++ b/src/Aardvark.SceneGraph/Pools/ManagedTracePool.fs @@ -665,7 +665,7 @@ and ManagedTracePool(runtime : IRuntime, signature : TraceObjectSignature, if isNew then let conv = PrimitiveValueConverter.getArrayConverter typeof indexType let data = Array.init fvc id |> conv - indexBuffer.Set(data.UnsafeCoerce(), indexRange) + indexBuffer.Set(data, indexRange) iptrs.Add(indexPtr) int32 indexPtr.Offset diff --git a/src/Application/Aardvark.Application.OpenVR.GL/paket.references b/src/Application/Aardvark.Application.OpenVR.GL/paket.references index f4194d49a..aef845402 100644 --- a/src/Application/Aardvark.Application.OpenVR.GL/paket.references +++ b/src/Application/Aardvark.Application.OpenVR.GL/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime FShade.Core FSharp.Core Unofficial.OpenVR diff --git a/src/Application/Aardvark.Application.OpenVR.Vulkan/paket.references b/src/Application/Aardvark.Application.OpenVR.Vulkan/paket.references index dc0feee44..8bd5edfed 100644 --- a/src/Application/Aardvark.Application.OpenVR.Vulkan/paket.references +++ b/src/Application/Aardvark.Application.OpenVR.Vulkan/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime FShade.Core FShade.GLSL FSharp.Core diff --git a/src/Application/Aardvark.Application.Slim.GL/paket.references b/src/Application/Aardvark.Application.Slim.GL/paket.references index c23f987d2..128ed68b7 100644 --- a/src/Application/Aardvark.Application.Slim.GL/paket.references +++ b/src/Application/Aardvark.Application.Slim.GL/paket.references @@ -1,5 +1,4 @@ Aardvark.Base.Incremental -Aardvark.Base.Runtime Aardvark.Base.Essentials FShade FSharp.Core diff --git a/src/Application/Aardvark.Application.Slim.Vulkan/paket.references b/src/Application/Aardvark.Application.Slim.Vulkan/paket.references index 22a736589..296dcaab8 100644 --- a/src/Application/Aardvark.Application.Slim.Vulkan/paket.references +++ b/src/Application/Aardvark.Application.Slim.Vulkan/paket.references @@ -1,5 +1,4 @@ Aardvark.Base.Incremental -Aardvark.Base.Runtime Aardvark.Base.Essentials FShade FShade.GLSL diff --git a/src/Application/Aardvark.Application.Slim/GLFW.fs b/src/Application/Aardvark.Application.Slim/GLFW.fs index 6aeaa4689..935b79227 100644 --- a/src/Application/Aardvark.Application.Slim/GLFW.fs +++ b/src/Application/Aardvark.Application.Slim/GLFW.fs @@ -393,7 +393,7 @@ module IconLoader = let img = use src = ass.GetManifestResourceStream name - PixImageSharp.Create(src).ToPixImage(Col.Format.RGBA) + PixImage.Load(src).ToPixImage(Col.Format.RGBA) let levels = let mutable last = img diff --git a/src/Application/Aardvark.Application.Slim/paket.references b/src/Application/Aardvark.Application.Slim/paket.references index 6c712498b..3d85dd866 100644 --- a/src/Application/Aardvark.Application.Slim/paket.references +++ b/src/Application/Aardvark.Application.Slim/paket.references @@ -1,5 +1,4 @@ Aardvark.Base.Incremental -Aardvark.Base.Runtime Aardvark.Base.Essentials FShade FSharp.Core diff --git a/src/Application/Aardvark.Application.Utilities/paket.references b/src/Application/Aardvark.Application.Utilities/paket.references index d44d7b64e..0531fceaf 100644 --- a/src/Application/Aardvark.Application.Utilities/paket.references +++ b/src/Application/Aardvark.Application.Utilities/paket.references @@ -2,7 +2,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental FShade.Core FShade.GLSL -Aardvark.Base.Runtime FSharp.Core Unofficial.OpenVR Unofficial.OpenTK diff --git a/src/Application/Aardvark.Application.WPF.GL/Aardvark.Application.WPF.GL.fsproj b/src/Application/Aardvark.Application.WPF.GL/Aardvark.Application.WPF.GL.fsproj index 9598531c3..c809e5ce0 100644 --- a/src/Application/Aardvark.Application.WPF.GL/Aardvark.Application.WPF.GL.fsproj +++ b/src/Application/Aardvark.Application.WPF.GL/Aardvark.Application.WPF.GL.fsproj @@ -1,7 +1,7 @@ - net471;net6.0-windows7.0 + net471;net8.0-windows10.0.17763.0 Aardvark.Application.WPF.GL Library true diff --git a/src/Application/Aardvark.Application.WPF.GL/paket.references b/src/Application/Aardvark.Application.WPF.GL/paket.references index 4046bfe31..5c7dfde8a 100644 --- a/src/Application/Aardvark.Application.WPF.GL/paket.references +++ b/src/Application/Aardvark.Application.WPF.GL/paket.references @@ -1,7 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental FShade.Core -Aardvark.Base.Runtime Silk.NET.Direct3D9 FSharp.Core FShade.GLSL diff --git a/src/Application/Aardvark.Application.WPF/Aardvark.Application.WPF.fsproj b/src/Application/Aardvark.Application.WPF/Aardvark.Application.WPF.fsproj index 5a0729979..2e8fa55cf 100644 --- a/src/Application/Aardvark.Application.WPF/Aardvark.Application.WPF.fsproj +++ b/src/Application/Aardvark.Application.WPF/Aardvark.Application.WPF.fsproj @@ -1,7 +1,7 @@ - net471;net6.0-windows7.0 + net471;net8.0-windows10.0.17763.0 Aardvark.Application.WPF Library true diff --git a/src/Application/Aardvark.Application.WinForms.GL/Aardvark.Application.WinForms.GL.fsproj b/src/Application/Aardvark.Application.WinForms.GL/Aardvark.Application.WinForms.GL.fsproj index 90ce0ccc5..2eadc5142 100644 --- a/src/Application/Aardvark.Application.WinForms.GL/Aardvark.Application.WinForms.GL.fsproj +++ b/src/Application/Aardvark.Application.WinForms.GL/Aardvark.Application.WinForms.GL.fsproj @@ -1,7 +1,7 @@ - net471;net6.0-windows7.0 + net471;net8.0-windows10.0.17763.0 Aardvark.Application.WinForms.GL Library true diff --git a/src/Application/Aardvark.Application.WinForms.GL/paket.references b/src/Application/Aardvark.Application.WinForms.GL/paket.references index 62be7982f..aeb890719 100644 --- a/src/Application/Aardvark.Application.WinForms.GL/paket.references +++ b/src/Application/Aardvark.Application.WinForms.GL/paket.references @@ -1,7 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental FShade.Core -Aardvark.Base.Runtime FSharp.Core FShade.GLSL Unofficial.OpenTK diff --git a/src/Application/Aardvark.Application.WinForms.Vulkan/Aardvark.Application.WinForms.Vulkan.fsproj b/src/Application/Aardvark.Application.WinForms.Vulkan/Aardvark.Application.WinForms.Vulkan.fsproj index def617bd6..cc53fcebb 100644 --- a/src/Application/Aardvark.Application.WinForms.Vulkan/Aardvark.Application.WinForms.Vulkan.fsproj +++ b/src/Application/Aardvark.Application.WinForms.Vulkan/Aardvark.Application.WinForms.Vulkan.fsproj @@ -1,7 +1,7 @@ - net471;net6.0-windows7.0 + net471;net8.0-windows10.0.17763.0 Aardvark.Application.WinForms.Vulkan Library true diff --git a/src/Application/Aardvark.Application.WinForms.Vulkan/paket.references b/src/Application/Aardvark.Application.WinForms.Vulkan/paket.references index b98d13e0c..bc3e0d9a0 100644 --- a/src/Application/Aardvark.Application.WinForms.Vulkan/paket.references +++ b/src/Application/Aardvark.Application.WinForms.Vulkan/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime FShade.Core FShade.GLSL FSharp.Core diff --git a/src/Application/Aardvark.Application.WinForms/Aardvark.Application.WinForms.fsproj b/src/Application/Aardvark.Application.WinForms/Aardvark.Application.WinForms.fsproj index 44be27b09..ef91ef40a 100644 --- a/src/Application/Aardvark.Application.WinForms/Aardvark.Application.WinForms.fsproj +++ b/src/Application/Aardvark.Application.WinForms/Aardvark.Application.WinForms.fsproj @@ -1,7 +1,7 @@ - net471;net6.0-windows7.0 + net471;net8.0-windows10.0.17763.0 Aardvark.Application.WinForms Library true diff --git a/src/Demo/Examples/Examples.fsproj b/src/Demo/Examples/Examples.fsproj index f4df8c207..0e7b72784 100644 --- a/src/Demo/Examples/Examples.fsproj +++ b/src/Demo/Examples/Examples.fsproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows10.0.17763.0 Exe true true diff --git a/src/Demo/Examples/Program.fs b/src/Demo/Examples/Program.fs index 15728b26a..81ee5480c 100644 --- a/src/Demo/Examples/Program.fs +++ b/src/Demo/Examples/Program.fs @@ -1048,11 +1048,6 @@ type NativeVolume<'a when 'a : unmanaged> with icoord.Y <- ni frac.Y <- coord.Y - float(icoord.Y) -let inline lerpy< ^a, ^b when (^a or ^b) : (static member Lerp : float * ^b * ^b -> ^b)> (_ : ^a) (t : float) (a : ^b) (b : ^b) = - ((^a or ^b) : (static member Lerp : float * ^b * ^b -> ^b) (t, a,b)) - -let inline lerper t a b = lerpy (Unchecked.defaultof) t a b - @@ -1060,8 +1055,6 @@ let inline lerper t a b = lerpy (Unchecked.defaultof) t a b [] let main args = //Management.run() - - let sepp = lerper 0.1 0.0 1.0 let useVulkan = true diff --git a/src/Demo/Examples/paket.references b/src/Demo/Examples/paket.references index d738ade40..6e83078db 100644 --- a/src/Demo/Examples/paket.references +++ b/src/Demo/Examples/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Demo/FontRendering/FontRendering.fsproj b/src/Demo/FontRendering/FontRendering.fsproj index 97921e430..34436c293 100644 --- a/src/Demo/FontRendering/FontRendering.fsproj +++ b/src/Demo/FontRendering/FontRendering.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 Exe true true diff --git a/src/Demo/FontRendering/paket.references b/src/Demo/FontRendering/paket.references index 90aab843d..cc5803bbe 100644 --- a/src/Demo/FontRendering/paket.references +++ b/src/Demo/FontRendering/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime FShade.Core FShade.GLSL FSharp.Core diff --git a/src/Examples (netcore)/00 - HelloWorld/00 - HelloWorld.fsproj b/src/Examples (netcore)/00 - HelloWorld/00 - HelloWorld.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/00 - HelloWorld/00 - HelloWorld.fsproj +++ b/src/Examples (netcore)/00 - HelloWorld/00 - HelloWorld.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/00 - HelloWorld/paket.references b/src/Examples (netcore)/00 - HelloWorld/paket.references index 73db6ba8b..d69977638 100644 --- a/src/Examples (netcore)/00 - HelloWorld/paket.references +++ b/src/Examples (netcore)/00 - HelloWorld/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/01 - Hello Wpf/01 - Hello Wpf.csproj b/src/Examples (netcore)/01 - Hello Wpf/01 - Hello Wpf.csproj index e97b2a726..b8fd2a724 100644 --- a/src/Examples (netcore)/01 - Hello Wpf/01 - Hello Wpf.csproj +++ b/src/Examples (netcore)/01 - Hello Wpf/01 - Hello Wpf.csproj @@ -2,7 +2,7 @@ Exe - net6.0-windows + net8.0-windows10.0.17763.0 _01___Hello_Wpf enable true diff --git a/src/Examples (netcore)/01 - Hello Wpf/paket.references b/src/Examples (netcore)/01 - Hello Wpf/paket.references index b1ecb7016..78bc3e81a 100644 --- a/src/Examples (netcore)/01 - Hello Wpf/paket.references +++ b/src/Examples (netcore)/01 - Hello Wpf/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/01 - Triangle/01 - Triangle.fsproj b/src/Examples (netcore)/01 - Triangle/01 - Triangle.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/01 - Triangle/01 - Triangle.fsproj +++ b/src/Examples (netcore)/01 - Triangle/01 - Triangle.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/01 - Triangle/paket.references b/src/Examples (netcore)/01 - Triangle/paket.references index 73db6ba8b..d69977638 100644 --- a/src/Examples (netcore)/01 - Triangle/paket.references +++ b/src/Examples (netcore)/01 - Triangle/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/02 - TexturedCube/02 - TexturedCube.fsproj b/src/Examples (netcore)/02 - TexturedCube/02 - TexturedCube.fsproj index 79b7ff0d7..a24e9aff9 100644 --- a/src/Examples (netcore)/02 - TexturedCube/02 - TexturedCube.fsproj +++ b/src/Examples (netcore)/02 - TexturedCube/02 - TexturedCube.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/02 - TexturedCube/paket.references b/src/Examples (netcore)/02 - TexturedCube/paket.references index 90bca5811..291dd5838 100644 --- a/src/Examples (netcore)/02 - TexturedCube/paket.references +++ b/src/Examples (netcore)/02 - TexturedCube/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,7 +10,6 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Base.Tensors Aardvark.Build diff --git a/src/Examples (netcore)/03 - Animation/03 - Animation.fsproj b/src/Examples (netcore)/03 - Animation/03 - Animation.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/03 - Animation/03 - Animation.fsproj +++ b/src/Examples (netcore)/03 - Animation/03 - Animation.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/03 - Animation/paket.references b/src/Examples (netcore)/03 - Animation/paket.references index 01a5d2eaa..72c82c901 100644 --- a/src/Examples (netcore)/03 - Animation/paket.references +++ b/src/Examples (netcore)/03 - Animation/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj b/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj index 44e59e12a..e1f163d73 100644 --- a/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj +++ b/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/04 - ModelLoading/paket.references b/src/Examples (netcore)/04 - ModelLoading/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/04 - ModelLoading/paket.references +++ b/src/Examples (netcore)/04 - ModelLoading/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/05 - Points/05 - Points.fsproj b/src/Examples (netcore)/05 - Points/05 - Points.fsproj index 139bb42ef..fe708c729 100644 --- a/src/Examples (netcore)/05 - Points/05 - Points.fsproj +++ b/src/Examples (netcore)/05 - Points/05 - Points.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/05 - Points/paket.references b/src/Examples (netcore)/05 - Points/paket.references index c1e23a5e7..73dd1c751 100644 --- a/src/Examples (netcore)/05 - Points/paket.references +++ b/src/Examples (netcore)/05 - Points/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,7 +10,6 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Base.Tensors Aardvark.Build \ No newline at end of file diff --git a/src/Examples (netcore)/06 - GeometryPrimitives/06 - GeometryPrimitives.fsproj b/src/Examples (netcore)/06 - GeometryPrimitives/06 - GeometryPrimitives.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/06 - GeometryPrimitives/06 - GeometryPrimitives.fsproj +++ b/src/Examples (netcore)/06 - GeometryPrimitives/06 - GeometryPrimitives.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/06 - GeometryPrimitives/paket.references b/src/Examples (netcore)/06 - GeometryPrimitives/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/06 - GeometryPrimitives/paket.references +++ b/src/Examples (netcore)/06 - GeometryPrimitives/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/07 - RenderToTexture/07 - RenderToTexture.fsproj b/src/Examples (netcore)/07 - RenderToTexture/07 - RenderToTexture.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/07 - RenderToTexture/07 - RenderToTexture.fsproj +++ b/src/Examples (netcore)/07 - RenderToTexture/07 - RenderToTexture.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/07 - RenderToTexture/paket.references b/src/Examples (netcore)/07 - RenderToTexture/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/07 - RenderToTexture/paket.references +++ b/src/Examples (netcore)/07 - RenderToTexture/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/08 - NaiveViewFrustumCulling/08 - NaiveViewFrustumCulling.fsproj b/src/Examples (netcore)/08 - NaiveViewFrustumCulling/08 - NaiveViewFrustumCulling.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/08 - NaiveViewFrustumCulling/08 - NaiveViewFrustumCulling.fsproj +++ b/src/Examples (netcore)/08 - NaiveViewFrustumCulling/08 - NaiveViewFrustumCulling.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/08 - NaiveViewFrustumCulling/paket.references b/src/Examples (netcore)/08 - NaiveViewFrustumCulling/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/08 - NaiveViewFrustumCulling/paket.references +++ b/src/Examples (netcore)/08 - NaiveViewFrustumCulling/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/09 - TesselatedSphere/09 - TesselatedSphere.fsproj b/src/Examples (netcore)/09 - TesselatedSphere/09 - TesselatedSphere.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/09 - TesselatedSphere/09 - TesselatedSphere.fsproj +++ b/src/Examples (netcore)/09 - TesselatedSphere/09 - TesselatedSphere.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/09 - TesselatedSphere/paket.references b/src/Examples (netcore)/09 - TesselatedSphere/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/09 - TesselatedSphere/paket.references +++ b/src/Examples (netcore)/09 - TesselatedSphere/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/10 - NBodyCompute/10 - NBodyCompute.fsproj b/src/Examples (netcore)/10 - NBodyCompute/10 - NBodyCompute.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/10 - NBodyCompute/10 - NBodyCompute.fsproj +++ b/src/Examples (netcore)/10 - NBodyCompute/10 - NBodyCompute.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/10 - NBodyCompute/paket.references b/src/Examples (netcore)/10 - NBodyCompute/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/10 - NBodyCompute/paket.references +++ b/src/Examples (netcore)/10 - NBodyCompute/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/11 - ParallelPrimitives/11 - ParallelPrimitives.fsproj b/src/Examples (netcore)/11 - ParallelPrimitives/11 - ParallelPrimitives.fsproj index b8ac79706..8535e4150 100644 --- a/src/Examples (netcore)/11 - ParallelPrimitives/11 - ParallelPrimitives.fsproj +++ b/src/Examples (netcore)/11 - ParallelPrimitives/11 - ParallelPrimitives.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/11 - ParallelPrimitives/paket.references b/src/Examples (netcore)/11 - ParallelPrimitives/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/11 - ParallelPrimitives/paket.references +++ b/src/Examples (netcore)/11 - ParallelPrimitives/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/12 - GlslIntrinsics/12 - GlslIntrinsics.fsproj b/src/Examples (netcore)/12 - GlslIntrinsics/12 - GlslIntrinsics.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/12 - GlslIntrinsics/12 - GlslIntrinsics.fsproj +++ b/src/Examples (netcore)/12 - GlslIntrinsics/12 - GlslIntrinsics.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/12 - GlslIntrinsics/paket.references b/src/Examples (netcore)/12 - GlslIntrinsics/paket.references index 01a5d2eaa..72c82c901 100644 --- a/src/Examples (netcore)/12 - GlslIntrinsics/paket.references +++ b/src/Examples (netcore)/12 - GlslIntrinsics/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/13 - Mandelbrot/13 - Mandelbrot.fsproj b/src/Examples (netcore)/13 - Mandelbrot/13 - Mandelbrot.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/13 - Mandelbrot/13 - Mandelbrot.fsproj +++ b/src/Examples (netcore)/13 - Mandelbrot/13 - Mandelbrot.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/13 - Mandelbrot/paket.references b/src/Examples (netcore)/13 - Mandelbrot/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/13 - Mandelbrot/paket.references +++ b/src/Examples (netcore)/13 - Mandelbrot/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/14 - GeometryShaders/14 - GeometryShaders.fsproj b/src/Examples (netcore)/14 - GeometryShaders/14 - GeometryShaders.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/14 - GeometryShaders/14 - GeometryShaders.fsproj +++ b/src/Examples (netcore)/14 - GeometryShaders/14 - GeometryShaders.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/14 - GeometryShaders/paket.references b/src/Examples (netcore)/14 - GeometryShaders/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/14 - GeometryShaders/paket.references +++ b/src/Examples (netcore)/14 - GeometryShaders/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/15 - GeometryPooling/15 - GeometryPooling.fsproj b/src/Examples (netcore)/15 - GeometryPooling/15 - GeometryPooling.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/15 - GeometryPooling/15 - GeometryPooling.fsproj +++ b/src/Examples (netcore)/15 - GeometryPooling/15 - GeometryPooling.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/15 - GeometryPooling/paket.references b/src/Examples (netcore)/15 - GeometryPooling/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/15 - GeometryPooling/paket.references +++ b/src/Examples (netcore)/15 - GeometryPooling/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/16 - ShaderSwitches/16 - ShaderSwitches.fsproj b/src/Examples (netcore)/16 - ShaderSwitches/16 - ShaderSwitches.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/16 - ShaderSwitches/16 - ShaderSwitches.fsproj +++ b/src/Examples (netcore)/16 - ShaderSwitches/16 - ShaderSwitches.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/16 - ShaderSwitches/paket.references b/src/Examples (netcore)/16 - ShaderSwitches/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/16 - ShaderSwitches/paket.references +++ b/src/Examples (netcore)/16 - ShaderSwitches/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/17 - TextureArrays/17 - TextureArrays.fsproj b/src/Examples (netcore)/17 - TextureArrays/17 - TextureArrays.fsproj index 744bfb2b5..05746b800 100644 --- a/src/Examples (netcore)/17 - TextureArrays/17 - TextureArrays.fsproj +++ b/src/Examples (netcore)/17 - TextureArrays/17 - TextureArrays.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true true diff --git a/src/Examples (netcore)/17 - TextureArrays/paket.references b/src/Examples (netcore)/17 - TextureArrays/paket.references index 2dc18d74c..73dd1c751 100644 --- a/src/Examples (netcore)/17 - TextureArrays/paket.references +++ b/src/Examples (netcore)/17 - TextureArrays/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/18 - RenderCommands/18 - RenderCommands.fsproj b/src/Examples (netcore)/18 - RenderCommands/18 - RenderCommands.fsproj index c74de91a1..ff9819caa 100644 --- a/src/Examples (netcore)/18 - RenderCommands/18 - RenderCommands.fsproj +++ b/src/Examples (netcore)/18 - RenderCommands/18 - RenderCommands.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true true diff --git a/src/Examples (netcore)/18 - RenderCommands/paket.references b/src/Examples (netcore)/18 - RenderCommands/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/18 - RenderCommands/paket.references +++ b/src/Examples (netcore)/18 - RenderCommands/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/19 - NativeTensors/19 - NativeTensors.fsproj b/src/Examples (netcore)/19 - NativeTensors/19 - NativeTensors.fsproj index 79b7ff0d7..a24e9aff9 100644 --- a/src/Examples (netcore)/19 - NativeTensors/19 - NativeTensors.fsproj +++ b/src/Examples (netcore)/19 - NativeTensors/19 - NativeTensors.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/19 - NativeTensors/paket.references b/src/Examples (netcore)/19 - NativeTensors/paket.references index 2dc18d74c..73dd1c751 100644 --- a/src/Examples (netcore)/19 - NativeTensors/paket.references +++ b/src/Examples (netcore)/19 - NativeTensors/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/20 - VolumeRendering/20 - VolumeRendering.fsproj b/src/Examples (netcore)/20 - VolumeRendering/20 - VolumeRendering.fsproj index edec15973..864822470 100644 --- a/src/Examples (netcore)/20 - VolumeRendering/20 - VolumeRendering.fsproj +++ b/src/Examples (netcore)/20 - VolumeRendering/20 - VolumeRendering.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/20 - VolumeRendering/paket.references b/src/Examples (netcore)/20 - VolumeRendering/paket.references index 01a5d2eaa..72c82c901 100644 --- a/src/Examples (netcore)/20 - VolumeRendering/paket.references +++ b/src/Examples (netcore)/20 - VolumeRendering/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/21 - LoD/21 - LoD.fsproj b/src/Examples (netcore)/21 - LoD/21 - LoD.fsproj index 9cdd063d0..6d6b703ed 100644 --- a/src/Examples (netcore)/21 - LoD/21 - LoD.fsproj +++ b/src/Examples (netcore)/21 - LoD/21 - LoD.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/21 - LoD/paket.references b/src/Examples (netcore)/21 - LoD/paket.references index 01a5d2eaa..72c82c901 100644 --- a/src/Examples (netcore)/21 - LoD/paket.references +++ b/src/Examples (netcore)/21 - LoD/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/22 - HardwareFeatures/22 - HardwareFeatures.fsproj b/src/Examples (netcore)/22 - HardwareFeatures/22 - HardwareFeatures.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/22 - HardwareFeatures/22 - HardwareFeatures.fsproj +++ b/src/Examples (netcore)/22 - HardwareFeatures/22 - HardwareFeatures.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/22 - HardwareFeatures/paket.references b/src/Examples (netcore)/22 - HardwareFeatures/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/22 - HardwareFeatures/paket.references +++ b/src/Examples (netcore)/22 - HardwareFeatures/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/23 - FlexibleDrawCommands/23 - FlexibleDrawCommands.fsproj b/src/Examples (netcore)/23 - FlexibleDrawCommands/23 - FlexibleDrawCommands.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/23 - FlexibleDrawCommands/23 - FlexibleDrawCommands.fsproj +++ b/src/Examples (netcore)/23 - FlexibleDrawCommands/23 - FlexibleDrawCommands.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/23 - FlexibleDrawCommands/paket.references b/src/Examples (netcore)/23 - FlexibleDrawCommands/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/23 - FlexibleDrawCommands/paket.references +++ b/src/Examples (netcore)/23 - FlexibleDrawCommands/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/24 - PostProcessing/24 - PostProcessing.fsproj b/src/Examples (netcore)/24 - PostProcessing/24 - PostProcessing.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/24 - PostProcessing/24 - PostProcessing.fsproj +++ b/src/Examples (netcore)/24 - PostProcessing/24 - PostProcessing.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/24 - PostProcessing/paket.references b/src/Examples (netcore)/24 - PostProcessing/paket.references index dea45a028..b2498e170 100644 --- a/src/Examples (netcore)/24 - PostProcessing/paket.references +++ b/src/Examples (netcore)/24 - PostProcessing/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj b/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj index 44e59e12a..e1f163d73 100644 --- a/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj +++ b/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/25 - AutomaticInstancing/paket.references b/src/Examples (netcore)/25 - AutomaticInstancing/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/25 - AutomaticInstancing/paket.references +++ b/src/Examples (netcore)/25 - AutomaticInstancing/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/26 - Splines/26 - Splines.fsproj b/src/Examples (netcore)/26 - Splines/26 - Splines.fsproj index b8ac79706..8535e4150 100644 --- a/src/Examples (netcore)/26 - Splines/26 - Splines.fsproj +++ b/src/Examples (netcore)/26 - Splines/26 - Splines.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/26 - Splines/paket.references b/src/Examples (netcore)/26 - Splines/paket.references index 01a5d2eaa..72c82c901 100644 --- a/src/Examples (netcore)/26 - Splines/paket.references +++ b/src/Examples (netcore)/26 - Splines/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/27 - BrowserTexture/27 - BrowserTexture.fsproj b/src/Examples (netcore)/27 - BrowserTexture/27 - BrowserTexture.fsproj index 743c52f81..c31768959 100644 --- a/src/Examples (netcore)/27 - BrowserTexture/27 - BrowserTexture.fsproj +++ b/src/Examples (netcore)/27 - BrowserTexture/27 - BrowserTexture.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/27 - BrowserTexture/paket.references b/src/Examples (netcore)/27 - BrowserTexture/paket.references index 99576dab0..eeec1c7f4 100644 --- a/src/Examples (netcore)/27 - BrowserTexture/paket.references +++ b/src/Examples (netcore)/27 - BrowserTexture/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,7 +10,6 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Base.Tensors Offler diff --git a/src/Examples (netcore)/28 - RenderToTextures/28 - RenderToTextures.fsproj b/src/Examples (netcore)/28 - RenderToTextures/28 - RenderToTextures.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/28 - RenderToTextures/28 - RenderToTextures.fsproj +++ b/src/Examples (netcore)/28 - RenderToTextures/28 - RenderToTextures.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/28 - RenderToTextures/paket.references b/src/Examples (netcore)/28 - RenderToTextures/paket.references index 01a5d2eaa..72c82c901 100644 --- a/src/Examples (netcore)/28 - RenderToTextures/paket.references +++ b/src/Examples (netcore)/28 - RenderToTextures/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/29 - PingPong/29 - PingPong.fsproj b/src/Examples (netcore)/29 - PingPong/29 - PingPong.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/29 - PingPong/29 - PingPong.fsproj +++ b/src/Examples (netcore)/29 - PingPong/29 - PingPong.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/29 - PingPong/paket.references b/src/Examples (netcore)/29 - PingPong/paket.references index dea45a028..7db6fa551 100644 --- a/src/Examples (netcore)/29 - PingPong/paket.references +++ b/src/Examples (netcore)/29 - PingPong/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Examples (netcore)/30 - NaiveShadowMapping/30 - NaiveShadowMapping.fsproj b/src/Examples (netcore)/30 - NaiveShadowMapping/30 - NaiveShadowMapping.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/30 - NaiveShadowMapping/30 - NaiveShadowMapping.fsproj +++ b/src/Examples (netcore)/30 - NaiveShadowMapping/30 - NaiveShadowMapping.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/30 - NaiveShadowMapping/paket.references b/src/Examples (netcore)/30 - NaiveShadowMapping/paket.references index a35625263..7db6fa551 100644 --- a/src/Examples (netcore)/30 - NaiveShadowMapping/paket.references +++ b/src/Examples (netcore)/30 - NaiveShadowMapping/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,5 +10,4 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Build \ No newline at end of file diff --git a/src/Examples (netcore)/31 - Transparency/31 - Transparency.fsproj b/src/Examples (netcore)/31 - Transparency/31 - Transparency.fsproj index d888be350..cea54979c 100644 --- a/src/Examples (netcore)/31 - Transparency/31 - Transparency.fsproj +++ b/src/Examples (netcore)/31 - Transparency/31 - Transparency.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/31 - Transparency/paket.references b/src/Examples (netcore)/31 - Transparency/paket.references index a35625263..7db6fa551 100644 --- a/src/Examples (netcore)/31 - Transparency/paket.references +++ b/src/Examples (netcore)/31 - Transparency/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,5 +10,4 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Build \ No newline at end of file diff --git a/src/Examples (netcore)/32 - Queries/32 - Queries.fsproj b/src/Examples (netcore)/32 - Queries/32 - Queries.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Examples (netcore)/32 - Queries/32 - Queries.fsproj +++ b/src/Examples (netcore)/32 - Queries/32 - Queries.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/32 - Queries/paket.references b/src/Examples (netcore)/32 - Queries/paket.references index a35625263..7db6fa551 100644 --- a/src/Examples (netcore)/32 - Queries/paket.references +++ b/src/Examples (netcore)/32 - Queries/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,5 +10,4 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Build \ No newline at end of file diff --git a/src/Examples (netcore)/33 - Opc/33 - Opc.fsproj b/src/Examples (netcore)/33 - Opc/33 - Opc.fsproj index 39ef16347..1e444f03b 100644 --- a/src/Examples (netcore)/33 - Opc/33 - Opc.fsproj +++ b/src/Examples (netcore)/33 - Opc/33 - Opc.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/33 - Opc/paket.references b/src/Examples (netcore)/33 - Opc/paket.references index a35625263..7db6fa551 100644 --- a/src/Examples (netcore)/33 - Opc/paket.references +++ b/src/Examples (netcore)/33 - Opc/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,5 +10,4 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Build \ No newline at end of file diff --git a/src/Examples (netcore)/34 - StorageBuffers/34 - StorageBuffers.fsproj b/src/Examples (netcore)/34 - StorageBuffers/34 - StorageBuffers.fsproj index 139bb42ef..fe708c729 100644 --- a/src/Examples (netcore)/34 - StorageBuffers/34 - StorageBuffers.fsproj +++ b/src/Examples (netcore)/34 - StorageBuffers/34 - StorageBuffers.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/34 - StorageBuffers/paket.references b/src/Examples (netcore)/34 - StorageBuffers/paket.references index c1e23a5e7..73dd1c751 100644 --- a/src/Examples (netcore)/34 - StorageBuffers/paket.references +++ b/src/Examples (netcore)/34 - StorageBuffers/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,7 +10,6 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Base.Tensors Aardvark.Build \ No newline at end of file diff --git a/src/Examples (netcore)/35 - Picking/35 - Picking.fsproj b/src/Examples (netcore)/35 - Picking/35 - Picking.fsproj index 139bb42ef..fe708c729 100644 --- a/src/Examples (netcore)/35 - Picking/35 - Picking.fsproj +++ b/src/Examples (netcore)/35 - Picking/35 - Picking.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/35 - Picking/paket.references b/src/Examples (netcore)/35 - Picking/paket.references index c1e23a5e7..73dd1c751 100644 --- a/src/Examples (netcore)/35 - Picking/paket.references +++ b/src/Examples (netcore)/35 - Picking/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,7 +10,6 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Base.Tensors Aardvark.Build \ No newline at end of file diff --git a/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj b/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj index 1c76d613d..e0787c74a 100644 --- a/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj +++ b/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/36 - Raytracing/paket.references b/src/Examples (netcore)/36 - Raytracing/paket.references index d5e067430..06dd40bbb 100644 --- a/src/Examples (netcore)/36 - Raytracing/paket.references +++ b/src/Examples (netcore)/36 - Raytracing/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL @@ -11,6 +11,5 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Base.Tensors \ No newline at end of file diff --git a/src/Examples (netcore)/37 - ReversedDepth/37 - ReversedDepth.fsproj b/src/Examples (netcore)/37 - ReversedDepth/37 - ReversedDepth.fsproj index 139bb42ef..fe708c729 100644 --- a/src/Examples (netcore)/37 - ReversedDepth/37 - ReversedDepth.fsproj +++ b/src/Examples (netcore)/37 - ReversedDepth/37 - ReversedDepth.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Examples (netcore)/37 - ReversedDepth/paket.references b/src/Examples (netcore)/37 - ReversedDepth/paket.references index 90bca5811..291dd5838 100644 --- a/src/Examples (netcore)/37 - ReversedDepth/paket.references +++ b/src/Examples (netcore)/37 - ReversedDepth/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL @@ -11,7 +10,6 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp Aardvark.Base.Tensors Aardvark.Build diff --git a/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj b/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj index ff079c6fb..ed9e46e7c 100644 --- a/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj +++ b/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows10.0.17763.0 Exe true true diff --git a/src/Scratch (net471)/00 - HelloWorld (net471)/paket.references b/src/Scratch (net471)/00 - HelloWorld (net471)/paket.references index 36163958b..8d733a312 100644 --- a/src/Scratch (net471)/00 - HelloWorld (net471)/paket.references +++ b/src/Scratch (net471)/00 - HelloWorld (net471)/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj b/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj index 594e2c7d0..1e6094296 100644 --- a/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj +++ b/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows10.0.17763.0 Exe true true diff --git a/src/Scratch (net471)/05 - HickupTest/paket.references b/src/Scratch (net471)/05 - HickupTest/paket.references index 196095dfc..8d1d7d71b 100644 --- a/src/Scratch (net471)/05 - HickupTest/paket.references +++ b/src/Scratch (net471)/05 - HickupTest/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet Unofficial.Typography FShade.Core diff --git a/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj b/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj index 594e2c7d0..1e6094296 100644 --- a/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj +++ b/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows10.0.17763.0 Exe true true diff --git a/src/Scratch (net471)/06 - MemoryLeakTest/paket.references b/src/Scratch (net471)/06 - MemoryLeakTest/paket.references index 36163958b..8d733a312 100644 --- a/src/Scratch (net471)/06 - MemoryLeakTest/paket.references +++ b/src/Scratch (net471)/06 - MemoryLeakTest/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj b/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj index 594e2c7d0..1e6094296 100644 --- a/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj +++ b/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows10.0.17763.0 Exe true true diff --git a/src/Scratch (net471)/07 - RenderTaskCustom/paket.references b/src/Scratch (net471)/07 - RenderTaskCustom/paket.references index 36163958b..8d733a312 100644 --- a/src/Scratch (net471)/07 - RenderTaskCustom/paket.references +++ b/src/Scratch (net471)/07 - RenderTaskCustom/paket.references @@ -1,6 +1,5 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj b/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj index 594e2c7d0..1e6094296 100644 --- a/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj +++ b/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows10.0.17763.0 Exe true true diff --git a/src/Scratch (net471)/08 - DerivedAttributePerformance/paket.references b/src/Scratch (net471)/08 - DerivedAttributePerformance/paket.references index 774d8ed6c..dde25861e 100644 --- a/src/Scratch (net471)/08 - DerivedAttributePerformance/paket.references +++ b/src/Scratch (net471)/08 - DerivedAttributePerformance/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj b/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj index 594e2c7d0..1e6094296 100644 --- a/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj +++ b/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows10.0.17763.0 Exe true true diff --git a/src/Scratch (net471)/09 - MappedBufferPerformance/paket.references b/src/Scratch (net471)/09 - MappedBufferPerformance/paket.references index 36163958b..117f6d146 100644 --- a/src/Scratch (net471)/09 - MappedBufferPerformance/paket.references +++ b/src/Scratch (net471)/09 - MappedBufferPerformance/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/01 - Triangle/01 - Triangle.fsproj b/src/Scratch (netcore)/01 - Triangle/01 - Triangle.fsproj index 5bc7518a5..c0e5f85c3 100644 --- a/src/Scratch (netcore)/01 - Triangle/01 - Triangle.fsproj +++ b/src/Scratch (netcore)/01 - Triangle/01 - Triangle.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/01 - Triangle/paket.references b/src/Scratch (netcore)/01 - Triangle/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/01 - Triangle/paket.references +++ b/src/Scratch (netcore)/01 - Triangle/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/02 - OpcDemo/02 - OpcDemo.fsproj b/src/Scratch (netcore)/02 - OpcDemo/02 - OpcDemo.fsproj index 7f5b67af3..5f4af0cdf 100644 --- a/src/Scratch (netcore)/02 - OpcDemo/02 - OpcDemo.fsproj +++ b/src/Scratch (netcore)/02 - OpcDemo/02 - OpcDemo.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/02 - OpcDemo/paket.references b/src/Scratch (netcore)/02 - OpcDemo/paket.references index dea45a028..b2498e170 100644 --- a/src/Scratch (netcore)/02 - OpcDemo/paket.references +++ b/src/Scratch (netcore)/02 - OpcDemo/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/03 - Sorted/03 - Sorted.fsproj b/src/Scratch (netcore)/03 - Sorted/03 - Sorted.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Scratch (netcore)/03 - Sorted/03 - Sorted.fsproj +++ b/src/Scratch (netcore)/03 - Sorted/03 - Sorted.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/03 - Sorted/paket.references b/src/Scratch (netcore)/03 - Sorted/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/03 - Sorted/paket.references +++ b/src/Scratch (netcore)/03 - Sorted/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/04 - ManyTexts/04 - ManyTexts.fsproj b/src/Scratch (netcore)/04 - ManyTexts/04 - ManyTexts.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Scratch (netcore)/04 - ManyTexts/04 - ManyTexts.fsproj +++ b/src/Scratch (netcore)/04 - ManyTexts/04 - ManyTexts.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/04 - ManyTexts/paket.references b/src/Scratch (netcore)/04 - ManyTexts/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/04 - ManyTexts/paket.references +++ b/src/Scratch (netcore)/04 - ManyTexts/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/05 - ConjugateGradient/05 - ConjugateGradient.fsproj b/src/Scratch (netcore)/05 - ConjugateGradient/05 - ConjugateGradient.fsproj index f145ed3d2..2e92dadcc 100644 --- a/src/Scratch (netcore)/05 - ConjugateGradient/05 - ConjugateGradient.fsproj +++ b/src/Scratch (netcore)/05 - ConjugateGradient/05 - ConjugateGradient.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/05 - ConjugateGradient/paket.references b/src/Scratch (netcore)/05 - ConjugateGradient/paket.references index 73db6ba8b..bcb01dc64 100644 --- 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.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/06 - LodAgain/06 - LodAgain.fsproj b/src/Scratch (netcore)/06 - LodAgain/06 - LodAgain.fsproj index 23ea607b0..486fe7b37 100644 --- a/src/Scratch (netcore)/06 - LodAgain/06 - LodAgain.fsproj +++ b/src/Scratch (netcore)/06 - LodAgain/06 - LodAgain.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true hum2 true diff --git a/src/Scratch (netcore)/06 - LodAgain/paket.references b/src/Scratch (netcore)/06 - LodAgain/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/06 - LodAgain/paket.references +++ b/src/Scratch (netcore)/06 - LodAgain/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/07 - GeometrySet/07 - GeometrySet.fsproj b/src/Scratch (netcore)/07 - GeometrySet/07 - GeometrySet.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/07 - GeometrySet/07 - GeometrySet.fsproj +++ b/src/Scratch (netcore)/07 - GeometrySet/07 - GeometrySet.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/07 - GeometrySet/paket.references b/src/Scratch (netcore)/07 - GeometrySet/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/07 - GeometrySet/paket.references +++ b/src/Scratch (netcore)/07 - GeometrySet/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/08 - TextUpdateTest/08 - TextUpdateTest.fsproj b/src/Scratch (netcore)/08 - TextUpdateTest/08 - TextUpdateTest.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Scratch (netcore)/08 - TextUpdateTest/08 - TextUpdateTest.fsproj +++ b/src/Scratch (netcore)/08 - TextUpdateTest/08 - TextUpdateTest.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/08 - TextUpdateTest/paket.references b/src/Scratch (netcore)/08 - TextUpdateTest/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/08 - TextUpdateTest/paket.references +++ b/src/Scratch (netcore)/08 - TextUpdateTest/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/09 - TextTrafoTest/09 - TextTrafoTest.fsproj b/src/Scratch (netcore)/09 - TextTrafoTest/09 - TextTrafoTest.fsproj index 0cd80aa32..0d47b850a 100644 --- a/src/Scratch (netcore)/09 - TextTrafoTest/09 - TextTrafoTest.fsproj +++ b/src/Scratch (netcore)/09 - TextTrafoTest/09 - TextTrafoTest.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/09 - TextTrafoTest/paket.references b/src/Scratch (netcore)/09 - TextTrafoTest/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/09 - TextTrafoTest/paket.references +++ b/src/Scratch (netcore)/09 - TextTrafoTest/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/10 - FontSquirrelGenerator/10 - FontSquirrelGenerator.fsproj b/src/Scratch (netcore)/10 - FontSquirrelGenerator/10 - FontSquirrelGenerator.fsproj index 958343a77..69ae1ccb9 100644 --- a/src/Scratch (netcore)/10 - FontSquirrelGenerator/10 - FontSquirrelGenerator.fsproj +++ b/src/Scratch (netcore)/10 - FontSquirrelGenerator/10 - FontSquirrelGenerator.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/10 - FontSquirrelGenerator/paket.references b/src/Scratch (netcore)/10 - FontSquirrelGenerator/paket.references index 90297c6ff..6195850bd 100644 --- a/src/Scratch (netcore)/10 - FontSquirrelGenerator/paket.references +++ b/src/Scratch (netcore)/10 - FontSquirrelGenerator/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/11 - WriteBuffers/11 - WriteBuffers.fsproj b/src/Scratch (netcore)/11 - WriteBuffers/11 - WriteBuffers.fsproj index 5bc7518a5..c0e5f85c3 100644 --- a/src/Scratch (netcore)/11 - WriteBuffers/11 - WriteBuffers.fsproj +++ b/src/Scratch (netcore)/11 - WriteBuffers/11 - WriteBuffers.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/11 - WriteBuffers/paket.references b/src/Scratch (netcore)/11 - WriteBuffers/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/11 - WriteBuffers/paket.references +++ b/src/Scratch (netcore)/11 - WriteBuffers/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/12 - AddRemoveStress/12 - AddRemoveStress.fsproj b/src/Scratch (netcore)/12 - AddRemoveStress/12 - AddRemoveStress.fsproj index 5bc7518a5..c0e5f85c3 100644 --- a/src/Scratch (netcore)/12 - AddRemoveStress/12 - AddRemoveStress.fsproj +++ b/src/Scratch (netcore)/12 - AddRemoveStress/12 - AddRemoveStress.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/12 - AddRemoveStress/paket.references b/src/Scratch (netcore)/12 - AddRemoveStress/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/12 - AddRemoveStress/paket.references +++ b/src/Scratch (netcore)/12 - AddRemoveStress/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/13 - PipelineStates/13 - PipelineStates.fsproj b/src/Scratch (netcore)/13 - PipelineStates/13 - PipelineStates.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/13 - PipelineStates/13 - PipelineStates.fsproj +++ b/src/Scratch (netcore)/13 - PipelineStates/13 - PipelineStates.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/13 - PipelineStates/paket.references b/src/Scratch (netcore)/13 - PipelineStates/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/13 - PipelineStates/paket.references +++ b/src/Scratch (netcore)/13 - PipelineStates/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/14 - RenderToCube/14 - RenderToCube.fsproj b/src/Scratch (netcore)/14 - RenderToCube/14 - RenderToCube.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/14 - RenderToCube/14 - RenderToCube.fsproj +++ b/src/Scratch (netcore)/14 - RenderToCube/14 - RenderToCube.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/14 - RenderToCube/paket.references b/src/Scratch (netcore)/14 - RenderToCube/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/14 - RenderToCube/paket.references +++ b/src/Scratch (netcore)/14 - RenderToCube/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/15 - ConcurrencyTest/15 - ConcurrencyTest.fsproj b/src/Scratch (netcore)/15 - ConcurrencyTest/15 - ConcurrencyTest.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/15 - ConcurrencyTest/15 - ConcurrencyTest.fsproj +++ b/src/Scratch (netcore)/15 - ConcurrencyTest/15 - ConcurrencyTest.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/15 - ConcurrencyTest/paket.references b/src/Scratch (netcore)/15 - ConcurrencyTest/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/15 - ConcurrencyTest/paket.references +++ b/src/Scratch (netcore)/15 - ConcurrencyTest/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/16 - ShaderCaching/16 - ShaderCaching.fsproj b/src/Scratch (netcore)/16 - ShaderCaching/16 - ShaderCaching.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/16 - ShaderCaching/16 - ShaderCaching.fsproj +++ b/src/Scratch (netcore)/16 - ShaderCaching/16 - ShaderCaching.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/16 - ShaderCaching/paket.references b/src/Scratch (netcore)/16 - ShaderCaching/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/16 - ShaderCaching/paket.references +++ b/src/Scratch (netcore)/16 - ShaderCaching/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/17 - ArrayTexture/17 - ArrayTexture.fsproj b/src/Scratch (netcore)/17 - ArrayTexture/17 - ArrayTexture.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/17 - ArrayTexture/17 - ArrayTexture.fsproj +++ b/src/Scratch (netcore)/17 - ArrayTexture/17 - ArrayTexture.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/17 - ArrayTexture/paket.references b/src/Scratch (netcore)/17 - ArrayTexture/paket.references index a35625263..b5cdd0b83 100644 --- a/src/Scratch (netcore)/17 - ArrayTexture/paket.references +++ b/src/Scratch (netcore)/17 - ArrayTexture/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL @@ -11,5 +11,5 @@ Unofficial.OpenTK Unofficial.OpenVR FShade.Debug -SixLabors.ImageSharp + Aardvark.Build \ No newline at end of file diff --git a/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/18 - AdaptiveResourceSemantics.fsproj b/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/18 - AdaptiveResourceSemantics.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/18 - AdaptiveResourceSemantics.fsproj +++ b/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/18 - AdaptiveResourceSemantics.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/paket.references b/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/paket.references +++ b/src/Scratch (netcore)/18 - AdaptiveResourceSemantics/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/18 - UniformUpdates/18 - UniformUpdates.fsproj b/src/Scratch (netcore)/18 - UniformUpdates/18 - UniformUpdates.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/18 - UniformUpdates/18 - UniformUpdates.fsproj +++ b/src/Scratch (netcore)/18 - UniformUpdates/18 - UniformUpdates.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/18 - UniformUpdates/paket.references b/src/Scratch (netcore)/18 - UniformUpdates/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/18 - UniformUpdates/paket.references +++ b/src/Scratch (netcore)/18 - UniformUpdates/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/19 - AsyncTexture/19 - AsyncTexture.fsproj b/src/Scratch (netcore)/19 - AsyncTexture/19 - AsyncTexture.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/19 - AsyncTexture/19 - AsyncTexture.fsproj +++ b/src/Scratch (netcore)/19 - AsyncTexture/19 - AsyncTexture.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/19 - AsyncTexture/paket.references b/src/Scratch (netcore)/19 - AsyncTexture/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/19 - AsyncTexture/paket.references +++ b/src/Scratch (netcore)/19 - AsyncTexture/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/20 - ResourceSharing/20 - ResourceSharing.fsproj b/src/Scratch (netcore)/20 - ResourceSharing/20 - ResourceSharing.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/20 - ResourceSharing/20 - ResourceSharing.fsproj +++ b/src/Scratch (netcore)/20 - ResourceSharing/20 - ResourceSharing.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/20 - ResourceSharing/paket.references b/src/Scratch (netcore)/20 - ResourceSharing/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/20 - ResourceSharing/paket.references +++ b/src/Scratch (netcore)/20 - ResourceSharing/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/21 - DebugPrint/21 - DebugPrint.fsproj b/src/Scratch (netcore)/21 - DebugPrint/21 - DebugPrint.fsproj index 48a513bae..1de27d076 100644 --- a/src/Scratch (netcore)/21 - DebugPrint/21 - DebugPrint.fsproj +++ b/src/Scratch (netcore)/21 - DebugPrint/21 - DebugPrint.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/21 - DebugPrint/paket.references b/src/Scratch (netcore)/21 - DebugPrint/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/21 - DebugPrint/paket.references +++ b/src/Scratch (netcore)/21 - DebugPrint/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/22 - MemoryLeak/22 - MemoryLeak.fsproj b/src/Scratch (netcore)/22 - MemoryLeak/22 - MemoryLeak.fsproj index 5bc7518a5..c0e5f85c3 100644 --- a/src/Scratch (netcore)/22 - MemoryLeak/22 - MemoryLeak.fsproj +++ b/src/Scratch (netcore)/22 - MemoryLeak/22 - MemoryLeak.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/22 - MemoryLeak/paket.references b/src/Scratch (netcore)/22 - MemoryLeak/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/22 - MemoryLeak/paket.references +++ b/src/Scratch (netcore)/22 - MemoryLeak/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Scratch (netcore)/23 - NativeMemoryLeak/23 - NativeMemoryLeak.fsproj b/src/Scratch (netcore)/23 - NativeMemoryLeak/23 - NativeMemoryLeak.fsproj index 5bc7518a5..c0e5f85c3 100644 --- a/src/Scratch (netcore)/23 - NativeMemoryLeak/23 - NativeMemoryLeak.fsproj +++ b/src/Scratch (netcore)/23 - NativeMemoryLeak/23 - NativeMemoryLeak.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/src/Scratch (netcore)/23 - NativeMemoryLeak/paket.references b/src/Scratch (netcore)/23 - NativeMemoryLeak/paket.references index 73db6ba8b..bcb01dc64 100644 --- a/src/Scratch (netcore)/23 - NativeMemoryLeak/paket.references +++ b/src/Scratch (netcore)/23 - NativeMemoryLeak/paket.references @@ -1,6 +1,6 @@ Aardvark.Base.Essentials Aardvark.Base.Incremental -Aardvark.Base.Runtime + AssimpNet FShade.Core FShade.GLSL diff --git a/src/Tests/Aardvark.Rendering.Tests/Aardvark.Rendering.Tests.fsproj b/src/Tests/Aardvark.Rendering.Tests/Aardvark.Rendering.Tests.fsproj index 8a4af38d4..95cb0ed92 100644 --- a/src/Tests/Aardvark.Rendering.Tests/Aardvark.Rendering.Tests.fsproj +++ b/src/Tests/Aardvark.Rendering.Tests/Aardvark.Rendering.Tests.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false Exe true diff --git a/src/Tests/Aardvark.Rendering.Tests/Tests/Compute/Images.fs b/src/Tests/Aardvark.Rendering.Tests/Tests/Compute/Images.fs index d6110eac0..cc7ddacb2 100644 --- a/src/Tests/Aardvark.Rendering.Tests/Tests/Compute/Images.fs +++ b/src/Tests/Aardvark.Rendering.Tests/Tests/Compute/Images.fs @@ -71,7 +71,7 @@ module ComputeImages = ComputeCommand.Dispatch(size / shader.LocalSize.XY) ]) - let result = dst.Download().Transformed(ImageTrafo.MirrorY).AsPixImage<'T>() + let result = dst.Download().AsPixImage<'T>().Transformed(ImageTrafo.MirrorY) PixImage.compare V2i.Zero pix result let flipYrgba8 = genericFlipY Shader.flipY PixImage.random8ui TextureFormat.Rgba8 diff --git a/src/Tests/Aardvark.Rendering.Tests/Tests/Texture/Upload.fs b/src/Tests/Aardvark.Rendering.Tests/Tests/Texture/Upload.fs index d3b4bb862..a5aff7748 100644 --- a/src/Tests/Aardvark.Rendering.Tests/Tests/Texture/Upload.fs +++ b/src/Tests/Aardvark.Rendering.Tests/Tests/Texture/Upload.fs @@ -647,7 +647,7 @@ module TextureUpload = for slice = 0 to count - 1 do for level = 0 to expectedLevels - 1 do let result = runtime.Download(texture, level = level, slice = slice) - let result = result.Transformed(ImageTrafo.MirrorY).AsPixImage() + let result = result.AsPixImage().Transformed(ImageTrafo.MirrorY) Expect.equal result.Size (Fun.MipmapLevelSize(size, level)) "image size mismatch" if level < levels then @@ -804,7 +804,7 @@ module TextureUpload = texture.Update(input.PixFormat, size, src.Address) ) - let output = (texture.GetValue() :?> IBackendTexture).Download().Transformed(ImageTrafo.MirrorY).AsPixImage() + let output = (texture.GetValue() :?> IBackendTexture).Download().AsPixImage().Transformed(ImageTrafo.MirrorY) PixImage.compare V2i.Zero input output let pos = V2i(123, 231) diff --git a/src/Tests/CSharpInteropTest/CSharpInteropTest.csproj b/src/Tests/CSharpInteropTest/CSharpInteropTest.csproj index 1556d32e7..dada6e4ba 100644 --- a/src/Tests/CSharpInteropTest/CSharpInteropTest.csproj +++ b/src/Tests/CSharpInteropTest/CSharpInteropTest.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 ..\..\..\bin\Debug