Skip to content

Commit 71cff4c

Browse files
Update Azure.Identity and other dependencies (#3538)
1 parent 392002e commit 71cff4c

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,21 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
223223
{
224224
if (!string.IsNullOrEmpty(parameters.UserId))
225225
{
226+
// The AcquireTokenByIntegratedWindowsAuth method is marked as obsolete in MSAL.NET
227+
// but it is still a supported way to acquire tokens for Active Directory Integrated authentication.
228+
#pragma warning disable CS0618 // Type or member is obsolete
226229
result = await app.AcquireTokenByIntegratedWindowsAuth(scopes)
230+
#pragma warning restore CS0618 // Type or member is obsolete
227231
.WithCorrelationId(parameters.ConnectionId)
228232
.WithUsername(parameters.UserId)
229233
.ExecuteAsync(cancellationToken: cts.Token)
230234
.ConfigureAwait(false);
231235
}
232236
else
233237
{
238+
#pragma warning disable CS0618 // Type or member is obsolete
234239
result = await app.AcquireTokenByIntegratedWindowsAuth(scopes)
240+
#pragma warning restore CS0618 // Type or member is obsolete
235241
.WithCorrelationId(parameters.ConnectionId)
236242
.ExecuteAsync(cancellationToken: cts.Token)
237243
.ConfigureAwait(false);

tools/props/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</PropertyGroup>
3232
<!-- NetFx and NetCore project dependencies -->
3333
<PropertyGroup>
34-
<AzureIdentityVersion>1.11.4</AzureIdentityVersion>
34+
<AzureIdentityVersion>1.14.2</AzureIdentityVersion>
3535
<MicrosoftBclCryptographyVersion>8.0.0</MicrosoftBclCryptographyVersion>
3636
<MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
3737
<MicrosoftIdentityModelJsonWebTokensVersion>7.5.0</MicrosoftIdentityModelJsonWebTokensVersion>
@@ -47,7 +47,7 @@
4747
</PropertyGroup>
4848
<!-- AKV Provider project dependencies -->
4949
<PropertyGroup>
50-
<AzureCoreVersion>[1.38.0,2.0.0)</AzureCoreVersion>
50+
<AzureCoreVersion>[1.47.1,2.0.0)</AzureCoreVersion>
5151
<AzureSecurityKeyVaultKeysVersion>[4.5.0,5.0.0)</AzureSecurityKeyVaultKeysVersion>
5252
</PropertyGroup>
5353
<!-- Test Project Dependencies -->

tools/specs/Microsoft.Data.SqlClient.nuspec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
2929
<tags>sqlclient microsoft.data.sqlclient</tags>
3030
<dependencies>
3131
<group targetFramework="net462">
32+
<dependency id="Azure.Identity" version="1.14.2" />
33+
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
3234
<dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
3335
<dependency id="Azure.Identity" version="1.11.4" />
3436
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
@@ -41,6 +43,8 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
4143
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0"/>
4244
</group>
4345
<group targetFramework="net8.0">
46+
<dependency id="Azure.Identity" version="1.14.2" />
47+
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
4448
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
4549
<dependency id="Azure.Identity" version="1.11.4" />
4650
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
@@ -52,15 +56,17 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
5256
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0"/>
5357
</group>
5458
<group targetFramework="net9.0">
59+
<dependency id="Azure.Identity" version="1.14.2" />
60+
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
5561
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
5662
<dependency id="Azure.Identity" version="1.11.4" />
5763
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
5864
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
5965
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
6066
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
6167
<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"/>
68+
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.4" />
69+
<dependency id="System.Text.Json" version="9.0.5" />
6470
</group>
6571
</dependencies>
6672
<frameworkAssemblies>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
2626
<dependencies>
2727
<group targetFramework="net462">
2828
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
29-
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
30-
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
29+
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
30+
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
3131
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3232
</group>
3333
<group targetFramework="net8.0">
3434
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
35-
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
36-
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
35+
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
36+
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
3737
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3838
</group>
3939
<group targetFramework="net9.0">
4040
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
41-
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
42-
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
41+
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
42+
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
4343
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" />
4444
</group>
4545
</dependencies>

0 commit comments

Comments
 (0)