Skip to content

Commit 02c9c21

Browse files
paulmedynskipaulmedynski
authored
User Story 38883: 7.0 P2 - Bump Dependencies (#3638)
1 parent 1ad6fcf commit 02c9c21

File tree

6 files changed

+66
-53
lines changed

6 files changed

+66
-53
lines changed

‎src/Directory.Packages.props‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<!-- Published -->
1111
<ItemGroup>
1212
<!-- MDS and AKV -->
13-
<PackageVersion Include="Azure.Core" Version="1.47.1" />
13+
<PackageVersion Include="Azure.Core" Version="1.49.0" />
1414
</ItemGroup>
1515

1616
<!-- Published - Target Framework Specific Dependencies -->
1717
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
1818
<!-- MDS and AKV -->
19-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
19+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
2020
</ItemGroup>
2121
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
2222
<!-- MDS and AKV -->
@@ -28,30 +28,35 @@
2828
<!-- MDS and AKV Tests -->
2929
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
3030
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
31-
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25164.6" />
32-
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25164.6" />
33-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
31+
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25476.3" />
32+
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.25476.3" />
33+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
3434
<PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="172.76.0" />
3535
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
3636
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
3737
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
3838
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
39-
<PackageVersion Include="System.Data.Odbc" Version="8.0.1" />
39+
<PackageVersion Include="System.Data.Odbc" Version="9.0.9" />
4040
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
41-
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
41+
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.9" />
4242
<PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
43-
<PackageVersion Include="xunit" Version="2.9.2" />
43+
<PackageVersion Include="xunit" Version="2.9.3" />
4444
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
45-
<PackageVersion Include="xunit.runner.console" Version="2.9.2" />
45+
<PackageVersion Include="xunit.runner.console" Version="2.9.3" />
4646
</ItemGroup>
4747

4848
<!-- Internal - Target Framework Specific Dependencies -->
4949
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
5050
<!-- MDS and AKV Tests -->
51-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
51+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
5252
</ItemGroup>
5353
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
5454
<!-- MDS and AKV Tests -->
55+
<!--
56+
We can't use a newer major version of this package because it pulls in
57+
a newer major version of System.Text.Json that conflicts with our
58+
explicit dependency on version 8.x of that package.
59+
-->
5560
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
5661
</ItemGroup>
5762

@@ -60,24 +65,24 @@
6065

6166
<!-- Common Dependencies (.NET and .NET Framework) -->
6267
<ItemGroup>
63-
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
64-
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.7.1" />
65-
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.7.1" />
68+
<PackageVersion Include="Azure.Identity" Version="1.16.0" />
69+
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
70+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.14.0" />
6671
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
6772
</ItemGroup>
6873

6974
<!-- Common Target Framework Specific Dependencies -->
7075
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
71-
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.5" />
72-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
73-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.5" />
74-
<PackageVersion Include="System.Text.Json" Version="9.0.5" />
76+
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.9" />
77+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.9" />
78+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.9" />
79+
<PackageVersion Include="System.Text.Json" Version="9.0.9" />
7580
</ItemGroup>
7681
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
7782
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
7883
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
7984
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
80-
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
85+
<PackageVersion Include="System.Text.Json" Version="8.0.6" />
8186
</ItemGroup>
8287

8388
<!-- .NET Dependencies -->
@@ -89,10 +94,10 @@
8994
<!-- .NET Framework Dependencies -->
9095
<ItemGroup>
9196
<PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="6.0.2" />
92-
<PackageVersion Include="System.Buffers" Version="4.5.1" />
97+
<PackageVersion Include="System.Buffers" Version="4.6.1" />
9398
<PackageVersion Include="System.Data.Common" Version="4.3.0" />
9499
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
95-
<PackageVersion Include="System.Memory" Version="4.5.5" />
100+
<PackageVersion Include="System.Memory" Version="4.6.3" />
96101
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
97102
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
98103
</ItemGroup>
@@ -101,7 +106,7 @@
101106
<!-- AKV Dependencies -->
102107

103108
<ItemGroup>
104-
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.7.0" />
109+
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.8.0" />
105110
</ItemGroup>
106111

107112
<!-- =================================================================== -->

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,9 @@ previousPw is byte[] previousPwBytes &&
261261

262262
if (result == null)
263263
{
264+
#pragma warning disable CS0618 // Type or member is obsolete
264265
result = await app.AcquireTokenByUsernamePassword(scopes, parameters.UserId, parameters.Password)
266+
#pragma warning restore CS0618 // Type or member is obsolete
265267
.WithCorrelationId(parameters.ConnectionId)
266268
.ExecuteAsync(cancellationToken: cts.Token)
267269
.ConfigureAwait(false);
@@ -584,7 +586,9 @@ private static TokenCredentialData CreateTokenCredentialInstance(TokenCredential
584586
if (tokenCredentialKey._clientId is not null)
585587
{
586588
defaultAzureCredentialOptions.ManagedIdentityClientId = tokenCredentialKey._clientId;
589+
#pragma warning disable CS0618 // Type or member is obsolete
587590
defaultAzureCredentialOptions.SharedTokenCacheUsername = tokenCredentialKey._clientId;
591+
#pragma warning restore CS0618 // Type or member is obsolete
588592
defaultAzureCredentialOptions.WorkloadIdentityClientId = tokenCredentialKey._clientId;
589593
}
590594

‎src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,9 @@ private static Task<string> AcquireTokenAsync(string authorityURL, string userID
277277
SecureString securePassword = new SecureString();
278278

279279
securePassword.MakeReadOnly();
280+
#pragma warning disable CS0618 // Type or member is obsolete
280281
result = app.AcquireTokenByUsernamePassword(scopes, userID, password).ExecuteAsync().Result;
282+
#pragma warning restore CS0618 // Type or member is obsolete
281283

282284
return result.AccessToken;
283285
});

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
4040
string[] scopes = new string[] { scope };
4141
SecureString password = new SecureString();
4242

43+
#pragma warning disable CS0618 // Type or member is obsolete
4344
AuthenticationResult result = await PublicClientApplicationBuilder.Create(_appClientId)
4445
.WithAuthority(parameters.Authority)
4546
.Build().AcquireTokenByUsernamePassword(scopes, parameters.UserId, parameters.Password)
4647
.WithCorrelationId(parameters.ConnectionId)
4748
.ExecuteAsync(cancellationToken: cts.Token);
49+
#pragma warning restore CS0618 // Type or member is obsolete
4850

4951
return new SqlAuthenticationToken(result.AccessToken, result.ExpiresOn);
5052
}

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,62 +29,62 @@
2929
<tags>sqlclient microsoft.data.sqlclient</tags>
3030
<dependencies>
3131
<group targetFramework="net462">
32-
<dependency id="Azure.Core" version="1.47.1" />
33-
<dependency id="Azure.Identity" version="1.14.2" />
32+
<dependency id="Azure.Core" version="1.49.0" />
33+
<dependency id="Azure.Identity" version="1.16.0" />
3434
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
3535
<dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
3636
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
37-
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
38-
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
39-
<dependency id="System.Buffers" version="4.5.1" />
37+
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.14.0" />
38+
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
39+
<dependency id="System.Buffers" version="4.6.1" />
4040
<dependency id="System.Data.Common" version="4.3.0" />
4141
<dependency id="System.Diagnostics.DiagnosticSource" version="8.0.1" />
4242
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
4343
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
4444
<dependency id="System.Text.Encodings.Web" version="8.0.0" />
45-
<dependency id="System.Text.Json" version="8.0.5" />
45+
<dependency id="System.Text.Json" version="8.0.6" />
4646
</group>
4747
<group targetFramework="net8.0">
48-
<dependency id="Azure.Core" version="1.47.1" />
49-
<dependency id="Azure.Identity" version="1.14.2" />
48+
<dependency id="Azure.Core" version="1.49.0" />
49+
<dependency id="Azure.Identity" version="1.16.0" />
5050
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
5151
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
5252
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
53-
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
54-
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
53+
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.14.0" />
54+
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
5555
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
5656
<dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
5757
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
5858
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
59-
<dependency id="System.Text.Json" version="8.0.5" />
59+
<dependency id="System.Text.Json" version="8.0.6" />
6060
</group>
6161
<group targetFramework="net9.0">
62-
<dependency id="Azure.Core" version="1.47.1" />
63-
<dependency id="Azure.Identity" version="1.14.2" />
64-
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.5" />
62+
<dependency id="Azure.Core" version="1.49.0" />
63+
<dependency id="Azure.Identity" version="1.16.0" />
64+
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.9" />
6565
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
6666
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.5" exclude="Compile" />
67-
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
68-
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
67+
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.14.0" />
68+
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
6969
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
70-
<dependency id="System.Configuration.ConfigurationManager" version="9.0.5" exclude="Compile" />
70+
<dependency id="System.Configuration.ConfigurationManager" version="9.0.9" exclude="Compile" />
7171
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
72-
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.5" />
73-
<dependency id="System.Text.Json" version="9.0.5" />
72+
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.9" />
73+
<dependency id="System.Text.Json" version="9.0.9" />
7474
</group>
7575
<group targetFramework="netstandard2.0">
76-
<dependency id="Azure.Core" version="1.47.1" />
77-
<dependency id="Azure.Identity" version="1.14.2" />
78-
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.5" />
76+
<dependency id="Azure.Core" version="1.49.0" />
77+
<dependency id="Azure.Identity" version="1.16.0" />
78+
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
7979
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
80-
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.5" exclude="Compile" />
81-
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
82-
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
80+
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
81+
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.14.0" />
82+
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
8383
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
84-
<dependency id="System.Configuration.ConfigurationManager" version="9.0.5" exclude="Compile" />
84+
<dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
8585
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
86-
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.5" />
87-
<dependency id="System.Text.Json" version="9.0.5" />
86+
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
87+
<dependency id="System.Text.Json" version="8.0.6" />
8888
</group>
8989
</dependencies>
9090
<frameworkAssemblies>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
2626
<dependencies>
2727
<group targetFramework="net462">
2828
<dependency id="Microsoft.Data.SqlClient" version="(6.2,7.1)" />
29-
<dependency id="Azure.Core" version="1.47.1" />
30-
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
29+
<dependency id="Azure.Core" version="1.49.0" />
30+
<dependency id="Azure.Security.KeyVault.Keys" version="4.8.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.2,7.1)" />
35-
<dependency id="Azure.Core" version="1.47.1" />
36-
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
35+
<dependency id="Azure.Core" version="1.49.0" />
36+
<dependency id="Azure.Security.KeyVault.Keys" version="4.8.0" />
3737
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3838
</group>
3939
</dependencies>

0 commit comments

Comments
 (0)