From 2d399d86f407b34a167966c1e64c8dc896861217 Mon Sep 17 00:00:00 2001 From: jrahnama Date: Wed, 12 Jun 2024 09:32:28 -0700 Subject: [PATCH] Address conflicts --- .../Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs index d9ceb49c2d..acf224204a 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs @@ -572,9 +572,7 @@ private static TokenCredentialData CreateTokenCredentialInstance(TokenCredential DefaultAzureCredentialOptions defaultAzureCredentialOptions = new() { AuthorityHost = new Uri(tokenCredentialKey._authority), - SharedTokenCacheTenantId = tokenCredentialKey._audience, - VisualStudioCodeTenantId = tokenCredentialKey._audience, - VisualStudioTenantId = tokenCredentialKey._audience, + TenantId = tokenCredentialKey._audience, ExcludeInteractiveBrowserCredential = true // Force disabled, even though it's disabled by default to respect driver specifications. };