WIP

Author: roji

src/libraries/System.Data.OleDb/tests/Helpers.cs

@@ -3,15 +3,14 @@
 
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 
 namespace System.Data.OleDb.Tests
 {
     public static class Helpers
     {
         public const string IsDriverAvailable = nameof(Helpers) + "." + nameof(GetIsDriverAvailable);
-        public const string IsAceDriverAvailable = nameof(Helpers) + "." + nameof(GetIsAceDriverAvailable);
         public static bool GetIsDriverAvailable() => Nested.IsAvailable;
-        public static bool GetIsAceDriverAvailable() => GetIsDriverAvailable() && !PlatformDetection.Is32BitProcess;
         public static string ProviderName => Nested.ProviderName;
         public static string GetTableName(string memberName) => memberName + ".csv";
 
@@ -21,25 +20,34 @@ private class Nested
             public static readonly string ProviderName;
             public static Nested Instance => s_instance;
             private static readonly Nested s_instance = new Nested();
-            private const string ExpectedProviderName = @"Microsoft.ACE.OLEDB.12.0";
             private Nested() { }
             static Nested()
             {
                 // Get the sources rowset for the SQLOLEDB enumerator
                 DataTable table = (new OleDbEnumerator()).GetElements();
                 DataColumn providersRegistered = table.Columns["SOURCES_NAME"];
-                List<object> providerNames = new List<object>();
+                List<string> providerNames = new List<string>();
                 foreach (DataRow row in table.Rows)
                 {
                     providerNames.Add((string)row[providersRegistered]);
                 }
+
                 // skip if x86 or if the expected driver not available
-                IsAvailable = !PlatformDetection.Is32BitProcess && providerNames.Contains(ExpectedProviderName);
-                if (!CultureInfo.CurrentCulture.Name.Equals("en-US", StringComparison.OrdinalIgnoreCase))
+                //IsAvailable = !PlatformDetection.Is32BitProcess && providerNames.Contains(ExpectedProviderName);
+                // For the following culture check: https://github.com/dotnet/runtime/issues/29969
+                if (CultureInfo.CurrentCulture.Name.Equals("en-US", StringComparison.OrdinalIgnoreCase))
                 {
-                    IsAvailable = false; // ActiveIssue: https://github.com/dotnet/runtime/issues/29969
+                    ProviderName = providerNames.Contains("MSOLEDBSQL19")
+                        ? "MSOLEDBSQL19"
+                        : providerNames.Contains("MSOLEDBSQL")
+                            ? "MSOLEDBSQL"
+                            : null;
+
+                    if (ProviderName is not null)
+                    {
+                        IsAvailable = true;
+                    }
                 }
-                ProviderName = IsAvailable ? ExpectedProviderName : null;
             }
         }
     }

src/libraries/System.Data.OleDb/tests/OleDbConnectionTests.cs

@@ -96,7 +96,7 @@ public void BeginTransaction_InvalidIsolationLevel_Throws()
             Assert.Throws<ArgumentOutOfRangeException>(() => connection.BeginTransaction((IsolationLevel)0));
         }
 
-        [ConditionalFact(Helpers.IsAceDriverAvailable)]
+        [ConditionalFact(Helpers.IsDriverAvailable)]
         public void BeginTransaction_CallTwice_Throws()
         {
             // ctor in OleDbTestBase already called BeginTransaction once
@@ -199,7 +199,7 @@ public void GetOleDbSchemaTable_ReturnsTableInfo()
             command.ExecuteNonQuery();
         }
 
-        [ConditionalFact(Helpers.IsAceDriverAvailable)]
+        [ConditionalFact(Helpers.IsDriverAvailable)]
         public void ChangeDatabase_EmptyDatabase_Throws()
         {
             Assert.Throws<ArgumentException>(() => connection.ChangeDatabase(null));

src/libraries/System.Data.OleDb/tests/OleDbTestBase.cs

@@ -68,6 +68,6 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
-        protected string ConnectionString => @"Provider=" + Helpers.ProviderName + @";Data source=" + TestDirectory + @";Extended Properties=""Text;HDR=No;FMT=Delimited""";
+        protected string ConnectionString => $"""Provider={Helpers.ProviderName};Server=(localdb)\\MSSQLLocalDB;Integrated Security=SSPI""";
     }
 }