From 9e38634d7d84b6f3167ac39465ddc9622f07d973 Mon Sep 17 00:00:00 2001 From: krauthaufen Date: Wed, 9 Mar 2022 23:43:15 +0100 Subject: [PATCH] updated Aardvark.Base --- RELEASE_NOTES.md | 3 +++ paket.dependencies | 6 +++--- paket.lock | 44 ++++++++++++++++++++++--------------------- src/Test/Test.fsproj | 45 ++++++++++++++++++++++---------------------- 4 files changed, 51 insertions(+), 47 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index ec83536..df82734 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,2 +1,5 @@ +### 1.1.8 +* updated Aardvark.Base to 5.2 + ### 1.1.7 * Aardvark.Build version \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index ac733d5..8907fea 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,7 +3,7 @@ source https://api.nuget.org/v3/index.json nuget FSharp.Core >= 5.0.0 lowest_matching: true -nuget Aardvark.Base >= 5.1.25 < 6.0.0 -nuget Aardvark.Base.FSharp >= 5.1.25 < 6.0.0 -nuget Aardvark.Base.Tensors >= 5.1.25 < 6.0.0 +nuget Aardvark.Base ~> 5.2.0 +nuget Aardvark.Base.FSharp ~> 5.2.0 +nuget Aardvark.Base.Tensors ~> 5.2.0 nuget Aardvark.Build ~> 1.0.11 diff --git a/paket.lock b/paket.lock index b6e8585..f568aca 100644 --- a/paket.lock +++ b/paket.lock @@ -1,30 +1,27 @@ RESTRICTION: || (== net6.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardvark.Base (5.1.25) - Aardvark.Base.Telemetry (5.1.25) + Aardvark.Base (5.2.2) + Aardvark.Base.Telemetry (5.2.2) System.Collections.Immutable (>= 1.7) System.Reflection.Metadata (>= 1.8) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) System.Text.Json (>= 4.7.2) - Aardvark.Base.FSharp (5.1.25) - Aardvark.Base (5.1.25) + Aardvark.Base.FSharp (5.2.2) + Aardvark.Base (5.2.2) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - DevILSharp (>= 0.2.9 < 0.3) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Telemetry (5.1.25) - Aardvark.Base.Tensors (5.1.25) - Aardvark.Base (5.1.25) - Aardvark.Base.FSharp (5.1.25) + Aardvark.Base.Telemetry (5.2.2) + Aardvark.Base.Tensors (5.2.2) + Aardvark.Base (5.2.2) + Aardvark.Base.FSharp (5.2.2) FSharp.Core (>= 5.0) - SixLabors.ImageSharp (>= 1.0.2 < 1.1) + SixLabors.ImageSharp (>= 2.0 < 2.1) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) Aardvark.Build (1.0.11) - DevILSharp (0.2.9) - FSharp.Core (>= 4.6.2) FSharp.Core (5.0) FSharp.Data.Adaptive (1.2.3) FSharp.Core (>= 4.6.2) @@ -34,13 +31,15 @@ NUGET System.Reflection.Emit.Lightweight (>= 4.3) Microsoft.Bcl.AsyncInterfaces (5.0) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (< netstandard2.0) (>= xamarintvos)) (&& (== net6.0) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1) (< netstandard2.1)) (== netstandard2.0) - Microsoft.NETCore.Platforms (3.1) + Microsoft.NETCore.Platforms (6.0.2) Microsoft.NETCore.Targets (3.1) - SixLabors.ImageSharp (1.0.3) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) - System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) + SixLabors.ImageSharp (2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 5.0) + System.Text.Encoding.CodePages (>= 5.0) + System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -100,11 +99,11 @@ NUGET System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) - System.Memory (4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) + System.Memory (4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Buffers (>= 4.5.1) - restriction: || (&& (== 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)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== 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)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) + System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.ObjectModel (4.3) System.Collections (>= 4.3) System.Diagnostics.Debug (>= 4.3) @@ -143,7 +142,7 @@ NUGET System.Runtime (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< net5.0)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (< netstandard2.0) (>= xamarintvos)) (&& (== net6.0) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (5.0) System.Runtime.Extensions (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) @@ -152,6 +151,9 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) + System.Text.Encoding.CodePages (5.0) + Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.0) (>= netcoreapp2.0)) + System.Runtime.CompilerServices.Unsafe (>= 5.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< net5.0)) (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) System.Text.Encodings.Web (5.0.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< net5.0)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (< netstandard2.0) (>= xamarintvos)) (&& (== net6.0) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (== netstandard2.0) System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netcoreapp2.1) (< netstandard2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) diff --git a/src/Test/Test.fsproj b/src/Test/Test.fsproj index acd7f8f..1fa1a97 100644 --- a/src/Test/Test.fsproj +++ b/src/Test/Test.fsproj @@ -1,24 +1,23 @@ - - - - Exe - net6.0 - true - - - ..\..\bin\Debug\ - - - ..\..\bin\Release\ - - - - - - - - - - - + + + + Exe + net6.0 + true + + + ..\..\bin\Debug\ + + + ..\..\bin\Release\ + + + + + + + + + + \ No newline at end of file