Skip to content

Commit

Permalink
Bump dependencies, enable trim/aot/singlefile analyzers, drop newtonsoft
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilith
lilith committed Jan 29, 2024
1 parent 31fc0dc commit 08130d7
Show file tree
Hide file tree
Showing 32 changed files with 669 additions and 460 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ bld/
[Ll]og/
host/
NugetPackages/
test-publish/

# DocFX build results
_site/
Expand Down
2 changes: 1 addition & 1 deletion examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.2" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.0" />
</ItemGroup>

Expand Down
128 changes: 58 additions & 70 deletions examples/Imageflow.Server.Example/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -123,24 +123,18 @@
},
"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": {
"type": "Transitive",
"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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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, )"
}
Expand Down Expand Up @@ -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.*, )",
Expand All @@ -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"
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -608,24 +602,18 @@
},
"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": {
"type": "Transitive",
"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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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, )"
}
Expand Down Expand Up @@ -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.*, )",
Expand Down
2 changes: 1 addition & 1 deletion examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Imageflow.Server" Version="0.8.2" />
<PackageReference Include="Imageflow.Server" Version="0.8.3" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions examples/Imageflow.Server.ExampleDocker/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions ...es/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Imageflow.Server" Version="0.8.2" />
<PackageReference Include="Imageflow.Server.HybridCache" Version="0.7.9" />
<PackageReference Include="Imageflow.Server" Version="0.8.3" />
<PackageReference Include="Imageflow.Server.HybridCache" Version="0.8.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 08130d7

Please sign in to comment.