Skip to content

Commit a5196ea

Browse files
Update Azure.Identity and other dependencies (#3538) (#3552)
1 parent 7a7b54e commit a5196ea

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

src/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414
<!-- NetFx and NetCore project dependencies -->
1515
<ItemGroup>
16-
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
16+
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
1717
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.7.1" />
1818
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.7.1" />
1919
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626
<!-- AKV Provider project dependencies -->
2727
<ItemGroup>
28-
<PackageVersion Include="Azure.Core" Version="[1.44.1,2.0.0)" />
28+
<PackageVersion Include="Azure.Core" Version="[1.47.1,2.0.0)" />
2929
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="[4.7.0,5.0.0)" />
3030
</ItemGroup>
3131
<!-- Test Project Dependencies -->

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/specs/Microsoft.Data.SqlClient.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<tags>sqlclient microsoft.data.sqlclient</tags>
3030
<dependencies>
3131
<group targetFramework="net462">
32-
<dependency id="Azure.Identity" version="1.13.2" />
32+
<dependency id="Azure.Identity" version="1.14.2" />
3333
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
3434
<dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
3535
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
@@ -42,7 +42,7 @@
4242
<dependency id="System.Text.Json" version="8.0.5" />
4343
</group>
4444
<group targetFramework="net8.0">
45-
<dependency id="Azure.Identity" version="1.13.2" />
45+
<dependency id="Azure.Identity" version="1.14.2" />
4646
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
4747
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
4848
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
@@ -54,7 +54,7 @@
5454
<dependency id="System.Text.Json" version="8.0.5" />
5555
</group>
5656
<group targetFramework="net9.0">
57-
<dependency id="Azure.Identity" version="1.13.2" />
57+
<dependency id="Azure.Identity" version="1.14.2" />
5858
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
5959
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
6060
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
@@ -66,7 +66,7 @@
6666
<dependency id="System.Text.Json" version="9.0.5" />
6767
</group>
6868
<group targetFramework="netstandard2.0">
69-
<dependency id="Azure.Identity" version="1.13.2" />
69+
<dependency id="Azure.Identity" version="1.14.2" />
7070
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
7171
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
7272
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />

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.1.0,7.0.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.1.0,7.0.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.1.0,7.0.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)