Skip to content

Commit 0b30779

Browse files
Fix for .NET Standard + test fix
1 parent 569470a commit 0b30779

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.NetCoreApp.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ static SqlAuthenticationProviderManager()
4343
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, activeDirectoryAuthProvider);
4444
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryManagedIdentity, azureManagedIdentityAuthenticationProvider);
4545
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryMSI, azureManagedIdentityAuthenticationProvider);
46-
4746
}
4847

4948
/// <summary>

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.NetStandard.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ internal partial class SqlAuthenticationProviderManager
99
static SqlAuthenticationProviderManager()
1010
{
1111
var activeDirectoryAuthProvider = new ActiveDirectoryAuthenticationProvider();
12+
var azureManagedIdentityAuthenticationProvider = new AzureManagedIdentityAuthenticationProvider();
13+
1214
Instance = new SqlAuthenticationProviderManager();
1315
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, activeDirectoryAuthProvider);
1416
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryIntegrated, activeDirectoryAuthProvider);
1517
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, activeDirectoryAuthProvider);
1618
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryServicePrincipal, activeDirectoryAuthProvider);
1719
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, activeDirectoryAuthProvider);
18-
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryManagedIdentity, activeDirectoryAuthProvider);
20+
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryManagedIdentity, azureManagedIdentityAuthenticationProvider);
21+
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryMSI, azureManagedIdentityAuthenticationProvider);
1922
}
2023
}
2124
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public static void AccessToken_UserManagedIdentityTest()
518518
}
519519
}
520520

521-
[ConditionalFact(nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
521+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
522522
public static void Azure_SystemManagedIdentityTest()
523523
{
524524
string[] removeKeys = { "Authentication", "User ID", "Password", "UID", "PWD", "Trusted_Connection", "Integrated Security" };
@@ -533,7 +533,7 @@ public static void Azure_SystemManagedIdentityTest()
533533
}
534534
}
535535

536-
[ConditionalFact(nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
536+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
537537
public static void Azure_UserManagedIdentityTest()
538538
{
539539
string[] removeKeys = { "Authentication", "User ID", "Password", "UID", "PWD", "Trusted_Connection", "Integrated Security" };
@@ -548,7 +548,7 @@ public static void Azure_UserManagedIdentityTest()
548548
}
549549
}
550550

551-
[ConditionalFact(nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
551+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
552552
public static void Azure_AccessToken_SystemManagedIdentityTest()
553553
{
554554
string[] removeKeys = { "Authentication", "User ID", "Password", "UID", "PWD", "Trusted_Connection", "Integrated Security" };
@@ -562,7 +562,7 @@ public static void Azure_AccessToken_SystemManagedIdentityTest()
562562
}
563563
}
564564

565-
[ConditionalFact(nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
565+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(IsAzure))]
566566
public static void Azure_AccessToken_UserManagedIdentityTest()
567567
{
568568
string[] removeKeys = { "Authentication", "User ID", "Password", "UID", "PWD", "Trusted_Connection", "Integrated Security" };

0 commit comments

Comments
 (0)