User Story 38467: Backport mac server name fix

- Added a new test that was erroneously removed in the earlier cherry-pick.
- Added MDS_TEST_CONFIG environment variable to unit test config to override where the confi.json file is read from.
- Updated xUnit to 2.9.3 to avoid transitive System.Net.Http vulnerability warnings.

Author: paulmedynski

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs

@@ -157,6 +157,55 @@ public void TestRoundTripWithCSPAndCertStoreProvider()
             }
         }
 
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE))]
+        [ClassData(typeof(AEConnectionStringProvider))]
+        public void TestEncryptDecryptWithCSP(string connectionString)
+        {
+            string providerName = @"Microsoft Enhanced RSA and AES Cryptographic Provider";
+            string keyIdentifier = DataTestUtility.GetUniqueNameForSqlServer("CSP");
+
+            try
+            {
+                CertificateUtilityWin.RSAPersistKeyInCsp(providerName, keyIdentifier);
+                string cspPath = String.Concat(providerName, @"/", keyIdentifier);
+
+                SQLSetupStrategyCspExt sqlSetupStrategyCsp = new SQLSetupStrategyCspExt(cspPath);
+                string tableName = sqlSetupStrategyCsp.CspProviderTable.Name;
+
+                try
+                {
+                    using SqlConnection sqlConn = new(connectionString);
+                    sqlConn.Open();
+
+                    Table.DeleteData(tableName, sqlConn);
+
+                    // insert 1 row data
+                    Customer customer = new Customer(45, "Microsoft", "Corporation");
+
+                    DatabaseHelper.InsertCustomerData(sqlConn, null, tableName, customer);
+
+                    // Test INPUT parameter on an encrypted parameter
+                    using SqlCommand sqlCommand = new(@$"SELECT CustomerId, FirstName, LastName FROM [{tableName}] WHERE FirstName = @firstName",
+                                                                sqlConn, null, SqlCommandColumnEncryptionSetting.Enabled);
+                    SqlParameter customerFirstParam = sqlCommand.Parameters.AddWithValue(@"firstName", @"Microsoft");
+                    Console.WriteLine(@"Exception: {0}");
+                    customerFirstParam.Direction = System.Data.ParameterDirection.Input;
+
+                    using SqlDataReader sqlDataReader = sqlCommand.ExecuteReader();
+                    ValidateResultSet(sqlDataReader);
+                }
+                finally
+                {
+                    // clean up database resources
+                    sqlSetupStrategyCsp.Dispose();
+                }
+            }
+            finally
+            {
+                CertificateUtilityWin.RSADeleteKeyInCsp(providerName, keyIdentifier);
+            }
+        }
+
         /// <summary>
         /// Validates that the results are the ones expected.
         /// </summary>

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

@@ -45,6 +45,8 @@ public class Config
         public bool IsJsonSupported = false;
         public static Config Load(string configPath = @"config.json")
         {
+            configPath = Environment.GetEnvironmentVariable("MDS_TEST_CONFIG") ?? configPath;
+
             try
             {
                 using (StreamReader r = new StreamReader(configPath))

tools/props/Versions.props

@@ -70,8 +70,8 @@
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
     <SystemTextEncodingCodePagesVersion>6.0.0</SystemTextEncodingCodePagesVersion>
-    <XunitVersion>2.6.3</XunitVersion>
-    <XunitrunnervisualstudioVersion>2.5.5</XunitrunnervisualstudioVersion>
+    <XunitVersion>2.9.3</XunitVersion>
+    <XunitrunnervisualstudioVersion>2.8.2</XunitrunnervisualstudioVersion>
   </PropertyGroup>
   <PropertyGroup>
     <TestAKVProviderVersion>$(NugetPackageVersion)</TestAKVProviderVersion>