Skip to content

Commit bc58750

Browse files
hyazinthhhyazinthh
committed
Fix value restriction build errors
1 parent 40867c6 commit bc58750

File tree

53 files changed

+85
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+85
-87
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "8.0.0",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
99
],
@@ -15,13 +15,6 @@
1515
"aardpack"
1616
],
1717
"rollForward": false
18-
},
19-
"adaptify": {
20-
"version": "1.3.0",
21-
"commands": [
22-
"adaptify"
23-
],
24-
"rollForward": false
2518
}
2619
}
2720
}

‎paket.dependencies‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ nuget Aardvark.Rendering.Text ~> 5.5.0
1818
nuget Aardvark.Rendering.Vulkan ~> 5.5.0
1919
nuget Aardvark.GPGPU ~> 5.5.0
2020

21-
nuget Adaptify.Core ~> 1.3.0
22-
nuget Adaptify.MSBuild ~> 1.3.0
21+
nuget Adaptify.Core ~> 1.3.5
22+
nuget Adaptify.MSBuild ~> 1.3.5
2323

2424
nuget FsPickler ~> 5.3.2
2525
nuget FsPickler.Json ~> 5.3.2
@@ -41,4 +41,5 @@ nuget FSharp.Data ~> 3.0.0
4141
nuget Aether ~> 8.3.1
4242
nuget Chiron
4343
nuget Saturn ~> 0.15.0
44+
nuget Microsoft.AspNetCore.Authentication.JwtBearer ~> 8.0.0
4445
nuget BenchmarkDotNet ~> 0.13.1

‎paket.lock‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,11 @@ NUGET
180180
Aardvark.SceneGraph (5.5)
181181
FSharp.Core (>= 8.0)
182182
SharpZipLib (>= 1.4.1 < 1.5)
183-
Adaptify.Core (1.3.4)
184-
FSharp.Data.Adaptive (>= 1.2.14 < 1.3)
185-
Adaptify.MSBuild (1.3.4)
186-
Adaptify.Core (1.3.4)
183+
Adaptify.Core (1.3.5)
184+
FSharp.Core (>= 6.0)
185+
FSharp.Data.Adaptive (>= 1.2.18 < 1.3)
186+
Adaptify.MSBuild (1.3.5)
187+
Adaptify.Core (1.3.5)
187188
Aether (8.3.1)
188189
FSharp.Core (>= 4.3.4)
189190
System.ValueTuple (>= 4.4) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
@@ -285,8 +286,8 @@ NUGET
285286
GLSLangSharp (0.4.15)
286287
FSharp.Core (>= 5.0)
287288
Iced (1.21)
288-
Microsoft.AspNetCore.Authentication.JwtBearer (9.0) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
289-
Microsoft.IdentityModel.Protocols.OpenIdConnect (>= 8.0.1)
289+
Microsoft.AspNetCore.Authentication.JwtBearer (8.0.12)
290+
Microsoft.IdentityModel.Protocols.OpenIdConnect (>= 7.1.2) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
290291
Microsoft.AspNetCore.Connections.Abstractions (9.0)
291292
Microsoft.Bcl.AsyncInterfaces (>= 9.0)
292293
Microsoft.Extensions.Features (>= 9.0)
@@ -321,6 +322,7 @@ NUGET
321322
Microsoft.Bcl.AsyncInterfaces (9.0)
322323
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)
323324
Microsoft.Bcl.HashCode (6.0) - restriction: || (== net471) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)
325+
Microsoft.Bcl.Memory (9.0.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
324326
Microsoft.Bcl.TimeProvider (9.0)
325327
Microsoft.Bcl.AsyncInterfaces (>= 9.0) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net8.0)) (== netstandard2.0)
326328
System.ValueTuple (>= 4.5) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== netstandard2.0) (>= net462))
@@ -397,18 +399,20 @@ NUGET
397399
Microsoft.Extensions.Primitives (9.0)
398400
System.Memory (>= 4.5.5) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net8.0)) (== netstandard2.0)
399401
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net8.0)) (== netstandard2.0)
400-
Microsoft.IdentityModel.Abstractions (8.3) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
401-
Microsoft.IdentityModel.JsonWebTokens (8.3) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
402-
Microsoft.IdentityModel.Tokens (>= 8.3)
403-
Microsoft.IdentityModel.Logging (8.3) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
404-
Microsoft.IdentityModel.Abstractions (>= 8.3)
405-
Microsoft.IdentityModel.Protocols (8.3) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
406-
Microsoft.IdentityModel.Tokens (>= 8.3)
407-
Microsoft.IdentityModel.Protocols.OpenIdConnect (8.3) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
408-
Microsoft.IdentityModel.Protocols (>= 8.3)
409-
System.IdentityModel.Tokens.Jwt (>= 8.3)
410-
Microsoft.IdentityModel.Tokens (8.3) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
411-
Microsoft.IdentityModel.Logging (>= 8.3)
402+
Microsoft.IdentityModel.Abstractions (8.3.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
403+
Microsoft.IdentityModel.JsonWebTokens (8.3.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
404+
Microsoft.IdentityModel.Tokens (>= 8.3.1)
405+
Microsoft.IdentityModel.Logging (8.3.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
406+
Microsoft.IdentityModel.Abstractions (>= 8.3.1)
407+
Microsoft.IdentityModel.Protocols (8.3.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
408+
Microsoft.IdentityModel.Tokens (>= 8.3.1)
409+
Microsoft.IdentityModel.Protocols.OpenIdConnect (8.3.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
410+
Microsoft.IdentityModel.Protocols (>= 8.3.1)
411+
System.IdentityModel.Tokens.Jwt (>= 8.3.1)
412+
Microsoft.IdentityModel.Tokens (8.3.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
413+
Microsoft.Bcl.Memory (>= 9.0)
414+
Microsoft.Extensions.Logging.Abstractions (>= 8.0) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
415+
Microsoft.IdentityModel.Logging (>= 8.3.1)
412416
Microsoft.IO.RecyclableMemoryStream (3.0.1) - restriction: || (&& (== net471) (>= net6.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net6.0))
413417
Microsoft.NETCore.Platforms (7.0.4) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
414418
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
@@ -492,9 +496,9 @@ NUGET
492496
Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
493497
Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
494498
System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
495-
System.IdentityModel.Tokens.Jwt (8.3) - restriction: || (&& (== net471) (>= net5.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net5.0))
496-
Microsoft.IdentityModel.JsonWebTokens (>= 8.3)
497-
Microsoft.IdentityModel.Tokens (>= 8.3)
499+
System.IdentityModel.Tokens.Jwt (8.3.1) - restriction: || (&& (== net471) (>= net8.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net8.0))
500+
Microsoft.IdentityModel.JsonWebTokens (>= 8.3.1)
501+
Microsoft.IdentityModel.Tokens (>= 8.3.1)
498502
System.IO (4.3)
499503
Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
500504
Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)

‎src/Aardvark.UI.Primitives/Controllers/OrbitController.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ module OrbitController =
267267
}
268268
)
269269

270-
let app =
270+
let app : App<_,_,_> =
271271
{
272272
unpersist = Unpersist.instance
273273
threads = threads

‎src/Aardvark.UI.Primitives/Primitives/UI.Primitives.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ module TreeViewApp =
638638
TreeView.view [] (model.data |> AList.bind (viewTree []))
639639
)
640640

641-
let app =
641+
let app : App<_,_,_> =
642642
{
643643
unpersist = Unpersist.instance
644644
threads = fun _ -> ThreadPool.empty

‎src/Examples (dotnetcore)/01 - Inc/App.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ let threads (model : Model) =
3131
ThreadPool.empty
3232

3333

34-
let app =
34+
let app : App<_,_,_> =
3535
{
3636
unpersist = Unpersist.instance
3737
threads = threads

‎src/Examples (dotnetcore)/02 - RenderControl/App.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ let threads (model : Model) =
6363
FreeFlyController.threads model.cameraState |> ThreadPool.map Camera
6464

6565

66-
let app =
66+
let app : App<_,_,_> =
6767
{
6868
unpersist = Unpersist.instance
6969
threads = threads

‎src/Examples (dotnetcore)/03 - D3Integration/App.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ let threads (model : Model) =
5656
ThreadPool.empty
5757

5858

59-
let app =
59+
let app : App<_,_,_> =
6060
{
6161
unpersist = Unpersist.instance
6262
threads = threads

‎src/Examples (dotnetcore)/04 - DragDropHtml5/App.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ let threads (model : Model) =
6565
ThreadPool.empty
6666

6767

68-
let app =
68+
let app : App<_,_,_> =
6969
{
7070
unpersist = Unpersist.instance
7171
threads = threads

‎src/Examples (dotnetcore)/06 - DragDiv/App.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ let threads (model : Model) =
8787
ThreadPool.empty
8888

8989

90-
let app =
90+
let app : App<_,_,_> =
9191
{
9292
unpersist = Unpersist.instance
9393
threads = threads

0 commit comments

Comments
 (0)