Skip to content

Commit f80f3e7

Browse files
committed
- Added config file envronment variable.
1 parent ffae017 commit f80f3e7

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2545,15 +2545,6 @@ internal bool TryGetFedAuthTokenLocked(SqlFedAuthInfo fedAuthInfo, DbConnectionP
25452545
/// <returns>SqlFedAuthToken</returns>
25462546
internal SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
25472547
{
2548-
// TODO: The netcore project doesn't consider fedAuthInfo to be
2549-
// possibly null here, so why does netfx?
2550-
// if (fedAuthInfo is null)
2551-
// {
2552-
// // Throw what would have been thrown the first time we
2553-
// // unconditionally use fedAuthInfo below.
2554-
// throw new NullReferenceException("fedAuthInfo must not be null");
2555-
// }
2556-
25572548
// Number of milliseconds to sleep for the initial back off, if a
25582549
// retry period is not specified by the provider.
25592550
const int defaultRetryPeriod = 100;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using Azure.Core;
11-
using Azure.Identity;
1211
using Microsoft.Identity.Client;
1312
using Xunit;
1413

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public class Config
4545

4646
public static Config Load(string configPath = @"config.json")
4747
{
48+
// Allow an override of the config path via an environment variable.
49+
configPath = Environment.GetEnvironmentVariable("MDS_TEST_CONFIG") ?? configPath;
50+
4851
try
4952
{
5053
using (StreamReader r = new StreamReader(configPath))

0 commit comments

Comments
 (0)