Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>
<!-- NetFx and NetCore project dependencies -->
<ItemGroup>
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.7.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.7.1" />
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
Expand All @@ -26,7 +26,7 @@
</ItemGroup>
<!-- AKV Provider project dependencies -->
<ItemGroup>
<PackageVersion Include="Azure.Core" Version="[1.44.1,2.0.0)" />
<PackageVersion Include="Azure.Core" Version="[1.46.1,2.0.0)" />
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="[4.7.0,5.0.0)" />
</ItemGroup>
<!-- Test Project Dependencies -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,21 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
{
if (!string.IsNullOrEmpty(parameters.UserId))
{
// The AcquireTokenByIntegratedWindowsAuth method is marked as obsolete in MSAL.NET
// but it is still a supported way to acquire tokens for Active Directory Integrated authentication.
#pragma warning disable CS0618 // Type or member is obsolete
result = await app.AcquireTokenByIntegratedWindowsAuth(scopes)
#pragma warning restore CS0618 // Type or member is obsolete
.WithCorrelationId(parameters.ConnectionId)
.WithUsername(parameters.UserId)
.ExecuteAsync(cancellationToken: cts.Token)
.ConfigureAwait(false);
}
else
{
#pragma warning disable CS0618 // Type or member is obsolete
result = await app.AcquireTokenByIntegratedWindowsAuth(scopes)
#pragma warning restore CS0618 // Type or member is obsolete
.WithCorrelationId(parameters.ConnectionId)
.ExecuteAsync(cancellationToken: cts.Token)
.ConfigureAwait(false);
Expand Down
8 changes: 4 additions & 4 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<tags>sqlclient microsoft.data.sqlclient</tags>
<dependencies>
<group targetFramework="net462">
<dependency id="Azure.Identity" version="1.13.2" />
<dependency id="Azure.Identity" version="1.14.2" />
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
<dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
Expand All @@ -42,7 +42,7 @@
<dependency id="System.Text.Json" version="8.0.5" />
</group>
<group targetFramework="net8.0">
<dependency id="Azure.Identity" version="1.13.2" />
<dependency id="Azure.Identity" version="1.14.2" />
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
Expand All @@ -54,7 +54,7 @@
<dependency id="System.Text.Json" version="8.0.5" />
</group>
<group targetFramework="net9.0">
<dependency id="Azure.Identity" version="1.13.2" />
<dependency id="Azure.Identity" version="1.14.2" />
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
Expand All @@ -66,7 +66,7 @@
<dependency id="System.Text.Json" version="9.0.5" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Azure.Identity" version="1.13.2" />
<dependency id="Azure.Identity" version="1.14.2" />
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
<dependencies>
<group targetFramework="net462">
<dependency id="Microsoft.Data.SqlClient" version="[6.1.0,7.0.0)" />
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
</group>
<group targetFramework="net8.0">
<dependency id="Microsoft.Data.SqlClient" version="[6.1.0,7.0.0)" />
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
<dependency id="Azure.Core" version="[1.46.1,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
</group>
<group targetFramework="net9.0">
<dependency id="Microsoft.Data.SqlClient" version="[6.1.0,7.0.0)" />
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
<dependency id="Azure.Core" version="[1.46.1,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" />
</group>
</dependencies>
Expand Down
Loading