Imported Upstream version 6.12.0.139

Former-commit-id: 012695745aa696bdd1e642d63c8af2ed27331e5f

external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsEnums.cs

@@ -567,6 +567,7 @@ namespace System.Data.SqlClient
         // Login data validation Rules
         //
         internal const ushort MAXLEN_HOSTNAME = 128; // the client machine name
+        // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Not a username.")]
         internal const ushort MAXLEN_USERNAME = 128; // the client user id
         internal const ushort MAXLEN_PASSWORD = 128; // the password supplied by the client
         internal const ushort MAXLEN_APPNAME = 128; // the client application name

external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/DiagnosticTest.cs

@@ -20,9 +20,9 @@ namespace System.Data.SqlClient.Tests
 {
     public class DiagnosticTest : RemoteExecutorTestBase
     {
-        private const string BadConnectionString = "data source = bad; initial catalog = bad; uid = bad; password = bad; connection timeout = 1;";
+        private const string BadConnectionString = "data source = bad; initial catalog = bad; uid = bad; password = PLACEHOLDER; connection timeout = 1;";
         private static readonly string s_tcpConnStr = Environment.GetEnvironmentVariable("TEST_TCP_CONN_STR") ?? string.Empty;
-        
+
         public static bool IsConnectionStringConfigured() => s_tcpConnStr != string.Empty;
 
         [Fact]

external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/ExceptionTest.cs

@@ -11,7 +11,7 @@ namespace System.Data.SqlClient.Tests
     public class ExceptionTest
     {
         // test connection string
-        private string connectionString = "server=tcp:server,1432;database=test;uid=admin;pwd=SQLDB;connect timeout=60;";
+        private string connectionString = "server=tcp:server,1432;database=test;uid=admin;pwd=PLACEHOLDER;connect timeout=60;";
 
         // data value and server consts
         private const string badServer = "NotAServer";

external/corefx/src/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs

@@ -108,7 +108,7 @@ namespace System.Data.SqlClient.Tests
         [Fact]
         public void ExceptionsWithMinPoolSizeCanBeHandled()
         {
-            string connectionString = $"Data Source={Guid.NewGuid().ToString()};uid=random;pwd=asd;Connect Timeout=2; Min Pool Size=3";
+            string connectionString = $"Data Source={Guid.NewGuid().ToString()};uid=random;pwd=PLACEHOLDER;Connect Timeout=2; Min Pool Size=3";
             for (int i = 0; i < 2; i++)
             {
                 using (SqlConnection connection = new SqlConnection(connectionString))
@@ -122,7 +122,7 @@ namespace System.Data.SqlClient.Tests
         [Fact]
         public void ConnectionTestInvalidCredentialCombination()
         {
-            var cleartextCredsConnStr = "User=test;Password=test;";
+            var cleartextCredsConnStr = "User=test;Password=PLACEHOLDER;";
             var sspiConnStr = "Integrated Security=true;";
             var testPassword = new SecureString();
             testPassword.MakeReadOnly();

external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDSServerArguments.cs

@@ -88,7 +88,7 @@ namespace Microsoft.SqlServer.TDS.Servers
             // By Default SQL authentication will be used.
             FedAuthRequiredPreLoginOption = TdsPreLoginFedAuthRequiredOption.FedAuthNotRequired;
 
-            EncryptionCertificate = new X509Certificate2("TdsServerCertificate.pfx", "SecretPassword123456");
+            EncryptionCertificate = new X509Certificate2("TdsServerCertificate.pfx", "PLACEHOLDER");
 
             ServerPrincipalName = AzureADServicePrincipalName;
             StsUrl = AzureADProductionTokenEndpoint;