diff --git a/paket.dependencies b/paket.dependencies index 032db910..9c65dddb 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -11,10 +11,10 @@ nuget System.Text.Json >= 8.0.5 lowest_matching: true //////////////////////////////////////////////////////////////////////// // https://github.com/aardvark-platform/aardvark.base -nuget Aardvark.Base ~> 5.3.0 -nuget Aardvark.Base.IO ~> 5.3.0 -nuget Aardvark.Base.Tensors ~> 5.3.0 -nuget Aardvark.Geometry ~> 5.3.0 +nuget Aardvark.Base ~> 5.3.5 +nuget Aardvark.Base.IO ~> 5.3.5 +nuget Aardvark.Base.Tensors ~> 5.3.5 +nuget Aardvark.Geometry ~> 5.3.5 //////////////////////////////////////////////////////////////////////// // https://github.com/aardvark-platform/aardvark.rendering diff --git a/paket.lock b/paket.lock index 2623d9f9..aadb10cc 100644 --- a/paket.lock +++ b/paket.lock @@ -106,42 +106,43 @@ NUGET Aardvark.Base.FSharp (>= 5.3) FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Base (5.3) - Aardvark.Base.Telemetry (5.3) + Aardvark.Base (5.3.5) + Aardvark.Base.Telemetry (5.3.5) + SingleFileExtractor.Core (>= 2.2.1 < 2.3) System.Collections.Immutable (>= 8.0) System.Reflection.Metadata (>= 8.0) System.Text.Json (>= 8.0.4) - Aardvark.Base.Essentials (5.3) - Aardvark.Base (5.3) + Aardvark.Base.Essentials (5.3.5) + Aardvark.Base (5.3.5) System.Collections.Immutable (>= 8.0) - Aardvark.Base.Fonts (5.3) - Aardvark.Base.FSharp (5.3) + Aardvark.Base.Fonts (5.3.5) + Aardvark.Base.FSharp (5.3.5) FSharp.Core (>= 8.0) FuzzySharp (>= 2.0.2 < 2.1) Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) Unofficial.Typography (>= 0.1 < 0.2) - Aardvark.Base.FSharp (5.3) - Aardvark.Base (5.3) + Aardvark.Base.FSharp (5.3.5) + Aardvark.Base (5.3.5) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Incremental (5.3) - Aardvark.Base (5.3) - Aardvark.Base.FSharp (5.3) + Aardvark.Base.Incremental (5.3.5) + Aardvark.Base (5.3.5) + Aardvark.Base.FSharp (5.3.5) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) - Aardvark.Base.IO (5.3) - Aardvark.Base (5.3) - Aardvark.Base.Tensors (5.3) + Aardvark.Base.IO (5.3.5) + Aardvark.Base (5.3.5) + Aardvark.Base.Tensors (5.3.5) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Telemetry (5.3) - Aardvark.Base.Tensors (5.3) - Aardvark.Base (5.3) - Aardvark.Base.FSharp (5.3) + Aardvark.Base.Telemetry (5.3.5) + Aardvark.Base.Tensors (5.3.5) + Aardvark.Base (5.3.5) + Aardvark.Base.FSharp (5.3.5) FSharp.Core (>= 8.0) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) @@ -153,10 +154,10 @@ NUGET Aardvark.FontProvider (0.1) Aardvark.Base.Fonts (>= 5.3) FSharp.Core (>= 8.0.100) - Aardvark.Geometry (5.3) - Aardvark.Base (5.3) - Aardvark.Base.FSharp (5.3) - Aardvark.Base.Tensors (5.3) + Aardvark.Geometry (5.3.5) + Aardvark.Base (5.3.5) + Aardvark.Base.FSharp (5.3.5) + Aardvark.Base.Tensors (5.3.5) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) @@ -236,7 +237,7 @@ NUGET FShade.Imperative (5.6) FSharp.Core (>= 8.0) FSharp.Core (8.0.100) - FSharp.Data.Adaptive (1.2.14) + FSharp.Data.Adaptive (1.2.16) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) FsPickler (5.3.2) @@ -250,12 +251,11 @@ NUGET Microsoft.Bcl.HashCode (1.1.1) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) Microsoft.CSharp (4.7) Microsoft.DotNet.PlatformAbstractions (3.1.6) - Microsoft.Extensions.DependencyModel (6.0) - System.Buffers (>= 4.5.1) - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Text.Json (>= 6.0) + Microsoft.Extensions.DependencyModel (8.0.2) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Text.Encodings.Web (>= 8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Json (>= 8.0.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) Microsoft.NETCore.Platforms (7.0.4) Microsoft.NETCore.Targets (5.0) NETStandard.Library (2.0.3) @@ -275,7 +275,9 @@ NUGET Silk.NET.GLFW (2.15) Silk.NET.Core (>= 2.15) Ultz.Native.GLFW (>= 3.3.3.1) - System.Buffers (4.5.1) + SingleFileExtractor.Core (2.2.1) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + System.Buffers (4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -363,8 +365,8 @@ NUGET Microsoft.NETCore.Targets (>= 1.1) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (8.0) - System.Collections.Immutable (>= 8.0) + System.Reflection.Metadata (8.0.1) + System.Collections.Immutable (>= 8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -392,7 +394,7 @@ NUGET System.Text.Encoding.CodePages (8.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) - System.Text.Encodings.Web (8.0) + System.Text.Encodings.Web (8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) @@ -412,7 +414,7 @@ NUGET System.Runtime (>= 4.3) System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (== netstandard2.0) - Ultz.Native.GLFW (3.3.9.2) + Ultz.Native.GLFW (3.4) Uncodium.Eigensystems (1.1.2) Aardvark.Base (>= 5.1 < 6.0) Uncodium.SimpleStore (3.0.30) @@ -430,18 +432,16 @@ STORAGE: NONE RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - Microsoft.CodeCoverage (17.10) + Microsoft.CodeCoverage (17.11.1) Microsoft.NET.Test.Sdk (17.10) Microsoft.CodeCoverage (>= 17.10) Microsoft.TestPlatform.TestHost (>= 17.10) - Microsoft.TestPlatform.ObjectModel (17.10) + Microsoft.TestPlatform.ObjectModel (17.11.1) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.10) - Microsoft.TestPlatform.ObjectModel (>= 17.10) + Microsoft.TestPlatform.TestHost (17.11.1) + Microsoft.TestPlatform.ObjectModel (>= 17.11.1) Newtonsoft.Json (>= 13.0.1) Newtonsoft.Json (13.0.3) NUnit (4.1) NUnit3TestAdapter (4.5) - System.Collections.Immutable (8.0) - System.Reflection.Metadata (8.0) - System.Collections.Immutable (>= 8.0) + System.Reflection.Metadata (8.0.1) diff --git a/src/Apps/Viewer/Program.fs b/src/Apps/Viewer/Program.fs index de42ea25..68873540 100644 --- a/src/Apps/Viewer/Program.fs +++ b/src/Apps/Viewer/Program.fs @@ -100,7 +100,7 @@ let main args = //view @"C:\Users\sm\Downloads\C_30DN2.LAZ.store" [File.readAllText @"C:\Users\sm\Downloads\C_30DN2.LAZ.key"] (Args.parse [||]) //view @"C:\Users\sm\Downloads\test.store" ["128330b1-8761-4a07-b160-76bcd7e2f70a"; "ab2f6f76-7eae-47c9-82d1-ad28b816abb9"] (Args.parse [||]) - let store = @"W:\Datasets\Vgm\Stores\2024-04-30_bugreport\F_240205.e57\data.uds" + let store = @"\\heap\aszabo\rmdata\Data\stores\SD-Speicher.e57.000.exported\data.uds" let key = Path.combine [System.IO.Path.GetDirectoryName store;"key.txt"] |> File.readAllText view store [key] (Args.parse [||])