Skip to content

Commit 0379c77

Browse files
Bump everything | Hot fixing Microsoft.Extensions.Caching.Memory | Microsoft Security Advisory CVE-2024-43483 (#2175)
* Bump Microsoft.Extensions.Caching.Memory in /test/Ocelot.AcceptanceTests Bumps [Microsoft.Extensions.Caching.Memory](https://github.com/dotnet/runtime) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](dotnet/runtime@v8.0.0...v8.0.1) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Caching.Memory dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Revert "Bump Microsoft.Extensions.Caching.Memory in /test/Ocelot.AcceptanceTests" This reverts commit 338dd86. * Bump Microsoft.Extensions.Caching.Memory to 6.0.2/8.0.1 * Bump Microsoft.Extensions.* to 8.0.1 Microsoft.AspNetCore.* to 6.0.35/8.0.10 Microsoft.Data.SQLite to 6.0.35/8.0.10 * Delete obsolete files --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Raman Maksimchuk <[email protected]>
1 parent 414f634 commit 0379c77

File tree

10 files changed

+40
-69
lines changed

10 files changed

+40
-69
lines changed

src/Ocelot.Administration/Ocelot.Administration.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</ItemGroup>
4343
<!-- Conditionally obtain references for the net 6.0 target -->
4444
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
45-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.33" />
45+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.35" />
4646
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
4747
</ItemGroup>
4848
<!-- Conditionally obtain references for the net 7.0 target -->
@@ -52,7 +52,7 @@
5252
</ItemGroup>
5353
<!-- Conditionally obtain references for the net 8.0 target -->
5454
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
55-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
55+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
5656
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
5757
</ItemGroup>
5858
</Project>

src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
6262
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
6363
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
64-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
65-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
64+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
65+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
6666
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
6767
</ItemGroup>
6868
</Project>

src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs

-9
This file was deleted.

src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs

-22
This file was deleted.

src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2525
<NoWarn>1591</NoWarn>
2626
</PropertyGroup>
27-
<ItemGroup>
28-
<Compile Remove="IKubeApiClientFactory.cs" />
29-
<Compile Remove="KubeApiClientFactory.cs" />
30-
</ItemGroup>
3127
<ItemGroup>
3228
<PackageReference Include="KubeClient" Version="2.5.10" />
3329
<PackageReference Include="KubeClient.Extensions.DependencyInjection" Version="2.5.10" />

src/Ocelot/Ocelot.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
</ItemGroup>
4444
<!-- Conditionally obtain references for the net 6.0 target -->
4545
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
46-
<PackageReference Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.33" />
47-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.33" />
46+
<PackageReference Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.35" />
47+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.35" />
4848
</ItemGroup>
4949
<!-- Conditionally obtain references for the net 7.0 target -->
5050
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
@@ -53,8 +53,8 @@
5353
</ItemGroup>
5454
<!-- Conditionally obtain references for the net 8.0 target -->
5555
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
56-
<PackageReference Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="8.0.8" />
57-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
56+
<PackageReference Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="8.0.10" />
57+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
5858
</ItemGroup>
5959
<ItemGroup>
6060
<None Include="..\..\README.md" Pack="true" PackagePath="\" />

test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
</ItemGroup>
7575
<!-- Conditionally obtain references for the net 6.0 target -->
7676
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
77-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.33" />
78-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
77+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.35" />
78+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
7979
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
8080
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
8181
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
@@ -100,14 +100,14 @@
100100
</ItemGroup>
101101
<!-- Conditionally obtain references for the net 8.0 target -->
102102
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
103-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.8" />
104-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
103+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
104+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
105105
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
106106
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
107-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
108-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
109-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
110-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
107+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
108+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
109+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
110+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
111111
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
112112
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
113113
</ItemGroup>

test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj

+9-6
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
</ItemGroup>
5757
<!-- Conditionally obtain references for the net 6.0 target -->
5858
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
59-
<PackageReference Include="Microsoft.Data.SQLite" Version="6.0.33" />
59+
<PackageReference Include="Microsoft.Data.SQLite" Version="6.0.35" />
60+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
6061
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
6162
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
6263
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
@@ -68,6 +69,7 @@
6869
<!-- Conditionally obtain references for the net 7.0 target -->
6970
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
7071
<PackageReference Include="Microsoft.Data.SQLite" Version="7.0.20" />
72+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
7173
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
7274
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
7375
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
@@ -78,13 +80,14 @@
7880
</ItemGroup>
7981
<!-- Conditionally obtain references for the net 8.0 target -->
8082
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
81-
<PackageReference Include="Microsoft.Data.SQLite" Version="8.0.8" />
83+
<PackageReference Include="Microsoft.Data.SQLite" Version="8.0.10" />
84+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
8285
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
8386
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
84-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
85-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
86-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
87-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
87+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
88+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
89+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
90+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
8891
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
8992
</ItemGroup>
9093
<ItemGroup>

test/Ocelot.ManualTest/Ocelot.ManualTest.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
</ItemGroup>
3939
<!-- Conditionally obtain references for the net 6.0 target -->
4040
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
41+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
4142
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
4243
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
4344
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
@@ -48,6 +49,7 @@
4849
</ItemGroup>
4950
<!-- Conditionally obtain references for the net 7.0 target -->
5051
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
52+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
5153
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
5254
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
5355
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
@@ -58,12 +60,13 @@
5860
</ItemGroup>
5961
<!-- Conditionally obtain references for the net 8.0 target -->
6062
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
63+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
6164
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
6265
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
63-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
64-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
65-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
66-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
66+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
67+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
68+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
69+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
6770
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
6871
</ItemGroup>
6972
<ItemGroup>

test/Ocelot.UnitTests/Ocelot.UnitTests.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
</ItemGroup>
8181
<!-- Conditionally obtain references for the net 6.0 target -->
8282
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
83-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.33" />
84-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
83+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.35" />
84+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
8585
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
8686
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
8787
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
@@ -104,14 +104,14 @@
104104
</ItemGroup>
105105
<!-- Conditionally obtain references for the net 8.0 target -->
106106
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
107-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.8" />
108-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
107+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
108+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
109109
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
110110
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
111-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
112-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
113-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
114-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
111+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
112+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
113+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
114+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
115115
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
116116
</ItemGroup>
117117
<ItemGroup>

0 commit comments

Comments
 (0)