Update dependencies to latest (#3229)

cheenamalhotra · web-flow · commit 79ed802635df · 2025-04-29T13:52:20.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs
@@ -501,8 +501,8 @@ public static void ActiveDirectoryManagedIdentityWithInvalidUserIdMustFail(strin
 
             SqlException e = Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStrWithNoCred));
 
-            string expectedMessage = "ManagedIdentityCredential authentication unavailable";
-            Assert.Contains(expectedMessage, e.GetBaseException().Message);
+            string expectedMessage = "[Managed Identity] Authentication unavailable";
+            Assert.Contains(expectedMessage, e.GetBaseException().Message, StringComparison.OrdinalIgnoreCase);
         }
 
         [ConditionalFact(nameof(IsAADConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.Windows.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.Windows.cs
@@ -48,15 +48,15 @@ public async Task Delegated_transaction_deadlock_in_SinglePhaseCommit()
         private static bool s_EnlistedTransactionPreservedWhilePooledCondition => DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotX86Architecture;
 
         [ConditionalFact(nameof(s_EnlistedTransactionPreservedWhilePooledCondition), Timeout = 10000)]
-        public void Test_EnlistedTransactionPreservedWhilePooled()
+        public async Task Test_EnlistedTransactionPreservedWhilePooled()
         {
 #if NET
             TransactionManager.ImplicitDistributedTransactions = true;
 #endif
-            RunTestSet(EnlistedTransactionPreservedWhilePooled);
+            await RunTestSet(EnlistedTransactionPreservedWhilePooled);
         }
 
-        private void EnlistedTransactionPreservedWhilePooled()
+        private async Task EnlistedTransactionPreservedWhilePooled()
         {
             Exception commandException = null;
             Exception transactionException = null;
@@ -67,7 +67,7 @@ private void EnlistedTransactionPreservedWhilePooled()
                 {
                     // Leave first connection open so that the transaction is promoted
                     SqlConnection rootConnection = new SqlConnection(ConnectionString);
-                    rootConnection.Open();
+                    await rootConnection.OpenAsync();
                     using (SqlCommand command = rootConnection.CreateCommand())
                     {
                         command.CommandText = $"INSERT INTO {TestTableName} VALUES ({InputCol1}, '{InputCol2}')";
@@ -109,25 +109,25 @@ private void EnlistedTransactionPreservedWhilePooled()
             }
 
             // Even if an application swallows the command exception, completing the transaction should indicate that it failed.
-            var expectedTransactionExceptions = new[] { typeof(TransactionAbortedException), typeof(TransactionInDoubtException) };
+            Type[] expectedTransactionExceptions = new[] { typeof(TransactionAbortedException), typeof(TransactionInDoubtException) };
             Assert.Contains(transactionException.GetType(), expectedTransactionExceptions);
 
-            var expectedCommandExceptions = new[] { typeof(SqlException), typeof(InvalidOperationException) };
+            Type[] expectedCommandExceptions = new[] { typeof(SqlException), typeof(InvalidOperationException) };
             Assert.Contains(commandException.GetType(), expectedCommandExceptions);
 
-            if (commandException is SqlException)
+            if (commandException is SqlException exception)
             {
                 // See https://learn.microsoft.com/en-us/sql/relational-databases/errors-events/database-engine-events-and-errors-8000-to-8999?view=sql-server-ver16
                 // The distributed transaction failed
                 // See https://learn.microsoft.com/en-us/sql/relational-databases/errors-events/database-engine-events-and-errors-3000-to-3999?view=sql-server-ver16
                 // Error 3971 corresponds to "The server failed to resume the transaction."
                 var expectedExceptionCodes = new[] { 3971, 8525 };
-                Assert.Contains(((SqlException)commandException).Number, expectedExceptionCodes);
+                Assert.Contains(exception.Number, expectedExceptionCodes);
             }
 
             // Verify that nothing made it into the database
             DataTable result = DataTestUtility.RunQuery(ConnectionString, $"select col2 from {TestTableName} where col1 = {InputCol1}");
-            Assert.True(result.Rows.Count == 0);
+            Assert.Equal(0, result.Rows.Count);
         }
 
         private void KillProcess(int serverProcessId)
@@ -152,7 +152,7 @@ private void KillProcess(int serverProcessId)
         private const int InputCol1 = 1;
         private const string InputCol2 = "One";
 
-        private static void RunTestSet(Action TestCase)
+        private static async Task RunTestSet(Func<Task> TestCase)
         {
             SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString);
 
@@ -165,7 +165,7 @@ private static void RunTestSet(Action TestCase)
             DataTestUtility.RunNonQuery(ConnectionString, $"create table {TestTableName} (col1 int, col2 text)");
             try
             {
-                TestCase();
+                await TestCase();
             }
             finally
             {
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
@@ -26,17 +26,17 @@
     <MicrosoftDataSqlClientSniVersion>6.0.2</MicrosoftDataSqlClientSniVersion>
     <SystemBuffersVersion>4.5.1</SystemBuffersVersion>
     <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
-    <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>6.0.10</SystemTextJsonVersion>
+    <SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
     <SystemDataCommonVersion>4.3.0</SystemDataCommonVersion>
   </PropertyGroup>
   <!-- NetFx and NetCore project dependencies -->
   <PropertyGroup>
-    <AzureIdentityVersion>1.11.4</AzureIdentityVersion>
+    <AzureIdentityVersion>1.13.2</AzureIdentityVersion>
     <MicrosoftBclCryptographyVersion>8.0.0</MicrosoftBclCryptographyVersion>
     <MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftIdentityModelJsonWebTokensVersion>7.5.0</MicrosoftIdentityModelJsonWebTokensVersion>
-    <MicrosoftIdentityModelProtocolsOpenIdConnectVersion>7.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
+    <MicrosoftIdentityModelJsonWebTokensVersion>7.7.1</MicrosoftIdentityModelJsonWebTokensVersion>
+    <MicrosoftIdentityModelProtocolsOpenIdConnectVersion>7.7.1</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
     <SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
     <SystemSecurityCryptographyPkcsVersion>8.0.1</SystemSecurityCryptographyPkcsVersion>
   </PropertyGroup>
@@ -48,15 +48,15 @@
   </PropertyGroup>
   <!-- AKV Provider project dependencies -->
   <PropertyGroup>
-    <AzureCoreVersion>[1.38.0,2.0.0)</AzureCoreVersion>
-    <AzureSecurityKeyVaultKeysVersion>[4.5.0,5.0.0)</AzureSecurityKeyVaultKeysVersion>
+    <AzureCoreVersion>[1.44.1,2.0.0)</AzureCoreVersion>
+    <AzureSecurityKeyVaultKeysVersion>[4.7.0,5.0.0)</AzureSecurityKeyVaultKeysVersion>
   </PropertyGroup>
   <!-- Test Project Dependencies -->
   <PropertyGroup>
     <BenchmarkDotNetVersion>0.14.0</BenchmarkDotNetVersion>
     <MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24564.1</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24123.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25164.6</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25164.6</MicrosoftDotNetXUnitExtensionsVersion>
     <MicrosoftExtensionsHosting>6.0.1</MicrosoftExtensionsHosting>
     <MicrosoftNETCoreRuntimeCoreCLRVersion>2.0.8</MicrosoftNETCoreRuntimeCoreCLRVersion>
     <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>
@@ -71,7 +71,7 @@
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
     <SystemTextEncodingCodePagesVersion>6.0.0</SystemTextEncodingCodePagesVersion>
-    <XunitVersion>2.6.3</XunitVersion>
+    <XunitVersion>2.9.2</XunitVersion>
     <XunitrunnervisualstudioVersion>2.5.5</XunitrunnervisualstudioVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/tools/props/VersionsNet9OrLater.props b/tools/props/VersionsNet9OrLater.props
@@ -7,4 +7,8 @@
     <SystemSecurityCryptographyPkcsVersion>9.0.4</SystemSecurityCryptographyPkcsVersion>
     <SystemConfigurationConfigurationManagerVersion>9.0.4</SystemConfigurationConfigurationManagerVersion>
   </PropertyGroup>
+  <!-- Test Project dependencies-->
+  <PropertyGroup>
+    <MicrosoftExtensionsHosting>9.0.3</MicrosoftExtensionsHosting>
+  </PropertyGroup>
 </Project>
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -30,34 +30,34 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
     <dependencies>
       <group targetFramework="net462">
         <dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
-        <dependency id="Azure.Identity" version="1.11.4" />
+        <dependency id="Azure.Identity" version="1.13.2" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
-        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
+        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
         <dependency id="System.Buffers" version="4.5.1" />
-        <dependency id="System.Text.Encodings.Web" version="6.0.0" />
-        <dependency id="System.Text.Json" version="6.0.10" />
+        <dependency id="System.Text.Encodings.Web" version="8.0.0" />
+        <dependency id="System.Text.Json" version="8.0.5" />
         <dependency id="System.Data.Common" version="4.3.0" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1"/>
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0"/>
       </group>
       <group targetFramework="net8.0">
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
-        <dependency id="Azure.Identity" version="1.11.4" />
+        <dependency id="Azure.Identity" version="1.13.2" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
-        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
+        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
         <dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1"/>
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0"/>
       </group>
       <group targetFramework="net9.0">
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
-        <dependency id="Azure.Identity" version="1.11.4" />
+        <dependency id="Azure.Identity" version="1.13.2" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
-        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
+        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
         <dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
         <dependency id="System.Configuration.ConfigurationManager" version="9.0.4" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="9.0.4"/>

Original file line number	Diff line number	Diff line change
`@@ -501,8 +501,8 @@ public static void ActiveDirectoryManagedIdentityWithInvalidUserIdMustFail(strin`
`501`	`501`
`502`	`502`	`SqlException e = Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStrWithNoCred));`
`503`	`503`
`504`		`- string expectedMessage = "ManagedIdentityCredential authentication unavailable";`
`505`		`- Assert.Contains(expectedMessage, e.GetBaseException().Message);`
	`504`	`+ string expectedMessage = "[Managed Identity] Authentication unavailable";`
	`505`	`+ Assert.Contains(expectedMessage, e.GetBaseException().Message, StringComparison.OrdinalIgnoreCase);`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`[ConditionalFact(nameof(IsAADConnStringsSetup))]`
Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,15 @@ public async Task Delegated_transaction_deadlock_in_SinglePhaseCommit()`
`48`	`48`	`private static bool s_EnlistedTransactionPreservedWhilePooledCondition => DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotX86Architecture;`
`49`	`49`
`50`	`50`	`[ConditionalFact(nameof(s_EnlistedTransactionPreservedWhilePooledCondition), Timeout = 10000)]`
`51`		`- public void Test_EnlistedTransactionPreservedWhilePooled()`
	`51`	`+ public async Task Test_EnlistedTransactionPreservedWhilePooled()`
`52`	`52`	`{`
`53`	`53`	`#if NET`
`54`	`54`	`TransactionManager.ImplicitDistributedTransactions = true;`
`55`	`55`	`#endif`
`56`		`- RunTestSet(EnlistedTransactionPreservedWhilePooled);`
	`56`	`+ await RunTestSet(EnlistedTransactionPreservedWhilePooled);`
`57`	`57`	`}`
`58`	`58`
`59`		`- private void EnlistedTransactionPreservedWhilePooled()`
	`59`	`+ private async Task EnlistedTransactionPreservedWhilePooled()`
`60`	`60`	`{`
`61`	`61`	`Exception commandException = null;`
`62`	`62`	`Exception transactionException = null;`
`@@ -67,7 +67,7 @@ private void EnlistedTransactionPreservedWhilePooled()`
`67`	`67`	`{`
`68`	`68`	`// Leave first connection open so that the transaction is promoted`
`69`	`69`	`SqlConnection rootConnection = new SqlConnection(ConnectionString);`
`70`		`- rootConnection.Open();`
	`70`	`+ await rootConnection.OpenAsync();`
`71`	`71`	`using (SqlCommand command = rootConnection.CreateCommand())`
`72`	`72`	`{`
`73`	`73`	`command.CommandText = $"INSERT INTO {TestTableName} VALUES ({InputCol1}, '{InputCol2}')";`
`@@ -109,25 +109,25 @@ private void EnlistedTransactionPreservedWhilePooled()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// Even if an application swallows the command exception, completing the transaction should indicate that it failed.`
`112`		`- var expectedTransactionExceptions = new[] { typeof(TransactionAbortedException), typeof(TransactionInDoubtException) };`
	`112`	`+ Type[] expectedTransactionExceptions = new[] { typeof(TransactionAbortedException), typeof(TransactionInDoubtException) };`
`113`	`113`	`Assert.Contains(transactionException.GetType(), expectedTransactionExceptions);`
`114`	`114`
`115`		`- var expectedCommandExceptions = new[] { typeof(SqlException), typeof(InvalidOperationException) };`
	`115`	`+ Type[] expectedCommandExceptions = new[] { typeof(SqlException), typeof(InvalidOperationException) };`
`116`	`116`	`Assert.Contains(commandException.GetType(), expectedCommandExceptions);`
`117`	`117`
`118`		`- if (commandException is SqlException)`
	`118`	`+ if (commandException is SqlException exception)`
`119`	`119`	`{`
`120`	`120`	`// See https://learn.microsoft.com/en-us/sql/relational-databases/errors-events/database-engine-events-and-errors-8000-to-8999?view=sql-server-ver16`
`121`	`121`	`// The distributed transaction failed`
`122`	`122`	`// See https://learn.microsoft.com/en-us/sql/relational-databases/errors-events/database-engine-events-and-errors-3000-to-3999?view=sql-server-ver16`
`123`	`123`	`// Error 3971 corresponds to "The server failed to resume the transaction."`
`124`	`124`	`var expectedExceptionCodes = new[] { 3971, 8525 };`
`125`		`- Assert.Contains(((SqlException)commandException).Number, expectedExceptionCodes);`
	`125`	`+ Assert.Contains(exception.Number, expectedExceptionCodes);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// Verify that nothing made it into the database`
`129`	`129`	`DataTable result = DataTestUtility.RunQuery(ConnectionString, $"select col2 from {TestTableName} where col1 = {InputCol1}");`
`130`		`- Assert.True(result.Rows.Count == 0);`
	`130`	`+ Assert.Equal(0, result.Rows.Count);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`private void KillProcess(int serverProcessId)`
`@@ -152,7 +152,7 @@ private void KillProcess(int serverProcessId)`
`152`	`152`	`private const int InputCol1 = 1;`
`153`	`153`	`private const string InputCol2 = "One";`
`154`	`154`
`155`		`- private static void RunTestSet(Action TestCase)`
	`155`	`+ private static async Task RunTestSet(Func<Task> TestCase)`
`156`	`156`	`{`
`157`	`157`	`SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString);`
`158`	`158`
`@@ -165,7 +165,7 @@ private static void RunTestSet(Action TestCase)`
`165`	`165`	`DataTestUtility.RunNonQuery(ConnectionString, $"create table {TestTableName} (col1 int, col2 text)");`
`166`	`166`	`try`
`167`	`167`	`{`
`168`		`- TestCase();`
	`168`	`+ await TestCase();`
`169`	`169`	`}`
`170`	`170`	`finally`
`171`	`171`	`{`