- Fixing build issues after rebase.

paulmedynski · paulmedynski · commit b17155bfacf9 · 2025-10-28T13:27:23.000-03:00
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADAuthenticationTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADAuthenticationTests.cs
@@ -11,23 +11,23 @@ public class AADAuthenticationTests
     public void CustomActiveDirectoryProviderTest()
     {
         SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(static (result) => Task.CompletedTask);
-        SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
-        Assert.Same(authProvider, SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
+        SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
+        Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
     }
 
     [Fact]
     public void CustomActiveDirectoryProviderTest_AppClientId()
     {
         SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(Guid.NewGuid().ToString());
-        SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
-        Assert.Same(authProvider, SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
+        SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
+        Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
     }
 
     [Fact]
     public void CustomActiveDirectoryProviderTest_AppClientId_DeviceFlowCallback()
     {
         SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(static (result) => Task.CompletedTask, Guid.NewGuid().ToString());
-        SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
-        Assert.Same(authProvider, SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
+        SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
+        Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
     }
 }
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/DefaultProviderTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/DefaultProviderTests.cs
@@ -24,7 +24,7 @@ public void OurProviderInstalled()
         )
         {
             SqlAuthenticationProvider? provider =
-                SqlAuthenticationProviderManager.GetProvider(method);
+                SqlAuthenticationProvider.GetProvider(method);
 
             switch (method)
             {
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/SqlAuthenticationProviderTest.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/SqlAuthenticationProviderTest.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AADAuthenticationTests.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AADAuthenticationTests.cs
@@ -73,29 +73,5 @@ public async Task IsDummySqlAuthenticationProviderSetByDefault()
             var token = await provider.AcquireTokenAsync(null);
             Assert.Equal(token.AccessToken, DummySqlAuthenticationProvider.DUMMY_TOKEN_STR);
         }
-
-        [Fact]
-        public void CustomActiveDirectoryProviderTest()
-        {
-            SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(static (result) => Task.CompletedTask);
-            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
-            Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
-        }
-
-        [Fact]
-        public void CustomActiveDirectoryProviderTest_AppClientId()
-        {
-            SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(Guid.NewGuid().ToString());
-            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
-            Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
-        }
-
-        [Fact]
-        public void CustomActiveDirectoryProviderTest_AppClientId_DeviceFlowCallback()
-        {
-            SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(static (result) => Task.CompletedTask, Guid.NewGuid().ToString());
-            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);
-            Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
-        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -30,7 +30,6 @@
     <Compile Include="LocalizationTest.cs" />
     <Compile Include="MultipartIdentifierTests.cs" />
     <Compile Include="MultiplexerTests.cs" />
-    <Compile Include="SqlAuthenticationProviderTest.cs" />
     <Compile Include="SqlClientLoggerTest.cs" />
     <Compile Include="SqlConfigurableRetryLogicTest.cs" />
     <Compile Include="SqlCommandBuilderTest.cs" />
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlAuthenticationProviderTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlAuthenticationProviderTest.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -230,7 +230,7 @@ static DataTestUtility()
             //
             // TODO: Figure out which ones and install on-demand rather than
             // globally.
-            SqlAuthenticationProviderManager.SetProvider(
+            SqlAuthenticationProvider.SetProvider(
                 SqlAuthenticationMethod.ActiveDirectoryManagedIdentity,
                 new ManagedIdentityProvider());
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/ManagedIdentityProvider.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/ManagedIdentityProvider.cs
@@ -68,7 +68,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(
             // Set up a cancellation token based on the authentication timeout,
             // ignoring overflow since this is just test code.
             using CancellationTokenSource cancellor = new();
-            cancellor.CancelAfter(parameters.AuthenticationTimeout * 1000);
+            cancellor.CancelAfter(parameters.ConnectionTimeout * 1000);
 
             // Acquire the token, which may be cached by the credential.
             AccessToken token =
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/UsernamePasswordProvider.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/UsernamePasswordProvider.cs
@@ -28,7 +28,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             : parameters.Resource + s_defaultScopeSuffix;
 
         var cts = new CancellationTokenSource();
-        cts.CancelAfter(parameters.AuthenticationTimeout * 1000);
+        cts.CancelAfter(parameters.ConnectionTimeout * 1000);
 
         string[] scopes = new string[] { scope };
         SecureString password = new SecureString();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs
@@ -23,13 +23,13 @@ public AADFedAuthTokenRefreshTest(ITestOutputHelper testOutputHelper)
         public void FedAuthTokenRefreshTest()
         {
             #pragma warning disable 0618 // Type or member is obsolete
-            SqlAuthenticationProvider original = SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword);
+            SqlAuthenticationProvider original = SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword);
             #pragma warning restore 0618 // Type or member is obsolete
 
             try
             {
                 #pragma warning disable 0618 // Type or member is obsolete
-                SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, new UsernamePasswordProvider(DataTestUtility.ApplicationClientId));
+                SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, new UsernamePasswordProvider(DataTestUtility.ApplicationClientId));
                 #pragma warning restore 0618 // Type or member is obsolete
  
                 string connectionString = DataTestUtility.AADPasswordConnectionString;
@@ -80,7 +80,7 @@ public void FedAuthTokenRefreshTest()
                 {
                     // Reset to driver internal provider.
                     #pragma warning disable 0618 // Type or member is obsolete
-                    SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, original);
+                    SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, original);
                     #pragma warning restore 0618 // Type or member is obsolete
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -11,23 +11,23 @@ public class AADAuthenticationTests`
`11`	`11`	`public void CustomActiveDirectoryProviderTest()`
`12`	`12`	`{`
`13`	`13`	`SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(static (result) => Task.CompletedTask);`
`14`		`- SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);`
`15`		`- Assert.Same(authProvider, SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));`
	`14`	`+ SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);`
	`15`	`+ Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`[Fact]`
`19`	`19`	`public void CustomActiveDirectoryProviderTest_AppClientId()`
`20`	`20`	`{`
`21`	`21`	`SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(Guid.NewGuid().ToString());`
`22`		`- SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);`
`23`		`- Assert.Same(authProvider, SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));`
	`22`	`+ SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);`
	`23`	`+ Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[Fact]`
`27`	`27`	`public void CustomActiveDirectoryProviderTest_AppClientId_DeviceFlowCallback()`
`28`	`28`	`{`
`29`	`29`	`SqlAuthenticationProvider authProvider = new ActiveDirectoryAuthenticationProvider(static (result) => Task.CompletedTask, Guid.NewGuid().ToString());`
`30`		`- SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);`
`31`		`- Assert.Same(authProvider, SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));`
	`30`	`+ SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, authProvider);`
	`31`	`+ Assert.Same(authProvider, SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void OurProviderInstalled()`
`24`	`24`	`)`
`25`	`25`	`{`
`26`	`26`	`SqlAuthenticationProvider? provider =`
`27`		`- SqlAuthenticationProviderManager.GetProvider(method);`
	`27`	`+ SqlAuthenticationProvider.GetProvider(method);`
`28`	`28`
`29`	`29`	`switch (method)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ static DataTestUtility()`
`230`	`230`	`//`
`231`	`231`	`// TODO: Figure out which ones and install on-demand rather than`
`232`	`232`	`// globally.`
`233`		`- SqlAuthenticationProviderManager.SetProvider(`
	`233`	`+ SqlAuthenticationProvider.SetProvider(`
`234`	`234`	`SqlAuthenticationMethod.ActiveDirectoryManagedIdentity,`
`235`	`235`	`new ManagedIdentityProvider());`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ public AADFedAuthTokenRefreshTest(ITestOutputHelper testOutputHelper)`
`23`	`23`	`public void FedAuthTokenRefreshTest()`
`24`	`24`	`{`
`25`	`25`	`#pragma warning disable 0618 // Type or member is obsolete`
`26`		`- SqlAuthenticationProvider original = SqlAuthenticationProviderManager.GetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword);`
	`26`	`+ SqlAuthenticationProvider original = SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword);`
`27`	`27`	`#pragma warning restore 0618 // Type or member is obsolete`
`28`	`28`
`29`	`29`	`try`
`30`	`30`	`{`
`31`	`31`	`#pragma warning disable 0618 // Type or member is obsolete`
`32`		`- SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, new UsernamePasswordProvider(DataTestUtility.ApplicationClientId));`
	`32`	`+ SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, new UsernamePasswordProvider(DataTestUtility.ApplicationClientId));`
`33`	`33`	`#pragma warning restore 0618 // Type or member is obsolete`
`34`	`34`
`35`	`35`	`string connectionString = DataTestUtility.AADPasswordConnectionString;`
`@@ -80,7 +80,7 @@ public void FedAuthTokenRefreshTest()`
`80`	`80`	`{`
`81`	`81`	`// Reset to driver internal provider.`
`82`	`82`	`#pragma warning disable 0618 // Type or member is obsolete`
`83`		`- SqlAuthenticationProviderManager.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, original);`
	`83`	`+ SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, original);`
`84`	`84`	`#pragma warning restore 0618 // Type or member is obsolete`
`85`	`85`	`}`
`86`	`86`	`}`