From 08130d7d200888421beb17f1f74628a72c3dc681 Mon Sep 17 00:00:00 2001 From: Lilith River Date: Mon, 29 Jan 2024 14:14:33 -0700 Subject: [PATCH] Bump dependencies, enable trim/aot/singlefile analyzers, drop newtonsoft --- .gitignore | 1 + .../Imageflow.Server.Example.csproj | 2 +- .../packages.lock.json | 128 +++++++-------- .../Imageflow.Server.ExampleDocker.csproj | 2 +- .../packages.lock.json | 12 +- ...eflow.Server.ExampleDockerDiskCache.csproj | 4 +- .../packages.lock.json | 28 ++-- .../packages.lock.json | 45 +++--- .../Imageflow.Server.Configuration.csproj | 7 +- .../packages.lock.json | 57 +++---- .../packages.lock.json | 6 + .../Imageflow.Server.Host.csproj | 5 +- src/Imageflow.Server.Host/packages.lock.json | 70 ++++----- src/Imageflow.Server.Host/test.ps1 | 146 ++++++++++++++++++ .../packages.lock.json | 6 + .../packages.lock.json | 6 + .../packages.lock.json | 6 + .../Imageflow.Server.Storage.S3.csproj | 2 +- .../packages.lock.json | 135 ++++++++-------- src/Imageflow.Server/Imageflow.Server.csproj | 7 +- .../LegacyOptions/NamedWatermark.cs | 1 - src/Imageflow.Server/packages.lock.json | 104 +++++++------ src/Imazen.Abstractions/packages.lock.json | 6 + src/Imazen.Common/Imazen.Common.csproj | 3 + src/Imazen.Common/packages.lock.json | 6 + src/Imazen.HybridCache/packages.lock.json | 6 + src/Imazen.Routing/Imazen.Routing.csproj | 2 +- src/Imazen.Routing/packages.lock.json | 105 +++++++------ src/NugetPackageDefaults.targets | 3 + .../packages.lock.json | 50 +++--- .../Imageflow.Server.Tests/packages.lock.json | 110 +++++++------ tests/ImazenShared.Tests/packages.lock.json | 58 +++---- 32 files changed, 669 insertions(+), 460 deletions(-) create mode 100644 src/Imageflow.Server.Host/test.ps1 diff --git a/.gitignore b/.gitignore index e5c86b4f..aedcc692 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ bld/ [Ll]og/ host/ NugetPackages/ +test-publish/ # DocFX build results _site/ diff --git a/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj b/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj index 86f8d96f..379d7ef1 100644 --- a/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj +++ b/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Imageflow.Server.Example/packages.lock.json b/examples/Imageflow.Server.Example/packages.lock.json index 2d680448..163bc50a 100644 --- a/examples/Imageflow.Server.Example/packages.lock.json +++ b/examples/Imageflow.Server.Example/packages.lock.json @@ -4,11 +4,11 @@ "net6.0": { "AWSSDK.Extensions.NETCore.Setup": { "type": "Direct", - "requested": "[3.7.2, )", - "resolved": "3.7.2", - "contentHash": "iFjbEnVB0f6Hr8L3EfdelHG7zxVQrOmeP9UIrX3IODR1eTsrqVrmq0mazdIr0GZK1YG2/DZiVt6tNyV1bayndw==", + "requested": "[3.7.300, )", + "resolved": "3.7.300", + "contentHash": "zMxAHFYSAWHsVV9Cn96nE+V40agRCjT0etF10f0d/nFMMb1z7lecVwNadq9JYyqlDj+jsVRH9ydk4Al4v/1+jg==", "dependencies": { - "AWSSDK.Core": "3.7.6", + "AWSSDK.Core": "3.7.300", "Microsoft.Extensions.Configuration.Abstractions": "2.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.0.0", "Microsoft.Extensions.Logging.Abstractions": "2.0.0" @@ -27,15 +27,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==" + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==" }, "AWSSDK.S3": { "type": "Transitive", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Azure.Core": { @@ -91,14 +91,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -123,12 +123,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -136,11 +135,6 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Azure": { "type": "Transitive", "resolved": "1.7.1", @@ -277,19 +271,14 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "Polly": { "type": "Transitive", "resolved": "7.1.0", @@ -407,8 +396,12 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -418,9 +411,10 @@ "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imageflow.server.hybridcache": { @@ -449,7 +443,7 @@ "imageflow.server.storage.s3": { "type": "Project", "dependencies": { - "AWSSDK.S3": "[3.7.305.3, )", + "AWSSDK.S3": "[3.7.305.18, )", "Imazen.Common": "[0.1.0--notset, )", "Imazen.Routing": "[0.1.0--notset, )" } @@ -478,7 +472,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", @@ -489,11 +483,11 @@ "net7.0": { "AWSSDK.Extensions.NETCore.Setup": { "type": "Direct", - "requested": "[3.7.2, )", - "resolved": "3.7.2", - "contentHash": "iFjbEnVB0f6Hr8L3EfdelHG7zxVQrOmeP9UIrX3IODR1eTsrqVrmq0mazdIr0GZK1YG2/DZiVt6tNyV1bayndw==", + "requested": "[3.7.300, )", + "resolved": "3.7.300", + "contentHash": "zMxAHFYSAWHsVV9Cn96nE+V40agRCjT0etF10f0d/nFMMb1z7lecVwNadq9JYyqlDj+jsVRH9ydk4Al4v/1+jg==", "dependencies": { - "AWSSDK.Core": "3.7.6", + "AWSSDK.Core": "3.7.300", "Microsoft.Extensions.Configuration.Abstractions": "2.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.0.0", "Microsoft.Extensions.Logging.Abstractions": "2.0.0" @@ -512,15 +506,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==" + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==" }, "AWSSDK.S3": { "type": "Transitive", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Azure.Core": { @@ -576,14 +570,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -608,12 +602,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -621,11 +614,6 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Azure": { "type": "Transitive", "resolved": "1.7.1", @@ -762,19 +750,14 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "Polly": { "type": "Transitive", "resolved": "7.1.0", @@ -892,8 +875,12 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -903,9 +890,10 @@ "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imageflow.server.hybridcache": { @@ -934,7 +922,7 @@ "imageflow.server.storage.s3": { "type": "Project", "dependencies": { - "AWSSDK.S3": "[3.7.305.3, )", + "AWSSDK.S3": "[3.7.305.18, )", "Imazen.Common": "[0.1.0--notset, )", "Imazen.Routing": "[0.1.0--notset, )" } @@ -963,7 +951,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj b/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj index 174d73e2..47c7520d 100644 --- a/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj +++ b/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj @@ -5,7 +5,7 @@ - + diff --git a/examples/Imageflow.Server.ExampleDocker/packages.lock.json b/examples/Imageflow.Server.ExampleDocker/packages.lock.json index 6e82fd20..8c117391 100644 --- a/examples/Imageflow.Server.ExampleDocker/packages.lock.json +++ b/examples/Imageflow.Server.ExampleDocker/packages.lock.json @@ -4,12 +4,12 @@ "net7.0": { "Imageflow.Server": { "type": "Direct", - "requested": "[0.8.2, )", - "resolved": "0.8.2", - "contentHash": "ozwYYpFQb9rUpHq+EApNERC7qbA88KYpvrQWTXjLWM/IwIETA/X8uyRTNDHcgjmFx/8c2y647KMhnt0PfiZeqA==", + "requested": "[0.8.3, )", + "resolved": "0.8.3", + "contentHash": "gLoyMT37OXtjZIuVvgYAAhgyh5q4Ak/YFaCyoOiaQUa8a7qJd9LKzcEmHvJyrYNT/e0vgh3/n+WjmlJuA7Gtig==", "dependencies": { "Imageflow.AllPlatforms": "0.10.2", - "Imazen.Common": "0.8.2" + "Imazen.Common": "0.8.3" } }, "Imageflow.AllPlatforms": { @@ -56,8 +56,8 @@ }, "Imazen.Common": { "type": "Transitive", - "resolved": "0.8.2", - "contentHash": "EAnfbEUy2vnyFQYRV75/AZYwy6z4vhEkSQXXqM77ksO5NqL0sIUcGX9cb51lqTfhHS0Dxu0YQC05fMsBtxhiew==", + "resolved": "0.8.3", + "contentHash": "fV0lMNq/NFUfQQchwt8lE2vwwXZz/0t6Pacwpup/esZtU1idWnQE1OCnJeC0u7iIwSy1uLNWR9UPoTiSYstIdg==", "dependencies": { "Microsoft.Extensions.Hosting.Abstractions": "2.2.0" } diff --git a/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj b/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj index e8ff8584..a499be86 100644 --- a/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj +++ b/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/examples/Imageflow.Server.ExampleDockerDiskCache/packages.lock.json b/examples/Imageflow.Server.ExampleDockerDiskCache/packages.lock.json index 4f79f0b2..8b887208 100644 --- a/examples/Imageflow.Server.ExampleDockerDiskCache/packages.lock.json +++ b/examples/Imageflow.Server.ExampleDockerDiskCache/packages.lock.json @@ -4,22 +4,22 @@ "net7.0": { "Imageflow.Server": { "type": "Direct", - "requested": "[0.8.2, )", - "resolved": "0.8.2", - "contentHash": "ozwYYpFQb9rUpHq+EApNERC7qbA88KYpvrQWTXjLWM/IwIETA/X8uyRTNDHcgjmFx/8c2y647KMhnt0PfiZeqA==", + "requested": "[0.8.3, )", + "resolved": "0.8.3", + "contentHash": "gLoyMT37OXtjZIuVvgYAAhgyh5q4Ak/YFaCyoOiaQUa8a7qJd9LKzcEmHvJyrYNT/e0vgh3/n+WjmlJuA7Gtig==", "dependencies": { "Imageflow.AllPlatforms": "0.10.2", - "Imazen.Common": "0.8.2" + "Imazen.Common": "0.8.3" } }, "Imageflow.Server.HybridCache": { "type": "Direct", - "requested": "[0.7.9, )", - "resolved": "0.7.9", - "contentHash": "fopBXxN3+KwWkzudbYCKK6k4wp9rSFMDyvBbRcxrINmJ0SsiXHMTm84JYw/QjD+beWiGuY1HjYy0CMmvCOV80w==", + "requested": "[0.8.3, )", + "resolved": "0.8.3", + "contentHash": "lZQWlCcI/dyBSGta/Gunj63jT3Qj48fAeMh40T+sItCs1e/JYscbDPANydRqvUQD0GTW+gwVUuQh85YFQL3m+w==", "dependencies": { - "Imazen.Common": "0.7.9", - "Imazen.HybridCache": "0.7.9", + "Imazen.Common": "0.8.3", + "Imazen.HybridCache": "0.8.3", "Microsoft.Extensions.Hosting.Abstractions": "2.2.0" } }, @@ -67,18 +67,18 @@ }, "Imazen.Common": { "type": "Transitive", - "resolved": "0.8.2", - "contentHash": "EAnfbEUy2vnyFQYRV75/AZYwy6z4vhEkSQXXqM77ksO5NqL0sIUcGX9cb51lqTfhHS0Dxu0YQC05fMsBtxhiew==", + "resolved": "0.8.3", + "contentHash": "fV0lMNq/NFUfQQchwt8lE2vwwXZz/0t6Pacwpup/esZtU1idWnQE1OCnJeC0u7iIwSy1uLNWR9UPoTiSYstIdg==", "dependencies": { "Microsoft.Extensions.Hosting.Abstractions": "2.2.0" } }, "Imazen.HybridCache": { "type": "Transitive", - "resolved": "0.7.9", - "contentHash": "p6w3NWzYAt5TAt/+Ci7+Kimwm2Af2iC9Vz49Ye4ivho2GCxSyIGKoxh/6J6wKjyPM9c50OBDsSLv7OrrugkNhQ==", + "resolved": "0.8.3", + "contentHash": "9MJEgXZjxTxSWxjmM7UH2iMxy2+V4zhj7yt9BQ5nc+aJ/Fwokrrgt+/+kk9SCGXk+gvGQUwV9MDty/Y5nc6mJQ==", "dependencies": { - "Imazen.Common": "0.7.9" + "Imazen.Common": "0.8.3" } }, "Microsoft.CSharp": { diff --git a/examples/Imageflow.Server.ExampleMinimal/packages.lock.json b/examples/Imageflow.Server.ExampleMinimal/packages.lock.json index 9b6f829f..c956b21c 100644 --- a/examples/Imageflow.Server.ExampleMinimal/packages.lock.json +++ b/examples/Imageflow.Server.ExampleMinimal/packages.lock.json @@ -9,14 +9,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -41,19 +41,13 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -102,13 +96,8 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" - }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "System.Collections.Immutable": { "type": "Transitive", @@ -141,12 +130,22 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imazen.abstractions": { @@ -166,7 +165,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/src/Imageflow.Server.Configuration/Imageflow.Server.Configuration.csproj b/src/Imageflow.Server.Configuration/Imageflow.Server.Configuration.csproj index 46ec5ca3..0feda63b 100644 --- a/src/Imageflow.Server.Configuration/Imageflow.Server.Configuration.csproj +++ b/src/Imageflow.Server.Configuration/Imageflow.Server.Configuration.csproj @@ -4,10 +4,15 @@ net8.0 + true + true + true + true + true - + diff --git a/src/Imageflow.Server.Configuration/packages.lock.json b/src/Imageflow.Server.Configuration/packages.lock.json index efa32d9d..ba2cab7e 100644 --- a/src/Imageflow.Server.Configuration/packages.lock.json +++ b/src/Imageflow.Server.Configuration/packages.lock.json @@ -2,6 +2,12 @@ "version": 1, "dependencies": { "net8.0": { + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -14,9 +20,9 @@ }, "Tomlyn": { "type": "Direct", - "requested": "[0.16.2, )", - "resolved": "0.16.2", - "contentHash": "NVvOlecYWwhqQdE461UGHUeJ1t2DtGXU+L00LgtBTgWA16bUmMhUIRaCpSkRX5HqAeid/KlXmdH7Sul0mr6HJA==" + "requested": "[0.17.0, )", + "resolved": "0.17.0", + "contentHash": "3BRbxOjZwgdXBGemOvJWuydaG/KsKrnG1Z15Chruvih8Tc8bgtLcmDgo6LPRqiF5LNh6X4Vmos7YuGteBHfePA==" }, "CommunityToolkit.HighPerformance": { "type": "Transitive", @@ -25,14 +31,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -57,12 +63,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -75,11 +80,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -128,19 +128,14 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "6.0.0", @@ -188,12 +183,22 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imageflow.server.hybridcache": { @@ -228,7 +233,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/src/Imageflow.Server.DiskCache/packages.lock.json b/src/Imageflow.Server.DiskCache/packages.lock.json index d20a885a..c4c88eb1 100644 --- a/src/Imageflow.Server.DiskCache/packages.lock.json +++ b/src/Imageflow.Server.DiskCache/packages.lock.json @@ -265,6 +265,12 @@ } }, "net8.0": { + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/src/Imageflow.Server.Host/Imageflow.Server.Host.csproj b/src/Imageflow.Server.Host/Imageflow.Server.Host.csproj index 8f463fd5..666aa827 100644 --- a/src/Imageflow.Server.Host/Imageflow.Server.Host.csproj +++ b/src/Imageflow.Server.Host/Imageflow.Server.Host.csproj @@ -8,6 +8,9 @@ Linux Speed true + true + true + true @@ -23,7 +26,7 @@ - + diff --git a/src/Imageflow.Server.Host/packages.lock.json b/src/Imageflow.Server.Host/packages.lock.json index 71c11a59..2f594344 100644 --- a/src/Imageflow.Server.Host/packages.lock.json +++ b/src/Imageflow.Server.Host/packages.lock.json @@ -4,11 +4,11 @@ "net8.0": { "AWSSDK.Extensions.NETCore.Setup": { "type": "Direct", - "requested": "[3.7.2, )", - "resolved": "3.7.2", - "contentHash": "iFjbEnVB0f6Hr8L3EfdelHG7zxVQrOmeP9UIrX3IODR1eTsrqVrmq0mazdIr0GZK1YG2/DZiVt6tNyV1bayndw==", + "requested": "[3.7.300, )", + "resolved": "3.7.300", + "contentHash": "zMxAHFYSAWHsVV9Cn96nE+V40agRCjT0etF10f0d/nFMMb1z7lecVwNadq9JYyqlDj+jsVRH9ydk4Al4v/1+jg==", "dependencies": { - "AWSSDK.Core": "3.7.6", + "AWSSDK.Core": "3.7.300", "Microsoft.Extensions.Configuration.Abstractions": "2.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.0.0", "Microsoft.Extensions.Logging.Abstractions": "2.0.0" @@ -39,15 +39,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==" + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==" }, "AWSSDK.S3": { "type": "Transitive", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Azure.Core": { @@ -103,14 +103,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -135,12 +135,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -148,11 +147,6 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Azure": { "type": "Transitive", "resolved": "1.7.1", @@ -289,19 +283,14 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "Polly": { "type": "Transitive", "resolved": "7.1.0", @@ -419,8 +408,12 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -429,15 +422,16 @@ }, "Tomlyn": { "type": "Transitive", - "resolved": "0.16.2", - "contentHash": "NVvOlecYWwhqQdE461UGHUeJ1t2DtGXU+L00LgtBTgWA16bUmMhUIRaCpSkRX5HqAeid/KlXmdH7Sul0mr6HJA==" + "resolved": "0.17.0", + "contentHash": "3BRbxOjZwgdXBGemOvJWuydaG/KsKrnG1Z15Chruvih8Tc8bgtLcmDgo6LPRqiF5LNh6X4Vmos7YuGteBHfePA==" }, "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imageflow.server.configuration": { @@ -446,7 +440,7 @@ "Imageflow.Server": "[0.1.0--notset, )", "Imageflow.Server.HybridCache": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", - "Tomlyn": "[0.16.2, )" + "Tomlyn": "[0.17.0, )" } }, "imageflow.server.hybridcache": { @@ -475,7 +469,7 @@ "imageflow.server.storage.s3": { "type": "Project", "dependencies": { - "AWSSDK.S3": "[3.7.305.3, )", + "AWSSDK.S3": "[3.7.305.18, )", "Imazen.Common": "[0.1.0--notset, )", "Imazen.Routing": "[0.1.0--notset, )" } @@ -504,7 +498,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/src/Imageflow.Server.Host/test.ps1 b/src/Imageflow.Server.Host/test.ps1 new file mode 100644 index 00000000..10d66329 --- /dev/null +++ b/src/Imageflow.Server.Host/test.ps1 @@ -0,0 +1,146 @@ + +# Get the directory this file is in, and change to it. +$scriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition +Set-Location $scriptPath + +# First, we publish to a folder. +dotnet publish -c Release ./Imageflow.Server.Host.csproj -o ./test-publish/ +# if the above fails, exit with a non-zero exit code. +if ($LASTEXITCODE -ne 0) { + Write-Output "Failed to publish the AOT test project. Exiting." + Write-Warning "Failed to publish the AOT test project. Exiting." + + exit 1 +} + +# run the executable in the background in ./publish/native/Imageflow.Server.Host.exe or ./publish/native/Imageflow.Server.Host +$process = $null +if (Test-Path -Path ./publish/native/Imageflow.Server.Host.exe) { + $process = Start-Process -FilePath ./test-publish/Imageflow.Server.Host.exe -NoNewWindow -PassThru -RedirectStandardOutput "./output.log" +} else { + $process = Start-Process -FilePath ./test-publish/Imageflow.Server.Host -NoNewWindow -PassThru -RedirectStandardOutput "./output.log" +} +# report on the process, if it started +if ($null -eq $process) { + Write-Output "Failed to start the server. Exiting." + Write-Warning "Failed to start the server. Exiting." + exit 1 +} +Write-Output "Started the server with PID $($process.Id)" + +# quit if the process failed to start +if ($LASTEXITCODE -ne 0) { + exit 1 +} +# store the PID of the executable +$server_pid = $process.Id + +# wait for the server to start 200ms +Start-Sleep -Milliseconds 200 + +$output = (Get-Content "./output.log"); +# if null, it failed to start +if ($output -eq $null) { + Write-Error "Failed to start the server (no output). Exiting." + exit 1 +} + +Write-Output "Server output:" +Write-Output $output + +# parse the port from the output log +$port = 5000 +$portRegex = [regex]::new("Now listening on: http://localhost:(\d+)") +$portMatch = $portRegex.Match($output) +if ($portMatch.Success) { + $port = $portMatch.Groups[1].Value +} + + + +# if the process doesn't respond to a request, sleep 5 seconds and try again +$timeout = 5 +$timeoutCounter = 0 +while ($timeoutCounter -lt $timeout) { + + # try to make a request to the server + $timeoutMs = $timeoutCounter * 500 + 200 + $url = "http://localhost:$port/" + try{ + $response = Invoke-WebRequest -Uri $url -TimeoutSec 1 -OutVariable response + if ($response -ne $null) { + Write-Output "Server responded to GET $url with status code $($response.StatusCode)" + break + } + } catch { + Write-Warning "Failed to make a request to $url with exception $_" + $timeoutCounter++ + + # if the process is not running, exit with a non-zero exit code + if (-not (Get-Process -Id $server_pid -ErrorAction SilentlyContinue)) { + Write-Warning "Server process with PID $server_pid is not running, crash detected. Exiting." + exit 1 + } + Start-Sleep -Seconds 1 + continue + } + Write-Warning "Server is not responding to requests at $url yet (timeout $timeoutMs), sleeping 1 second" + # Find what's new in the output log that isn't in $output + $newOutput = Get-Content "./output.log" | Select-Object -Skip $output.Length + Write-Output $newOutput + + Start-Sleep -Seconds 1 + $timeoutCounter++ +} + +$testsFailed = 0 +try +{ + # test /imageflow/version + $version = Invoke-WebRequest -Uri http://localhost:5000/imageflow/version + if ($LASTEXITCODE -ne 0) + { + Write-Error "Request to /imageflow/version failed with exit code $LASTEXITCODE" + $testsFailed += 1 + } +} catch { + Write-Error "Request to /imageflow/version failed with exception $_" + $testsFailed += 1 +} + +# test /imageflow/resize/width/10 +try +{ + $resize = Invoke-WebRequest -Uri http://localhost:5000/imageflow/resize/width/10 + if ($LASTEXITCODE -ne 0) + { + Write-Warning "Request to /imageflow/resize/width/10 failed with exit code $LASTEXITCODE" + $testsFailed += 1 + } +} catch { + Write-Warning "Request to /imageflow/resize/width/10 failed with exception $_" + $testsFailed += 1 +} +# exit with a non-zero exit code if any tests failed +if ($testsFailed -ne 0) +{ + Write-Warning "$testsFailed tests failed. Exiting." +} + +# kill the server +Stop-Process -Id $server_pid +if ($LASTEXITCODE -ne 0) { + Write-Warning "Failed to kill the server process with PID $server_pid" +} + +# print the process output +Get-Content "./output.log" + +# exit with a non-zero exit code if any tests failed +if ($testsFailed -ne 0) { + Write-Warning "$testsFailed tests failed. Exiting." + exit 1 +} +Write-Output "YAYYYY" +Write-Output "All tests passed. Exiting." +exit 0 \ No newline at end of file diff --git a/src/Imageflow.Server.HybridCache/packages.lock.json b/src/Imageflow.Server.HybridCache/packages.lock.json index 8c6e5dde..c91fed29 100644 --- a/src/Imageflow.Server.HybridCache/packages.lock.json +++ b/src/Imageflow.Server.HybridCache/packages.lock.json @@ -316,6 +316,12 @@ "Microsoft.Extensions.Logging.Abstractions": "2.2.0" } }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/src/Imageflow.Server.Storage.AzureBlob/packages.lock.json b/src/Imageflow.Server.Storage.AzureBlob/packages.lock.json index 84ca00d3..23f1eebf 100644 --- a/src/Imageflow.Server.Storage.AzureBlob/packages.lock.json +++ b/src/Imageflow.Server.Storage.AzureBlob/packages.lock.json @@ -644,6 +644,12 @@ "Microsoft.Extensions.Options": "2.1.0" } }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/src/Imageflow.Server.Storage.RemoteReader/packages.lock.json b/src/Imageflow.Server.Storage.RemoteReader/packages.lock.json index 52d8e9b7..2122a262 100644 --- a/src/Imageflow.Server.Storage.RemoteReader/packages.lock.json +++ b/src/Imageflow.Server.Storage.RemoteReader/packages.lock.json @@ -347,6 +347,12 @@ "Microsoft.Extensions.Options": "5.0.0" } }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/src/Imageflow.Server.Storage.S3/Imageflow.Server.Storage.S3.csproj b/src/Imageflow.Server.Storage.S3/Imageflow.Server.Storage.S3.csproj index cb3c9fd6..7770de2c 100644 --- a/src/Imageflow.Server.Storage.S3/Imageflow.Server.Storage.S3.csproj +++ b/src/Imageflow.Server.Storage.S3/Imageflow.Server.Storage.S3.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Imageflow.Server.Storage.S3/packages.lock.json b/src/Imageflow.Server.Storage.S3/packages.lock.json index 7e2519ad..961897e5 100644 --- a/src/Imageflow.Server.Storage.S3/packages.lock.json +++ b/src/Imageflow.Server.Storage.S3/packages.lock.json @@ -4,11 +4,11 @@ ".NETStandard,Version=v2.0": { "AWSSDK.S3": { "type": "Direct", - "requested": "[3.7.305.3, )", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "requested": "[3.7.305.18, )", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Microsoft.SourceLink.GitHub": { @@ -32,8 +32,8 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==", + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.0" } @@ -51,12 +51,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -77,11 +76,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -143,11 +137,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -184,8 +173,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -202,6 +191,20 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", @@ -231,7 +234,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", @@ -243,11 +246,11 @@ "net6.0": { "AWSSDK.S3": { "type": "Direct", - "requested": "[3.7.305.3, )", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "requested": "[3.7.305.18, )", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Microsoft.SourceLink.GitHub": { @@ -262,8 +265,8 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==" + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==" }, "CommunityToolkit.HighPerformance": { "type": "Transitive", @@ -272,12 +275,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Build.Tasks.Git": { @@ -285,11 +287,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -346,11 +343,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "6.0.0", @@ -382,6 +374,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imazen.abstractions": { "type": "Project", "dependencies": { @@ -399,7 +400,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", @@ -410,11 +411,11 @@ "net8.0": { "AWSSDK.S3": { "type": "Direct", - "requested": "[3.7.305.3, )", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "requested": "[3.7.305.18, )", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Microsoft.SourceLink.GitHub": { @@ -429,8 +430,8 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==" + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==" }, "CommunityToolkit.HighPerformance": { "type": "Transitive", @@ -439,12 +440,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Build.Tasks.Git": { @@ -452,11 +452,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -513,11 +508,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "6.0.0", @@ -549,6 +539,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imazen.abstractions": { "type": "Project", "dependencies": { @@ -566,7 +565,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/src/Imageflow.Server/Imageflow.Server.csproj b/src/Imageflow.Server/Imageflow.Server.csproj index f7f3f018..5c1fd473 100644 --- a/src/Imageflow.Server/Imageflow.Server.csproj +++ b/src/Imageflow.Server/Imageflow.Server.csproj @@ -6,6 +6,10 @@ Imageflow.Server Imageflow .NET Server - Middleware for fetching, processing, and caching images on-demand. Imageflow.Server - Middleware for fetching, processing, and caching images on-demand. Commercial licenses available. + + true + true + true @@ -20,7 +24,8 @@ - + + diff --git a/src/Imageflow.Server/LegacyOptions/NamedWatermark.cs b/src/Imageflow.Server/LegacyOptions/NamedWatermark.cs index 65579ee3..23bdaf0f 100644 --- a/src/Imageflow.Server/LegacyOptions/NamedWatermark.cs +++ b/src/Imageflow.Server/LegacyOptions/NamedWatermark.cs @@ -1,6 +1,5 @@ using Imageflow.Fluent; using Imazen.Routing.Promises.Pipelines.Watermarking; -using Newtonsoft.Json; namespace Imageflow.Server { diff --git a/src/Imageflow.Server/packages.lock.json b/src/Imageflow.Server/packages.lock.json index b4fa5c3b..89eaaee9 100644 --- a/src/Imageflow.Server/packages.lock.json +++ b/src/Imageflow.Server/packages.lock.json @@ -4,17 +4,23 @@ "net6.0": { "Imageflow.AllPlatforms": { "type": "Direct", - "requested": "[0.10.*, )", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "requested": "[0.11.1, )", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, + "Microsoft.IO.RecyclableMemoryStream": { + "type": "Direct", + "requested": "[3.0.0, )", + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -52,12 +58,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Build.Tasks.Git": { @@ -65,11 +70,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -116,21 +116,11 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.1" } }, - "Microsoft.IO.RecyclableMemoryStream": { - "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "6.0.0", @@ -162,6 +152,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imazen.abstractions": { "type": "Project", "dependencies": { @@ -179,7 +178,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", @@ -190,17 +189,29 @@ "net8.0": { "Imageflow.AllPlatforms": { "type": "Direct", - "requested": "[0.10.*, )", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "requested": "[0.11.1, )", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, + "Microsoft.IO.RecyclableMemoryStream": { + "type": "Direct", + "requested": "[3.0.0, )", + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -238,12 +249,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Build.Tasks.Git": { @@ -251,11 +261,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -302,21 +307,11 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.1" } }, - "Microsoft.IO.RecyclableMemoryStream": { - "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "6.0.0", @@ -348,6 +343,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imazen.abstractions": { "type": "Project", "dependencies": { @@ -365,7 +369,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/src/Imazen.Abstractions/packages.lock.json b/src/Imazen.Abstractions/packages.lock.json index 07c335a2..d56b5950 100644 --- a/src/Imazen.Abstractions/packages.lock.json +++ b/src/Imazen.Abstractions/packages.lock.json @@ -253,6 +253,12 @@ "Microsoft.Extensions.Logging.Abstractions": "2.2.0" } }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/src/Imazen.Common/Imazen.Common.csproj b/src/Imazen.Common/Imazen.Common.csproj index 7f552cc7..ed52e372 100644 --- a/src/Imazen.Common/Imazen.Common.csproj +++ b/src/Imazen.Common/Imazen.Common.csproj @@ -7,6 +7,9 @@ net8.0;netstandard2.0;net6.0 latest enable + true + true + true diff --git a/src/Imazen.Common/packages.lock.json b/src/Imazen.Common/packages.lock.json index 06dff710..01bc8ee4 100644 --- a/src/Imazen.Common/packages.lock.json +++ b/src/Imazen.Common/packages.lock.json @@ -239,6 +239,12 @@ } }, "net8.0": { + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/src/Imazen.HybridCache/packages.lock.json b/src/Imazen.HybridCache/packages.lock.json index 990fcfe1..d10da502 100644 --- a/src/Imazen.HybridCache/packages.lock.json +++ b/src/Imazen.HybridCache/packages.lock.json @@ -290,6 +290,12 @@ } }, "net8.0": { + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/src/Imazen.Routing/Imazen.Routing.csproj b/src/Imazen.Routing/Imazen.Routing.csproj index 6f927c28..5ae84567 100644 --- a/src/Imazen.Routing/Imazen.Routing.csproj +++ b/src/Imazen.Routing/Imazen.Routing.csproj @@ -15,7 +15,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Imazen.Routing/packages.lock.json b/src/Imazen.Routing/packages.lock.json index e76bc4d9..8cfdce49 100644 --- a/src/Imazen.Routing/packages.lock.json +++ b/src/Imazen.Routing/packages.lock.json @@ -16,13 +16,12 @@ }, "Imageflow.Net": { "type": "Direct", - "requested": "[0.10.*, )", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "requested": "[0.11.2, )", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.SourceLink.GitHub": { @@ -98,11 +97,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -164,11 +158,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -186,8 +175,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -204,6 +193,20 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "imazen.abstractions": { "type": "Project", "dependencies": { @@ -231,13 +234,12 @@ }, "Imageflow.Net": { "type": "Direct", - "requested": "[0.10.*, )", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "requested": "[0.11.2, )", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.SourceLink.GitHub": { @@ -276,11 +278,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -337,11 +334,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.1", @@ -360,6 +352,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imazen.abstractions": { "type": "Project", "dependencies": { @@ -383,15 +384,20 @@ }, "Imageflow.Net": { "type": "Direct", - "requested": "[0.10.*, )", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "requested": "[0.11.2, )", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -428,11 +434,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -489,11 +490,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.1", @@ -512,6 +508,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "imazen.abstractions": { "type": "Project", "dependencies": { diff --git a/src/NugetPackageDefaults.targets b/src/NugetPackageDefaults.targets index 013b0550..36c9523d 100644 --- a/src/NugetPackageDefaults.targets +++ b/src/NugetPackageDefaults.targets @@ -1,6 +1,9 @@ net8.0;netstandard2.0;net6.0 + true + true + true \ No newline at end of file diff --git a/tests/Imageflow.Server.Configuration.Tests/packages.lock.json b/tests/Imageflow.Server.Configuration.Tests/packages.lock.json index b2dbeb95..f8e2aec5 100644 --- a/tests/Imageflow.Server.Configuration.Tests/packages.lock.json +++ b/tests/Imageflow.Server.Configuration.Tests/packages.lock.json @@ -42,14 +42,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -74,12 +74,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -92,11 +91,6 @@ "resolved": "17.5.0", "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -145,8 +139,8 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -239,8 +233,8 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "NuGet.Frameworks": { "type": "Transitive", @@ -1038,6 +1032,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "System.Text.RegularExpressions": { "type": "Transitive", "resolved": "4.3.0", @@ -1128,8 +1131,8 @@ }, "Tomlyn": { "type": "Transitive", - "resolved": "0.16.2", - "contentHash": "NVvOlecYWwhqQdE461UGHUeJ1t2DtGXU+L00LgtBTgWA16bUmMhUIRaCpSkRX5HqAeid/KlXmdH7Sul0mr6HJA==" + "resolved": "0.17.0", + "contentHash": "3BRbxOjZwgdXBGemOvJWuydaG/KsKrnG1Z15Chruvih8Tc8bgtLcmDgo6LPRqiF5LNh6X4Vmos7YuGteBHfePA==" }, "xunit.abstractions": { "type": "Transitive", @@ -1179,9 +1182,10 @@ "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imageflow.server.configuration": { @@ -1190,7 +1194,7 @@ "Imageflow.Server": "[0.1.0--notset, )", "Imageflow.Server.HybridCache": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", - "Tomlyn": "[0.16.2, )" + "Tomlyn": "[0.17.0, )" } }, "imageflow.server.hybridcache": { @@ -1225,7 +1229,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/tests/Imageflow.Server.Tests/packages.lock.json b/tests/Imageflow.Server.Tests/packages.lock.json index d7b26656..b12f6598 100644 --- a/tests/Imageflow.Server.Tests/packages.lock.json +++ b/tests/Imageflow.Server.Tests/packages.lock.json @@ -91,15 +91,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==" + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==" }, "AWSSDK.S3": { "type": "Transitive", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Azure.Core": { @@ -163,14 +163,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -195,12 +195,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -213,11 +212,6 @@ "resolved": "17.4.1", "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Azure": { "type": "Transitive", "resolved": "1.7.1", @@ -354,8 +348,8 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -382,8 +376,8 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "NuGet.Frameworks": { "type": "Transitive", @@ -512,8 +506,12 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -563,9 +561,10 @@ "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imageflow.server.hybridcache": { @@ -594,7 +593,7 @@ "imageflow.server.storage.s3": { "type": "Project", "dependencies": { - "AWSSDK.S3": "[3.7.305.3, )", + "AWSSDK.S3": "[3.7.305.18, )", "Imazen.Common": "[0.1.0--notset, )", "Imazen.Routing": "[0.1.0--notset, )" } @@ -623,7 +622,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", @@ -735,15 +734,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.300.28", - "contentHash": "mVEXlMkMOek7IvF37qNOKTan/9fS+MSHlfuc+M3265/jJ+fTm+NDXOio0L5fy3iqY/nonYX9L3Bph3hdM3p6VA==" + "resolved": "3.7.302.2", + "contentHash": "MbLN3ahzQK1WCsMC/Ib9sgPkEwF89L049wIB5koBWfQxwD/EFo6FdOkDtkUJeGjGdf6agiQN8juNGXoVjIqNEw==" }, "AWSSDK.S3": { "type": "Transitive", - "resolved": "3.7.305.3", - "contentHash": "7SkJAfPl8jbkldZDzP6H+Mi4NY6/e/tBNJ1WP9uc7pvmAZY6P0qnn4HByN8m8oPVkEQj8hJ2ZycvRp5Gb4NFqA==", + "resolved": "3.7.305.18", + "contentHash": "ENDyZh8DsEdNhez3xPVJeibg0hweBJc+ELQpKuBtrtDE4ILuN/K9RkaNNJN8u9qbsGP+EtwTQ8Hf61IFXxsoQQ==", "dependencies": { - "AWSSDK.Core": "[3.7.300.28, 4.0.0)" + "AWSSDK.Core": "[3.7.302.2, 4.0.0)" } }, "Azure.Core": { @@ -807,14 +806,14 @@ }, "Imageflow.AllPlatforms": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "xBE1ob69E4z4Qg3v18RJe81J9rXXWvxpUyYiOZLcZZuOnbIF35t+ToPBQIYFDNgc39NFisf1iru3NnytOGM6tg==", + "resolved": "0.11.1", + "contentHash": "QhQglpUQjPF7DwDt5LUrfw3cGh5Q9nDsM1a4xPBW/g8HFcewU9047EfKxuMzLMm3v064nOIgSUwC40P6rr0sMQ==", "dependencies": { "Imageflow.NativeRuntime.osx-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.ubuntu-x86_64": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86": "2.0.0-preview8", "Imageflow.NativeRuntime.win-x86_64": "2.0.0-preview8", - "Imageflow.Net": "0.10.2" + "Imageflow.Net": "0.11.1" } }, "Imageflow.NativeRuntime.osx-x86_64": { @@ -839,12 +838,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -857,11 +855,6 @@ "resolved": "17.4.1", "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Azure": { "type": "Transitive", "resolved": "1.7.1", @@ -998,8 +991,8 @@ }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Transitive", - "resolved": "1.2.2", - "contentHash": "LA4RBTStohA0hAAs6oKchmIC5M5Mjd5MwfB7vbbl+312N5kXj8abTGOgwZy6ASJYLCiqiiK5kHS0hDGEgfkB8g==" + "resolved": "3.0.0", + "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -1026,8 +1019,8 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "NuGet.Frameworks": { "type": "Transitive", @@ -1156,8 +1149,12 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -1207,9 +1204,10 @@ "imageflow.server": { "type": "Project", "dependencies": { - "Imageflow.AllPlatforms": "[0.10.*, )", + "Imageflow.AllPlatforms": "[0.11.1, )", "Imazen.Common": "[0.1.0--notset, )", - "Imazen.Routing": "[0.1.0--notset, )" + "Imazen.Routing": "[0.1.0--notset, )", + "Microsoft.IO.RecyclableMemoryStream": "[3.0.0, )" } }, "imageflow.server.hybridcache": { @@ -1238,7 +1236,7 @@ "imageflow.server.storage.s3": { "type": "Project", "dependencies": { - "AWSSDK.S3": "[3.7.305.3, )", + "AWSSDK.S3": "[3.7.305.18, )", "Imazen.Common": "[0.1.0--notset, )", "Imazen.Routing": "[0.1.0--notset, )" } @@ -1267,7 +1265,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", diff --git a/tests/ImazenShared.Tests/packages.lock.json b/tests/ImazenShared.Tests/packages.lock.json index 96b7c44b..a20a4814 100644 --- a/tests/ImazenShared.Tests/packages.lock.json +++ b/tests/ImazenShared.Tests/packages.lock.json @@ -92,12 +92,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.CodeCoverage": { @@ -105,11 +104,6 @@ "resolved": "17.4.1", "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -181,8 +175,8 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "NuGet.Frameworks": { "type": "Transitive", @@ -243,6 +237,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", @@ -300,7 +303,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )", @@ -399,12 +402,11 @@ }, "Imageflow.Net": { "type": "Transitive", - "resolved": "0.10.2", - "contentHash": "4KtF92PRHCU8Gm3wYEGJd+Uk0YBqXUY2CFe2P3N3P8UiG6vSIQRDKUV9LjgstEsis95/9OE4ItfJTpMessJIRQ==", + "resolved": "0.11.2", + "contentHash": "N3aQXf7PIANNY3iygp/Vs8XK3xcWQ/b8AC+8uaF8qGDM/lOP+q8JcFEBn65LE7zh4A5G0pNV7A06QzkyvkxZeg==", "dependencies": { - "Microsoft.CSharp": "4.7.0", - "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 3.0.0)", - "Newtonsoft.Json": "[13.0.3, 14.0.0)" + "Microsoft.IO.RecyclableMemoryStream": "[1.2.2, 4.0.0)", + "System.Text.Json": "6.0.9" } }, "Microsoft.CodeCoverage": { @@ -412,11 +414,6 @@ "resolved": "17.4.1", "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -488,8 +485,8 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "NuGet.Frameworks": { "type": "Transitive", @@ -550,6 +547,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", @@ -607,7 +613,7 @@ "type": "Project", "dependencies": { "CommunityToolkit.HighPerformance": "[8.*, )", - "Imageflow.Net": "[0.10.*, )", + "Imageflow.Net": "[0.11.2, )", "Imazen.Abstractions": "[0.1.0--notset, )", "Imazen.Common": "[0.1.0--notset, )", "System.Collections.Immutable": "[6.*, )",