Skip to content

Commit d47c51d

Browse files
paulmedynskipaulmedynski
authored
[5.1] CVE-2024-43485 - Update System.Text.Json to 6.0.11 (#3279)
1 parent 60fc661 commit d47c51d

File tree

7 files changed

+29
-21
lines changed

7 files changed

+29
-21
lines changed

‎.config/tsaoptions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"repositoryName": "SqlClient",
88
"codebaseName": "SqlClient",
99
"allTools": true,
10-
"template": "MSDATA_RevolutionR",
10+
"template": "MSDATA_RevolutionR_Overloaded0",
1111
"language": "csharp",
1212
"includePathPatterns": "src/Microsoft.Data.SqlClient/*, src/Microsoft.SqlServer.Server/*, tools/*",
1313
"excludePathPatterns": "src/Microsoft.Data.SqlClient/tests/*"

‎eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
4646
- name: MDS_PackageRef_Version
4747
displayName: 'MDS package version of AKV Provider (build AKV)'
4848
type: string
49-
default: 3.0.0
49+
default: 5.1.2
5050

5151
- name: CurrentNetFxVersion
5252
displayName: 'Lowest supported .NET Framework version (MDS validation)'

‎src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,19 @@
3131
<Reference Include="System.Transactions" />
3232
</ItemGroup>
3333
<ItemGroup>
34-
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
3534
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
3635
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
3736
<PrivateAssets>All</PrivateAssets>
3837
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3938
</PackageReference>
39+
</ItemGroup>
40+
<ItemGroup>
4041
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
4142
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
42-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
4343
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
44+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
4445
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
46+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
47+
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
4548
</ItemGroup>
46-
</Project>
49+
</Project>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,17 +716,20 @@
716716
</COMReference>
717717
</ItemGroup>
718718
<ItemGroup>
719-
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
720719
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
721720
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
722721
<PrivateAssets>All</PrivateAssets>
723722
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
724723
</PackageReference>
724+
</ItemGroup>
725+
<ItemGroup>
725726
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
726727
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
727-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
728728
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
729+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
729730
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
731+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
732+
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
730733
</ItemGroup>
731734
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
732735
<Import Project="$(NetFxSource)tools\targets\GenerateResourceStringsSource.targets" />

‎tools/props/Versions.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.35.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
3333
<MicrosoftIdentityModelJsonWebTokensVersion>6.35.0</MicrosoftIdentityModelJsonWebTokensVersion>
3434
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
35-
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
35+
<SystemTextEncodingsWebVersion>6.0.1</SystemTextEncodingsWebVersion>
36+
<SystemTextJsonVersion>6.0.11</SystemTextJsonVersion>
3637
</PropertyGroup>
3738
<!-- NetCore project dependencies -->
3839
<PropertyGroup>

‎tools/specs/Microsoft.Data.SqlClient.nuspec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
3636
<dependency id="System.Buffers" version="4.5.1" />
3737
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
3838
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
39-
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
39+
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
40+
<dependency id="System.Text.Json" version="6.0.11" />
4041
</group>
4142
<group targetFramework="net6.0">
4243
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.1.1" exclude="Compile" />
@@ -49,7 +50,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
4950
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.1" exclude="Compile" />
5051
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
5152
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
52-
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
53+
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
5354
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
5455
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
5556
</group>
@@ -65,7 +66,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
6566
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
6667
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
6768
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
68-
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
69+
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
6970
<dependency id="System.Runtime.Loader" version="4.3.0" />
7071
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
7172
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
@@ -81,7 +82,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
8182
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
8283
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
8384
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
84-
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
85+
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
8586
<dependency id="System.Runtime.Loader" version="4.3.0" />
8687
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
8788
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />

‎tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
2525
<tags>sqlclient microsoft.data.sqlclient azurekeyvaultprovider akvprovider alwaysencrypted</tags>
2626
<dependencies>
2727
<group targetFramework="net462">
28-
<dependency id="Microsoft.Data.SqlClient" version="3.0.0" />
28+
<dependency id="Microsoft.Data.SqlClient" version="[5.1.3,5.2.0)" />
2929
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
30-
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
30+
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
3131
<dependency id="Azure.Security.KeyVault.Keys" version="[4.4.0,5.0.0)" />
32-
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
32+
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.3" />
3333
</group>
3434
<group targetFramework="net6.0">
35-
<dependency id="Microsoft.Data.SqlClient" version="3.0.0" />
35+
<dependency id="Microsoft.Data.SqlClient" version="[5.1.3,5.2.0)" />
3636
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
37-
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
37+
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
3838
<dependency id="Azure.Security.KeyVault.Keys" version="[4.4.0,5.0.0)" />
39-
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
39+
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.3" />
4040
</group>
4141
<group targetFramework="netstandard2.0">
42-
<dependency id="Microsoft.Data.SqlClient" version="3.0.0" />
42+
<dependency id="Microsoft.Data.SqlClient" version="[5.1.3,5.2.0)" />
4343
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
44-
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
44+
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
4545
<dependency id="Azure.Security.KeyVault.Keys" version="[4.4.0,5.0.0)" />
46-
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
46+
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.3" />
4747
</group>
4848
</dependencies>
4949
<frameworkAssemblies>

0 commit comments

Comments
 (0)