Skip to content

Commit e1eeee0

Browse files
authored
[6.0] CVE-2024-43483 - Update Microsoft.Extensions.Caching.Memory (#3281)
* - Addressing Dependabot alert #13: https://github.com/dotnet/SqlClient/security/dependabot/13 * - Fixed MDS version in AKV .nuspec. - Bumped .NET 9 dependencies to their latest patch versions. * Added TSAUpload bug workaround to TSA options config.
1 parent 5584c44 commit e1eeee0

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
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
@@ -48,7 +48,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
4848
- name: MDS_PackageRef_Version
4949
displayName: 'MDS package version of AKV Provider (build AKV)'
5050
type: string
51-
default: 5.1.5
51+
default: 6.0.1
5252

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

tools/props/VersionsNet9OrLater.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!-- NET 9 target framework dependencies -->
44
<PropertyGroup>
5-
<MicrosoftBclCryptographyVersion>9.0.0</MicrosoftBclCryptographyVersion>
6-
<MicrosoftExtensionsCachingMemoryVersion>9.0.0</MicrosoftExtensionsCachingMemoryVersion>
7-
<SystemSecurityCryptographyPkcsVersion>9.0.0</SystemSecurityCryptographyPkcsVersion>
8-
<SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
5+
<MicrosoftBclCryptographyVersion>9.0.4</MicrosoftBclCryptographyVersion>
6+
<MicrosoftExtensionsCachingMemoryVersion>9.0.4</MicrosoftExtensionsCachingMemoryVersion>
7+
<SystemSecurityCryptographyPkcsVersion>9.0.4</SystemSecurityCryptographyPkcsVersion>
8+
<SystemConfigurationConfigurationManagerVersion>9.0.4</SystemConfigurationConfigurationManagerVersion>
99
</PropertyGroup>
10-
</Project>
10+
</Project>

tools/specs/Microsoft.Data.SqlClient.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
5454
<group targetFramework="net9.0">
5555
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
5656
<dependency id="Azure.Identity" version="1.11.4" />
57-
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.0" exclude="Compile" />
57+
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
5858
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
5959
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
6060
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
61-
<dependency id="System.Configuration.ConfigurationManager" version="9.0.0" exclude="Compile" />
62-
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.0"/>
63-
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.0"/>
61+
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" exclude="Compile" />
62+
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.4"/>
63+
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4"/>
6464
</group>
6565
</dependencies>
6666
<frameworkAssemblies>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ 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="6.0.0" />
28+
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
2929
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
3030
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
31-
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
31+
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3232
</group>
3333
<group targetFramework="net8.0">
34-
<dependency id="Microsoft.Data.SqlClient" version="6.0.0" />
34+
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
3535
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
3636
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
3737
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3838
</group>
3939
<group targetFramework="net9.0">
40-
<dependency id="Microsoft.Data.SqlClient" version="6.0.0" />
40+
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
4141
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
4242
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
43-
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.0" />
43+
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" />
4444
</group>
4545
</dependencies>
4646
<frameworkAssemblies>

0 commit comments

Comments
 (0)