fix pr notes

src/Orc.DataAccess.Example/App.xaml.cs

@@ -60,11 +60,9 @@ protected override void OnStartup(StartupEventArgs e)
 
         StyleHelper.CreateStyleForwardersForDefaultStyles();
 
-#if NETCORE
         var factory = System.Data.SqlClient.SqlClientFactory.Instance;
         DbProviderFactories.RegisterFactory("System.Data.SqlClient", factory);
         DbProviderFactories.RegisterFactory("Microsoft.Data.SqlClient", SqlClientFactory.Instance);
-#endif
 
         base.OnStartup(e);
     }

src/Orc.DataAccess.Tests/Automation/Extensions/TestHostAutomationControlExtensions.cs

@@ -2,13 +2,7 @@
 
 using System;
 using System.Linq;
-using Catel.IoC;
-using Catel.Services;
-using Orc.Automation;
 using Orc.Automation.Controls;
-using Orc.Csv;
-using Theming;
-using FrameworkElement = System.Windows.FrameworkElement;
 
 public static class TestHostAutomationControlExtensions
 {
@@ -49,26 +43,3 @@ public static bool TryLoadControlWithForwarders(this TestHostAutomationControl t
         return true;
     }
 }
-
-public class SetupThemeAutomationMethodRun : NamedAutomationMethodRun
-{
-    public override bool TryInvoke(FrameworkElement owner, AutomationMethod method, out AutomationValue result)
-    {
-        result = AutomationValue.FromValue(true);
-
-        StyleHelper.CreateStyleForwardersForDefaultStyles();
-        ThemeManager.Current.SynchronizeTheme();
-
-        //TODO: Looks like some of it can't be loaded correctly without this calls
-#pragma warning disable IDISP001 // Dispose created
-        var typeFactory = this.GetTypeFactory();
-        var serviceLocator = this.GetServiceLocator();
-#pragma warning restore IDISP001 // Dispose created
-
-        var dispatcherService = serviceLocator.ResolveType<IDispatcherService>();
-        var csvWriterService = serviceLocator.ResolveType<ICsvWriterService>();
-        var uiVisualizerService = serviceLocator.ResolveType<IUIVisualizerService>();
-
-        return true;
-    }
-}

src/Orc.DataAccess.Tests/Automation/MethodRuns/SetupThemeAutomationMethodRun.cs

@@ -0,0 +1,31 @@
+namespace Orc.DataAccess.Tests;
+
+using System.Windows;
+using Catel.IoC;
+using Catel.Services;
+using Orc.Automation;
+using Orc.Csv;
+using Theming;
+
+public class SetupThemeAutomationMethodRun : NamedAutomationMethodRun
+{
+    public override bool TryInvoke(FrameworkElement owner, AutomationMethod method, out AutomationValue result)
+    {
+        result = AutomationValue.FromValue(true);
+
+        StyleHelper.CreateStyleForwardersForDefaultStyles();
+        ThemeManager.Current.SynchronizeTheme();
+
+        //TODO: Looks like some of it can't be loaded correctly without this calls
+#pragma warning disable IDISP001 // Dispose created
+        var typeFactory = this.GetTypeFactory();
+        var serviceLocator = this.GetServiceLocator();
+#pragma warning restore IDISP001 // Dispose created
+
+        var dispatcherService = serviceLocator.ResolveType<IDispatcherService>();
+        var csvWriterService = serviceLocator.ResolveType<ICsvWriterService>();
+        var uiVisualizerService = serviceLocator.ResolveType<IUIVisualizerService>();
+
+        return true;
+    }
+}

src/Orc.DataAccess.Tests/Mocks/TestDbConnection.cs

@@ -7,6 +7,11 @@
 public class TestDbConnection : DbConnection
 {
     public bool IsValid { get; set; } = true;
+    public override string ConnectionString { get; set; }
+    public override string Database { get; }
+    public override System.Data.ConnectionState State { get; }
+    public override string DataSource { get; }
+    public override string ServerVersion { get; }
 
     public Func<DbCommand>? CreateCommandFunc { get; set; }
     public Func<DbTransaction>? CreateTransactionFunc { get; set; }
@@ -32,10 +37,4 @@ public override void Open()
             throw new Exception("Invalid connection");
         }
     }
-
-    public override string ConnectionString { get; set; }
-    public override string Database { get; }
-    public override System.Data.ConnectionState State { get; }
-    public override string DataSource { get; }
-    public override string ServerVersion { get; }
 }

src/Orc.DataAccess.Tests/Orc.DataAccess.Tests.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MethodBoundaryAspect.Fody" Version="2.0.149" />
+    <PackageReference Include="MethodBoundaryAspect.Fody" Version="2.0.149" PrivateAssets="all"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Moq" Version="4.18.4" />

src/Orc.DataAccess.Tests/Providers/SystemSqlDbDataSourceProviderTests.cs

@@ -9,7 +9,7 @@
 using Microsoft.Win32;
 using Moq;
 using Orc.Automation.Tests;
-using Registry;
+using Services;
 
 [TestFixture]
 public class SystemSqlDbDataSourceProviderTests

src/Orc.DataAccess.Xaml/Controls/ConnectionStringBuilder/Providers/MsSqlDataSourceProvider.cs

@@ -38,7 +38,7 @@ private static IEnumerable<string> GetInstalledInstancesInRegistryView(RegistryV
     {
         using var regView = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, registryView);
         using var sqlServerNode = regView.OpenSubKey(DataSourcePath.MicrosoftSqlServerRegPath, false);
-        return sqlServerNode?.GetValue("InstalledInstances") as IList<string> ?? new List<string>();
+        return sqlServerNode?.GetValue("InstalledInstances") as IEnumerable<string> ?? Enumerable.Empty<string>();
     }
 
     private static IEnumerable<string> GetRemoteSqlServerInstances()

src/Orc.DataAccess.Xaml/Controls/ConnectionStringBuilder/Views/ConnectionStringAdvancedOptionsWindow.xaml

@@ -23,7 +23,7 @@
 
         <orccontrols:FilterBox x:Name="AdvancedPropertiesFilterBox"
                                Height="23"
-                               Watermark="Search..."
+                               Watermark="{catel:LanguageBinding Controls_ConnectionStringBuilder_Search_WaterMark}"
                                Padding="2 0 0 0"
                                MinHeight="23"
                                Margin="6 2 2 2"

src/Orc.DataAccess.Xaml/Controls/DbProviderPicker/ViewModels/DbConnectionProviderListViewModel.cs

@@ -1,11 +1,10 @@
 namespace Orc.DataAccess.Controls;
 
 using System.Collections.Generic;
-using System.Data.Common;
 using System.Linq;
 using System.Threading.Tasks;
+using Catel;
 using Catel.MVVM;
-using CsvHelper;
 using Database;
 
 public class DbConnectionProviderListViewModel : ViewModelBase
@@ -22,7 +21,7 @@ public DbConnectionProviderListViewModel(DbProviderInfo selectedProvider)
         DbProviders = new List<DbProviderInfo>();
     }
 
-    public override string Title => "Select provider";
+    public override string Title => LanguageHelper.GetRequiredString(nameof(Properties.Resources.Controls_DbConnectionProviderList_Title));
     public DbProviderInfo? DbProvider { get; set; }
     public IList<DbProviderInfo> DbProviders { get; private set; }
     public Command Refresh { get; }
@@ -50,12 +49,4 @@ private void OnRefresh()
         DbProviders = Database.DbProvider.GetRegisteredProviders().Select(x => x.Value.Info).ToList();
         DbProvider = DbProviders.FirstOrDefault(x => x.Equals(_selectedProvider));
     }
-
-    private void On()
-    {
-        Orc.DataAccess.Database.
-            DbProvider.UnregisterProvider(new DbProviderInfo(string.Empty, "Microsoft.Data.SqlClient", string.Empty, string.Empty));
-
-        DbProviderFactories.UnregisterFactory("Microsoft.Data.SqlClient");
-    }
 }

src/Orc.DataAccess.Xaml/ModuleInitializer.cs

@@ -21,6 +21,6 @@ public static void Initialize()
         viewModelLocator.Register(typeof(DbConnectionProviderListWindow), typeof(DbConnectionProviderListViewModel));
 
         var languageService = serviceLocator.ResolveRequiredType<ILanguageService>();
-        languageService.RegisterLanguageSource(new LanguageResourceSource("Orc.DataAccess", "Orc.DataAccess.Properties", "Resources"));
+        languageService.RegisterLanguageSource(new LanguageResourceSource("Orc.DataAccess.Xaml", "Orc.DataAccess.Properties", "Resources"));
     }
 }

src/Orc.DataAccess.Xaml/Properties/Resources.resx

@@ -159,6 +159,9 @@
   <data name="Controls_ConnectionStringAdvancedOptionsWindow_DataGridTextColumn_Header_Value" xml:space="preserve">
     <value>Value</value>
   </data>
+  <data name="Controls_ConnectionStringBuilder_Search_WaterMark" xml:space="preserve">
+    <value>Search...</value>
+  </data>
   <data name="Controls_ConnectionStringEditWindow_Button_Content_Advanced" xml:space="preserve">
     <value>Advanced...</value>
   </data>
@@ -348,6 +351,9 @@
   <data name="Controls_DbConnectionProviderListWindow_Button_Content_Refresh" xml:space="preserve">
     <value>Refresh</value>
   </data>
+  <data name="Controls_DbConnectionProviderList_Title" xml:space="preserve">
+    <value>Select provider</value>
+  </data>
   <data name="Controls_DbProviderControl_Button_Content_Change" xml:space="preserve">
     <value>Change...</value>
   </data>

src/Orc.DataAccess/Database/DataSourceSchemaProviders/SystemSqlDataSourceSchemaProvider.cs

@@ -24,7 +24,7 @@ public class SystemSqlDataSourceSchemaProvider : IDataSourceSchemaProvider
 
         using var command = sqlConnection.CreateCommand();
         command.Connection = sqlConnection;
-        command.CommandText = "SELECT name from sys.databases";
+        command.CommandText = "SELECT name from [sys].[databases]";
         command.CommandType = CommandType.Text;
 
         using var dataReader = command.ExecuteReader();

src/Orc.DataAccess/Database/DbDataSourceProviders/Base/MsSqlDbDataSourceProviderBase.cs

@@ -8,7 +8,7 @@
 using System.Linq;
 using Catel.IoC;
 using Catel.Logging;
-using Registry;
+using Services;
 
 public abstract class MsSqlDbDataSourceProviderBase : IDbDataSourceProvider
 {
@@ -60,7 +60,7 @@ private IEnumerable<string> GetInstalledInstancesInRegistryView(RegistryView reg
         using var regView = _registryKeyService.OpenBaseKey(RegistryHive.LocalMachine, registryView);
         using var sqlServerNode = regView.OpenSubKey(MicrosoftSqlServerRegPath);
 
-        return sqlServerNode?.GetValue("InstalledInstances") as IList<string> ?? Array.Empty<string>();
+        return sqlServerNode?.GetValue("InstalledInstances") as IEnumerable<string> ?? Enumerable.Empty<string>();
     }
 
     private IEnumerable<string> GetRemoteSqlServerInstances()

src/Orc.DataAccess/Database/DbDataSourceProviders/MsSqlDbDataSourceProvider.cs

@@ -1,12 +1,6 @@
 namespace Orc.DataAccess.Database;
 
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using Microsoft.Win32;
-using Orc.DataAccess.Registry;
-using RegistryKey = Registry.RegistryKey;
+using Services;
 
 [ConnectToProvider("Microsoft.Data.SqlClient")]
 public class MsSqlDbDataSourceProvider : MsSqlDbDataSourceProviderBase

src/Orc.DataAccess/Database/DbDataSourceProviders/SystemSqlDbDataSourceProvider.cs

@@ -1,6 +1,6 @@
 namespace Orc.DataAccess.Database;
 
-using Registry;
+using Services;
 
 [ConnectToProvider("System.Data.SqlClient")]
 public class SystemSqlDbDataSourceProvider : MsSqlDbDataSourceProviderBase

src/Orc.DataAccess/Database/Extensions/DbProviderExtensions.cs

@@ -63,7 +63,7 @@ public static IList<Type> GetConnectedTypes<T>(this DbProvider dbProvider)
         if (!typeBatch.TryGetValue(typeof(T), out var types))
         {
             types = dbProvider.FindConnectedTypes<T>().ToList();
-            typeBatch.Add(typeof(T), types);
+            typeBatch[typeof(T)] = types;
         }
 
         return types;

src/Orc.DataAccess/Excel/Readers/ExcelReader.cs

@@ -141,12 +141,11 @@ private void InitializeExcelReader(ExcelSource excelSource)
             AddValidationError($"File '{filePath}' not found");
             return;
         }
-#if NETCORE
+
         // Register additional encodings as they supported by default only in .NET Framework
         var encodingProvider = CodePagesEncodingProvider.Instance;
         Encoding.RegisterProvider(encodingProvider);
 
-#endif
 #pragma warning disable IDISP001 // Dispose created.
         // Note: need to keep this stream open as long as the reader lives
         var stream = File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);

src/Orc.DataAccess/ModuleInitializer.cs

@@ -1,7 +1,6 @@
 using Catel.IoC;
 using Catel.Services;
-using Orc.DataAccess.Registry;
-
+using Orc.DataAccess.Services;
 /// <summary>
 /// Used by the ModuleInit. All code inside the Initialize method is ran as soon as the assembly is loaded.
 /// </summary>

src/Orc.DataAccess/Registry/Interfaces/IRegistryKey.cs

@@ -1,4 +1,4 @@
-namespace Orc.DataAccess.Registry;
+namespace Orc.DataAccess;
 
 using System;
 

src/Orc.DataAccess/Registry/RegistryKey.cs

@@ -1,4 +1,4 @@
-namespace Orc.DataAccess.Registry;
+namespace Orc.DataAccess;
 
 using System;
 

src/Orc.DataAccess/Registry/Services/Interfaces/IRegistryKeyService.cs

@@ -1,4 +1,4 @@
-namespace Orc.DataAccess.Registry;
+namespace Orc.DataAccess.Services;
 
 using Microsoft.Win32;
 

src/Orc.DataAccess/Registry/Services/RegistryKeyService.cs

@@ -1,11 +1,11 @@
-namespace Orc.DataAccess.Registry;
+namespace Orc.DataAccess.Services;
 
 using Microsoft.Win32;
 
 internal class RegistryKeyService : IRegistryKeyService
 {
     public IRegistryKey OpenBaseKey(RegistryHive hKey, RegistryView view)
     {
-        return new RegistryKey(Microsoft.Win32.RegistryKey.OpenBaseKey(hKey, view));
+        return new DataAccess.RegistryKey(Microsoft.Win32.RegistryKey.OpenBaseKey(hKey, view));
     }
 }