Fix test failure on netcore for TransactionEnlistmentTest because enl…

…ist wasn't set due to a missed merge and remove unnecessary namespace
dotnet · Oct 16, 2021 · 604d035 · 604d035
1 parent 01cc51b
commit 604d035
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
@@ -292,6 +292,8 @@ internal SqlConnectionString(string connectionString) : base(connectionString, G
 
             _integratedSecurity = ConvertValueToIntegratedSecurity();
             _poolBlockingPeriod = ConvertValueToPoolBlockingPeriod();
+            _encrypt = ConvertValueToBoolean(KEY.Encrypt, DEFAULT.Encrypt);
+            _enlist = ConvertValueToBoolean(KEY.Enlist, DEFAULT.Enlist);
             _mars = ConvertValueToBoolean(KEY.MARS, DEFAULT.MARS);
             _persistSecurityInfo = ConvertValueToBoolean(KEY.Persist_Security_Info, DEFAULT.Persist_Security_Info);
             _pooling = ConvertValueToBoolean(KEY.Pooling, DEFAULT.Pooling);
@@ -578,7 +580,7 @@ internal SqlConnectionString(string connectionString) : base(connectionString, G
                 throw SQL.IntegratedWithUserIDAndPassword();
             }
 #else
-            if (Authentication == SqlClient.SqlAuthenticationMethod.ActiveDirectoryIntegrated && _hasPasswordKeyword)
+            if (Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated && _hasPasswordKeyword)
             {
                 throw SQL.IntegratedWithPassword();
             }
@@ -1093,7 +1095,7 @@ internal SqlConnectionIPAddressPreference ConvertValueToIPAddressPreference()
             }
         }
 
-        internal Microsoft.Data.SqlClient.PoolBlockingPeriod ConvertValueToPoolBlockingPeriod()
+        internal PoolBlockingPeriod ConvertValueToPoolBlockingPeriod()
         {
             if (!TryGetParsetableValue(KEY.PoolBlockingPeriod, out string value))
             {
@@ -1186,7 +1188,7 @@ internal static class NETLIB
 #if ADONET_CERT_AUTH
         private readonly string _certificate;
         internal string Certificate => _certificate;
-        internal bool UsesCertificate => _authType == SqlClient.SqlAuthenticationMethod.SqlCertificate;
+        internal bool UsesCertificate => _authType == SqlAuthenticationMethod.SqlCertificate;
 #else
         internal string Certificate => null;
         internal bool UsesCertificate => false;