Skip to content

Commit 08130d7

Browse files
lilithlilith
committed
Bump dependencies, enable trim/aot/singlefile analyzers, drop newtonsoft
1 parent 31fc0dc commit 08130d7

File tree

32 files changed

+669
-460
lines changed

32 files changed

+669
-460
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ bld/
2525
[Ll]og/
2626
host/
2727
NugetPackages/
28+
test-publish/
2829

2930
# DocFX build results
3031
_site/

‎examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.2" />
10+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300" />
1111
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.0" />
1212
</ItemGroup>
1313

‎examples/Imageflow.Server.Example/packages.lock.json

Lines changed: 58 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"net6.0": {
55
"AWSSDK.Extensions.NETCore.Setup": {
66
"type": "Direct",
7-
"requested": "[3.7.2, )",
8-
"resolved": "3.7.2",
9-
"contentHash": "iFjbEnVB0f6Hr8L3EfdelHG7zxVQrOmeP9UIrX3IODR1eTsrqVrmq0mazdIr0GZK1YG2/DZiVt6tNyV1bayndw==",
7+
"requested": "[3.7.300, )",
8+
"resolved": "3.7.300",
9+
"contentHash": "zMxAHFYSAWHsVV9Cn96nE+V40agRCjT0etF10f0d/nFMMb1z7lecVwNadq9JYyqlDj+jsVRH9ydk4Al4v/1+jg==",
1010
"dependencies": {
11-
"AWSSDK.Core": "3.7.6",
11+
"AWSSDK.Core": "3.7.300",
1212
"Microsoft.Extensions.Configuration.Abstractions": "2.0.0",
1313
"Microsoft.Extensions.DependencyInjection.Abstractions": "2.0.0",
1414
"Microsoft.Extensions.Logging.Abstractions": "2.0.0"
@@ -27,15 +27,15 @@
2727
},
2828
"AWSSDK.Core": {
2929
"type": "Transitive",
30-
"resolved": "3.7.300.28",
31-
"contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA=="
30+
"resolved": "3.7.302.2",
31+
"contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw=="
3232
},
3333
"AWSSDK.S3": {
3434
"type": "Transitive",
35-
"resolved": "3.7.305.3",
36-
"contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==",
35+
"resolved": "3.7.305.18",
36+
"contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==",
3737
"dependencies": {
38-
"AWSSDK.Core": "[3.7.300.28, 4.0.0)"
38+
"AWSSDK.Core": "[3.7.302.2, 4.0.0)"
3939
}
4040
},
4141
"Azure.Core": {
@@ -91,14 +91,14 @@
9191
},
9292
"Imageflow.AllPlatforms": {
9393
"type": "Transitive",
94-
"resolved": "0.10.2",
95-
"contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==",
94+
"resolved": "0.11.1",
95+
"contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==",
9696
"dependencies": {
9797
"Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8",
9898
"Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8",
9999
"Imageflow.NativeRuntime.win-x86": "2.0.0-preview8",
100100
"Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8",
101-
"Imageflow.Net": "0.10.2"
101+
"Imageflow.Net": "0.11.1"
102102
}
103103
},
104104
"Imageflow.NativeRuntime.osx-x86_64": {
@@ -123,24 +123,18 @@
123123
},
124124
"Imageflow.Net": {
125125
"type": "Transitive",
126-
"resolved": "0.10.2",
127-
"contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==",
126+
"resolved": "0.11.2",
127+
"contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==",
128128
"dependencies": {
129-
"Microsoft.CSharp": "4.7.0",
130-
"Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)",
131-
"Newtonsoft.Json": "[13.0.3, 14.0.0)"
129+
"Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)",
130+
"System.Text.Json": "6.0.9"
132131
}
133132
},
134133
"Microsoft.Bcl.AsyncInterfaces": {
135134
"type": "Transitive",
136135
"resolved": "6.0.0",
137136
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg=="
138137
},
139-
"Microsoft.CSharp": {
140-
"type": "Transitive",
141-
"resolved": "4.7.0",
142-
"contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
143-
},
144138
"Microsoft.Extensions.Azure": {
145139
"type": "Transitive",
146140
"resolved": "1.7.1",
@@ -277,19 +271,14 @@
277271
},
278272
"Microsoft.IO.RecyclableMemoryStream": {
279273
"type": "Transitive",
280-
"resolved": "1.2.2",
281-
"contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g=="
274+
"resolved": "3.0.0",
275+
"contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg=="
282276
},
283277
"Microsoft.NETCore.Platforms": {
284278
"type": "Transitive",
285279
"resolved": "5.0.0",
286280
"contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ=="
287281
},
288-
"Newtonsoft.Json": {
289-
"type": "Transitive",
290-
"resolved": "13.0.3",
291-
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
292-
},
293282
"Polly": {
294283
"type": "Transitive",
295284
"resolved": "7.1.0",
@@ -407,8 +396,12 @@
407396
},
408397
"System.Text.Json": {
409398
"type": "Transitive",
410-
"resolved": "4.7.2",
411-
"contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg=="
399+
"resolved": "6.0.9",
400+
"contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==",
401+
"dependencies": {
402+
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
403+
"System.Text.Encodings.Web": "6.0.0"
404+
}
412405
},
413406
"System.Threading.Tasks.Extensions": {
414407
"type": "Transitive",
@@ -418,9 +411,10 @@
418411
"imageflow.server": {
419412
"type": "Project",
420413
"dependencies": {
421-
"Imageflow.AllPlatforms": "[0.10.*, )",
414+
"Imageflow.AllPlatforms": "[0.11.1, )",
422415
"Imazen.Common": "[0.1.0--notset, )",
423-
"Imazen.Routing": "[0.1.0--notset, )"
416+
"Imazen.Routing": "[0.1.0--notset, )",
417+
"Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )"
424418
}
425419
},
426420
"imageflow.server.hybridcache": {
@@ -449,7 +443,7 @@
449443
"imageflow.server.storage.s3": {
450444
"type": "Project",
451445
"dependencies": {
452-
"AWSSDK.S3": "[3.7.305.3, )",
446+
"AWSSDK.S3": "[3.7.305.18, )",
453447
"Imazen.Common": "[0.1.0--notset, )",
454448
"Imazen.Routing": "[0.1.0--notset, )"
455449
}
@@ -478,7 +472,7 @@
478472
"type": "Project",
479473
"dependencies": {
480474
"CommunityToolkit.HighPerformance": "[8.*, )",
481-
"Imageflow.Net": "[0.10.*, )",
475+
"Imageflow.Net": "[0.11.2, )",
482476
"Imazen.Abstractions": "[0.1.0--notset, )",
483477
"Imazen.Common": "[0.1.0--notset, )",
484478
"System.Collections.Immutable": "[6.*, )",
@@ -489,11 +483,11 @@
489483
"net7.0": {
490484
"AWSSDK.Extensions.NETCore.Setup": {
491485
"type": "Direct",
492-
"requested": "[3.7.2, )",
493-
"resolved": "3.7.2",
494-
"contentHash": "iFjbEnVB0f6Hr8L3EfdelHG7zxVQrOmeP9UIrX3IODR1eTsrqVrmq0mazdIr0GZK1YG2/DZiVt6tNyV1bayndw==",
486+
"requested": "[3.7.300, )",
487+
"resolved": "3.7.300",
488+
"contentHash": "zMxAHFYSAWHsVV9Cn96nE+V40agRCjT0etF10f0d/nFMMb1z7lecVwNadq9JYyqlDj+jsVRH9ydk4Al4v/1+jg==",
495489
"dependencies": {
496-
"AWSSDK.Core": "3.7.6",
490+
"AWSSDK.Core": "3.7.300",
497491
"Microsoft.Extensions.Configuration.Abstractions": "2.0.0",
498492
"Microsoft.Extensions.DependencyInjection.Abstractions": "2.0.0",
499493
"Microsoft.Extensions.Logging.Abstractions": "2.0.0"
@@ -512,15 +506,15 @@
512506
},
513507
"AWSSDK.Core": {
514508
"type": "Transitive",
515-
"resolved": "3.7.300.28",
516-
"contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA=="
509+
"resolved": "3.7.302.2",
510+
"contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw=="
517511
},
518512
"AWSSDK.S3": {
519513
"type": "Transitive",
520-
"resolved": "3.7.305.3",
521-
"contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==",
514+
"resolved": "3.7.305.18",
515+
"contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==",
522516
"dependencies": {
523-
"AWSSDK.Core": "[3.7.300.28, 4.0.0)"
517+
"AWSSDK.Core": "[3.7.302.2, 4.0.0)"
524518
}
525519
},
526520
"Azure.Core": {
@@ -576,14 +570,14 @@
576570
},
577571
"Imageflow.AllPlatforms": {
578572
"type": "Transitive",
579-
"resolved": "0.10.2",
580-
"contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==",
573+
"resolved": "0.11.1",
574+
"contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==",
581575
"dependencies": {
582576
"Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8",
583577
"Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8",
584578
"Imageflow.NativeRuntime.win-x86": "2.0.0-preview8",
585579
"Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8",
586-
"Imageflow.Net": "0.10.2"
580+
"Imageflow.Net": "0.11.1"
587581
}
588582
},
589583
"Imageflow.NativeRuntime.osx-x86_64": {
@@ -608,24 +602,18 @@
608602
},
609603
"Imageflow.Net": {
610604
"type": "Transitive",
611-
"resolved": "0.10.2",
612-
"contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==",
605+
"resolved": "0.11.2",
606+
"contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==",
613607
"dependencies": {
614-
"Microsoft.CSharp": "4.7.0",
615-
"Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)",
616-
"Newtonsoft.Json": "[13.0.3, 14.0.0)"
608+
"Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)",
609+
"System.Text.Json": "6.0.9"
617610
}
618611
},
619612
"Microsoft.Bcl.AsyncInterfaces": {
620613
"type": "Transitive",
621614
"resolved": "6.0.0",
622615
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg=="
623616
},
624-
"Microsoft.CSharp": {
625-
"type": "Transitive",
626-
"resolved": "4.7.0",
627-
"contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
628-
},
629617
"Microsoft.Extensions.Azure": {
630618
"type": "Transitive",
631619
"resolved": "1.7.1",
@@ -762,19 +750,14 @@
762750
},
763751
"Microsoft.IO.RecyclableMemoryStream": {
764752
"type": "Transitive",
765-
"resolved": "1.2.2",
766-
"contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g=="
753+
"resolved": "3.0.0",
754+
"contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg=="
767755
},
768756
"Microsoft.NETCore.Platforms": {
769757
"type": "Transitive",
770758
"resolved": "5.0.0",
771759
"contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ=="
772760
},
773-
"Newtonsoft.Json": {
774-
"type": "Transitive",
775-
"resolved": "13.0.3",
776-
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
777-
},
778761
"Polly": {
779762
"type": "Transitive",
780763
"resolved": "7.1.0",
@@ -892,8 +875,12 @@
892875
},
893876
"System.Text.Json": {
894877
"type": "Transitive",
895-
"resolved": "4.7.2",
896-
"contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg=="
878+
"resolved": "6.0.9",
879+
"contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==",
880+
"dependencies": {
881+
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
882+
"System.Text.Encodings.Web": "6.0.0"
883+
}
897884
},
898885
"System.Threading.Tasks.Extensions": {
899886
"type": "Transitive",
@@ -903,9 +890,10 @@
903890
"imageflow.server": {
904891
"type": "Project",
905892
"dependencies": {
906-
"Imageflow.AllPlatforms": "[0.10.*, )",
893+
"Imageflow.AllPlatforms": "[0.11.1, )",
907894
"Imazen.Common": "[0.1.0--notset, )",
908-
"Imazen.Routing": "[0.1.0--notset, )"
895+
"Imazen.Routing": "[0.1.0--notset, )",
896+
"Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )"
909897
}
910898
},
911899
"imageflow.server.hybridcache": {
@@ -934,7 +922,7 @@
934922
"imageflow.server.storage.s3": {
935923
"type": "Project",
936924
"dependencies": {
937-
"AWSSDK.S3": "[3.7.305.3, )",
925+
"AWSSDK.S3": "[3.7.305.18, )",
938926
"Imazen.Common": "[0.1.0--notset, )",
939927
"Imazen.Routing": "[0.1.0--notset, )"
940928
}
@@ -963,7 +951,7 @@
963951
"type": "Project",
964952
"dependencies": {
965953
"CommunityToolkit.HighPerformance": "[8.*, )",
966-
"Imageflow.Net": "[0.10.*, )",
954+
"Imageflow.Net": "[0.11.2, )",
967955
"Imazen.Abstractions": "[0.1.0--notset, )",
968956
"Imazen.Common": "[0.1.0--notset, )",
969957
"System.Collections.Immutable": "[6.*, )",

‎examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Imageflow.Server" Version="0.8.2" />
8+
<PackageReference Include="Imageflow.Server" Version="0.8.3" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎examples/Imageflow.Server.ExampleDocker/packages.lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"net7.0": {
55
"Imageflow.Server": {
66
"type": "Direct",
7-
"requested": "[0.8.2, )",
8-
"resolved": "0.8.2",
9-
"contentHash": "ozwYYpFQb9rUpHq+EApNERC7qbA88KYpvrQWTXjLWM/IwIETA/X8uyRTNDHcgjmFx/8c2y647KMhnt0PfiZeqA==",
7+
"requested": "[0.8.3, )",
8+
"resolved": "0.8.3",
9+
"contentHash": "gLoyMT37OXtjZIuVvgYAAhgyh5q4Ak/YFaCyoOiaQUa8a7qJd9LKzcEmHvJyrYNT/e0vgh3/n+WjmlJuA7Gtig==",
1010
"dependencies": {
1111
"Imageflow.AllPlatforms": "0.10.2",
12-
"Imazen.Common": "0.8.2"
12+
"Imazen.Common": "0.8.3"
1313
}
1414
},
1515
"Imageflow.AllPlatforms": {
@@ -56,8 +56,8 @@
5656
},
5757
"Imazen.Common": {
5858
"type": "Transitive",
59-
"resolved": "0.8.2",
60-
"contentHash": "EAnfbEUy2vnyFQYRV75/AZYwy6z4vhEkSQXXqM77ksO5NqL0sIUcGX9cb51lqTfhHS0Dxu0YQC05fMsBtxhiew==",
59+
"resolved": "0.8.3",
60+
"contentHash": "fV0lMNq/NFUfQQchwt8lE2vwwXZz/0t6Pacwpup/esZtU1idWnQE1OCnJeC0u7iIwSy1uLNWR9UPoTiSYstIdg==",
6161
"dependencies": {
6262
"Microsoft.Extensions.Hosting.Abstractions": "2.2.0"
6363
}

‎examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Imageflow.Server" Version="0.8.2" />
9-
<PackageReference Include="Imageflow.Server.HybridCache" Version="0.7.9" />
8+
<PackageReference Include="Imageflow.Server" Version="0.8.3" />
9+
<PackageReference Include="Imageflow.Server.HybridCache" Version="0.8.3" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)