diff --git a/lib/Application/Standalone.Core/ApplicationBase.cs b/lib/Application/Standalone.Core/ApplicationBase.cs index 30b1e76..59a12d5 100644 --- a/lib/Application/Standalone.Core/ApplicationBase.cs +++ b/lib/Application/Standalone.Core/ApplicationBase.cs @@ -18,7 +18,7 @@ namespace Standalone.Core { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class ApplicationBase : IApplication, INotifyPropertyChanged { public event PropertyChangedEventHandler PropertyChanged; diff --git a/lib/Application/Standalone.Core/Data/ISqlResults.cs b/lib/Application/Standalone.Core/Data/ISqlResults.cs index 7fbbaba..220b4f1 100644 --- a/lib/Application/Standalone.Core/Data/ISqlResults.cs +++ b/lib/Application/Standalone.Core/Data/ISqlResults.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/lib/Application/Standalone.Core/Data/SqlService.cs b/lib/Application/Standalone.Core/Data/SqlService.cs index a58a2f3..01518f0 100644 --- a/lib/Application/Standalone.Core/Data/SqlService.cs +++ b/lib/Application/Standalone.Core/Data/SqlService.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Text; using System.Text.RegularExpressions; diff --git a/lib/Application/Standalone.Core/Display/ConnectionAdapter.cs b/lib/Application/Standalone.Core/Display/ConnectionAdapter.cs index 06f8534..5a8ea49 100644 --- a/lib/Application/Standalone.Core/Display/ConnectionAdapter.cs +++ b/lib/Application/Standalone.Core/Display/ConnectionAdapter.cs @@ -11,7 +11,7 @@ namespace Standalone.Core.Display { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class ConnectionAdapter { private ProjectAdapter _project; diff --git a/lib/Application/Standalone.Core/Display/ProjectAdapter.cs b/lib/Application/Standalone.Core/Display/ProjectAdapter.cs index c224f45..ed0a4bd 100644 --- a/lib/Application/Standalone.Core/Display/ProjectAdapter.cs +++ b/lib/Application/Standalone.Core/Display/ProjectAdapter.cs @@ -11,7 +11,7 @@ namespace Standalone.Core.Display { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class ProjectAdapter { public Project Project { get; private set; } diff --git a/lib/Application/Standalone.Core/FodyWeavers.xml b/lib/Application/Standalone.Core/FodyWeavers.xml index bb0f322..256b951 100644 --- a/lib/Application/Standalone.Core/FodyWeavers.xml +++ b/lib/Application/Standalone.Core/FodyWeavers.xml @@ -1,4 +1,4 @@  - - + + \ No newline at end of file diff --git a/lib/Application/Standalone.Core/FodyWeavers.xsd b/lib/Application/Standalone.Core/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/lib/Application/Standalone.Core/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/lib/Application/Standalone.Core/Installers/ConfigurationInstaller.cs b/lib/Application/Standalone.Core/Installers/ConfigurationInstaller.cs index 16c3da0..4de735b 100644 --- a/lib/Application/Standalone.Core/Installers/ConfigurationInstaller.cs +++ b/lib/Application/Standalone.Core/Installers/ConfigurationInstaller.cs @@ -43,7 +43,7 @@ protected virtual Project CreateProject(IKernel kernel) using (TextReader reader = new StreamReader(args[1])) dto = (ProjectDTO)deserializer.Deserialize(reader); } - catch (Exception ex) + catch (Exception) { // halt application (not currently in a message loop) // TODO: need to inform the user that we couldn't load the project: this is why diff --git a/lib/Application/Standalone.Core/Installers/InitialiserInstaller.cs b/lib/Application/Standalone.Core/Installers/InitialiserInstaller.cs index 91a4798..77315e9 100644 --- a/lib/Application/Standalone.Core/Installers/InitialiserInstaller.cs +++ b/lib/Application/Standalone.Core/Installers/InitialiserInstaller.cs @@ -16,7 +16,7 @@ public class InitialiserInstaller : IWindsorInstaller public void Install(IWindsorContainer container, IConfigurationStore store) { container.Register( - Classes.FromThisAssembly().BasedOn().WithService.FromInterface(), + Classes.FromAssemblyContaining().BasedOn().WithService.FromInterface(), Component.For>().UsingFactoryMethod>( c => new List(c.ResolveAll()))); } diff --git a/lib/Application/Standalone.Core/Properties/AssemblyInfo.cs b/lib/Application/Standalone.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index 4615d12..0000000 --- a/lib/Application/Standalone.Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Standalone.Core")] -[assembly: AssemblyDescription("Core machinery for standalone application.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("Standalone.Core")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c516d029-8119-46a8-bca7-0e2a6c72588d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/Application/Standalone.Core/Standalone.Core.csproj b/lib/Application/Standalone.Core/Standalone.Core.csproj index 1a17e07..938f584 100644 --- a/lib/Application/Standalone.Core/Standalone.Core.csproj +++ b/lib/Application/Standalone.Core/Standalone.Core.csproj @@ -1,144 +1,65 @@ - - - - - Debug - AnyCPU - {A9091ADB-FC19-4982-BCE4-6A0425F974D6} - Library - Properties - Standalone.Core - Standalone.Core - v4.5 - 512 - ..\ - 8931243d - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll - - - ..\..\packages\PropertyChanged.Fody.1.48.2.0\Lib\NET35\PropertyChanged.dll - False - - - - - ..\..\packages\System.Data.SQLite.Core.1.0.94.0\lib\net45\System.Data.SQLite.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {5336bddd-c373-494b-94e7-aeaabc8cd88d} - dbqf.MsAccess - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {f46b0af8-b45b-4897-995f-bba8a290999a} - dbqf.Serialization - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - - - - - - - - - - - + + + netstandard2.0 + Debug + AnyCPU + {A9091ADB-FC19-4982-BCE4-6A0425F974D6} + Library + Properties + Standalone.Core + Standalone.Core + 512 + ..\ + + + + Core machinery for standalone application. + Copyright © Stuart Attenborrow 2016 + Stuart Attenborrow + 2.0.0 + + + + {5336bddd-c373-494b-94e7-aeaabc8cd88d} + dbqf.MsAccess + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + + + + + + + + + 5.0.0 + + + 5.1.1 + + + 6.6.3 + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + 3.4.1 + + + + 1.0.116 + + \ No newline at end of file diff --git a/lib/Application/Standalone.Core/app.config b/lib/Application/Standalone.Core/app.config index 3f78e17..2d191fa 100644 --- a/lib/Application/Standalone.Core/app.config +++ b/lib/Application/Standalone.Core/app.config @@ -1,8 +1,8 @@ - + -
+
@@ -12,4 +12,13 @@ - + + + + + + + + + + diff --git a/lib/Application/Standalone.Core/packages.config b/lib/Application/Standalone.Core/packages.config deleted file mode 100644 index c455df5..0000000 --- a/lib/Application/Standalone.Core/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/lib/Application/Standalone.WPF/App.xaml.cs b/lib/Application/Standalone.WPF/App.xaml.cs index e607684..eb3dc3f 100644 --- a/lib/Application/Standalone.WPF/App.xaml.cs +++ b/lib/Application/Standalone.WPF/App.xaml.cs @@ -38,7 +38,7 @@ protected override void OnStartup(StartupEventArgs e) private static IWindsorContainer BootstrapContainer() { return new WindsorContainer().Install( - Configuration.FromXmlFile(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "castle.config")) + Castle.Windsor.Installer.Configuration.FromXmlFile(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "castle.config")) ); } } diff --git a/lib/Application/Standalone.WPF/Controls/LoadingControl.xaml.cs b/lib/Application/Standalone.WPF/Controls/LoadingControl.xaml.cs index cc35f68..38fb30a 100644 --- a/lib/Application/Standalone.WPF/Controls/LoadingControl.xaml.cs +++ b/lib/Application/Standalone.WPF/Controls/LoadingControl.xaml.cs @@ -22,7 +22,7 @@ public partial class LoadingControl : UserControl { public LoadingControl() { - InitializeComponent(); + //InitializeComponent(); } private void Button_Click(object sender, RoutedEventArgs e) diff --git a/lib/Application/Standalone.WPF/Controls/RetrieveFieldsView.xaml.cs b/lib/Application/Standalone.WPF/Controls/RetrieveFieldsView.xaml.cs index 0fff569..ec93dba 100644 --- a/lib/Application/Standalone.WPF/Controls/RetrieveFieldsView.xaml.cs +++ b/lib/Application/Standalone.WPF/Controls/RetrieveFieldsView.xaml.cs @@ -24,7 +24,7 @@ public partial class RetrieveFieldsView : UserControl public RetrieveFieldsViewAdapter Adapter { get; private set; } public RetrieveFieldsView(RetrieveFieldsViewAdapter adapter) { - InitializeComponent(); + //InitializeComponent(); Adapter = adapter; this.DataContext = adapter; } @@ -32,6 +32,7 @@ public RetrieveFieldsView(RetrieveFieldsViewAdapter adapter) private void Add(RetrieveFieldsViewAdapter.Node node) { var added = Adapter.Add(node); + var lstCustom = FindName("lstCustom") as ListBox; lstCustom.SelectedItems.Clear(); foreach (var f in added) lstCustom.SelectedItems.Add(f); @@ -67,6 +68,8 @@ private void ListBox_Drop(object sender, DragEventArgs e) private void ListBox_KeyDown(object sender, KeyEventArgs e) { + var lstCustom = e.Source as ListBox; + if (e.Key == Key.Back || e.Key == Key.Delete) { foreach (var f in new List(lstCustom.SelectedItems.Cast())) diff --git a/lib/Application/Standalone.WPF/Controls/RetrieveFieldsViewAdapter.cs b/lib/Application/Standalone.WPF/Controls/RetrieveFieldsViewAdapter.cs index 42290f3..8dba395 100644 --- a/lib/Application/Standalone.WPF/Controls/RetrieveFieldsViewAdapter.cs +++ b/lib/Application/Standalone.WPF/Controls/RetrieveFieldsViewAdapter.cs @@ -15,7 +15,7 @@ namespace Standalone.WPF.Controls { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class RetrieveFieldsViewAdapter { public bool UseFields { get; set; } diff --git a/lib/Application/Standalone.WPF/FodyWeavers.xml b/lib/Application/Standalone.WPF/FodyWeavers.xml index df428ee..4e68ed1 100644 --- a/lib/Application/Standalone.WPF/FodyWeavers.xml +++ b/lib/Application/Standalone.WPF/FodyWeavers.xml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/lib/Application/Standalone.WPF/FodyWeavers.xsd b/lib/Application/Standalone.WPF/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/lib/Application/Standalone.WPF/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/lib/Application/Standalone.WPF/MainWindow.xaml.cs b/lib/Application/Standalone.WPF/MainWindow.xaml.cs index e2b5e43..a6cb4c9 100644 --- a/lib/Application/Standalone.WPF/MainWindow.xaml.cs +++ b/lib/Application/Standalone.WPF/MainWindow.xaml.cs @@ -23,7 +23,7 @@ public partial class MainWindow : Window public MainWindowAdapter Adapter { get; private set; } public MainWindow(MainWindowAdapter adapter) { - InitializeComponent(); + //InitializeComponent(); Adapter = adapter; this.DataContext = Adapter; } diff --git a/lib/Application/Standalone.WPF/MainWindowAdapter.cs b/lib/Application/Standalone.WPF/MainWindowAdapter.cs index 9433b8b..a627dbe 100644 --- a/lib/Application/Standalone.WPF/MainWindowAdapter.cs +++ b/lib/Application/Standalone.WPF/MainWindowAdapter.cs @@ -21,7 +21,7 @@ namespace Standalone.WPF { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class MainWindowAdapter : Core.ApplicationBase { public ProjectAdapter ProjectAdapter { get; private set; } diff --git a/lib/Application/Standalone.WPF/Properties/AssemblyInfo.cs b/lib/Application/Standalone.WPF/Properties/AssemblyInfo.cs deleted file mode 100644 index 64fce63..0000000 --- a/lib/Application/Standalone.WPF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Standalone.WPF")] -[assembly: AssemblyDescription("WPF implementation of standalone application.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("Standalone.WPF")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/Application/Standalone.WPF/Properties/Resources.Designer.cs b/lib/Application/Standalone.WPF/Properties/Resources.Designer.cs index 225388f..5d2114b 100644 --- a/lib/Application/Standalone.WPF/Properties/Resources.Designer.cs +++ b/lib/Application/Standalone.WPF/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Standalone.WPF.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/lib/Application/Standalone.WPF/Properties/Settings.Designer.cs b/lib/Application/Standalone.WPF/Properties/Settings.Designer.cs index 223ee9c..8aafa1f 100644 --- a/lib/Application/Standalone.WPF/Properties/Settings.Designer.cs +++ b/lib/Application/Standalone.WPF/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace Standalone.WPF.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/lib/Application/Standalone.WPF/Standalone.WPF.csproj b/lib/Application/Standalone.WPF/Standalone.WPF.csproj index 5a6b093..4aedb67 100644 --- a/lib/Application/Standalone.WPF/Standalone.WPF.csproj +++ b/lib/Application/Standalone.WPF/Standalone.WPF.csproj @@ -1,199 +1,64 @@ - - - - - Debug - AnyCPU - {AF36D489-5EAC-4555-84A2-5FD03D700AD2} - WinExe - Properties - Standalone.WPF - Standalone.WPF - v4.5 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - ..\ - - 515a49d7 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - - - ..\..\packages\Castle.Core.3.3.3\lib\net40-client\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.3.3.0\lib\net40\Castle.Windsor.dll - - - - ..\..\packages\PropertyChanged.Fody.1.48.2.0\Lib\NET35\PropertyChanged.dll - False - - - - - - False - ..\..\packages\System.Data.SQLite.Core.1.0.94.0\lib\net45\System.Data.SQLite.dll - - - - - - ..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll - - - - - - - - 4.0 - - - - - - - - ..\..\packages\WpfAnimatedGif.1.4.13\lib\net\WpfAnimatedGif.dll - - - - - MSBuild:Compile - Designer - - - LoadingControl.xaml - - - - RetrieveFieldsView.xaml - - - - - - - - - - - - - - - - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - PreserveNewest - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {f46b0af8-b45b-4897-995f-bba8a290999a} - dbqf.Serialization - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {a4415051-8be4-4d13-9a30-a9495a4701ee} - dbqf.WPF - - - {a9091adb-fc19-4982-bce4-6a0425f974d6} - Standalone.Core - - - - - - - - - - - + + + net6.0-windows7.0 + Release + Library + Windows + true + true + true + WPF implementation of standalone application. + Copyright © Stuart Attenborrow 2016 + Stuart Attenborrow + 2.0.0 + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {a4415051-8be4-4d13-9a30-a9495a4701ee} + dbqf.WPF + + + {a9091adb-fc19-4982-bce4-6a0425f974d6} + Standalone.Core + + + + + + + + 5.0.0 + + + 5.1.1 + + + 6.6.3 + runtime; build; native; contentfiles; analyzers; buildtransitive + All + + + + 3.4.1 + + + 1.0.116 + + + 2.0.2 + + + + \ No newline at end of file diff --git a/lib/Application/Standalone.WPF/ViewModel/ConnectionAdapter.cs b/lib/Application/Standalone.WPF/ViewModel/ConnectionAdapter.cs index 52998eb..2249530 100644 --- a/lib/Application/Standalone.WPF/ViewModel/ConnectionAdapter.cs +++ b/lib/Application/Standalone.WPF/ViewModel/ConnectionAdapter.cs @@ -12,7 +12,7 @@ namespace Standalone.WPF.ViewModel { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class ConnectionAdapter { private ProjectAdapter _project; diff --git a/lib/Application/Standalone.WPF/ViewModel/ProjectAdapter.cs b/lib/Application/Standalone.WPF/ViewModel/ProjectAdapter.cs index 54acdaf..beb7e82 100644 --- a/lib/Application/Standalone.WPF/ViewModel/ProjectAdapter.cs +++ b/lib/Application/Standalone.WPF/ViewModel/ProjectAdapter.cs @@ -11,7 +11,7 @@ namespace Standalone.WPF.ViewModel { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class ProjectAdapter { public Project Project { get; private set; } diff --git a/lib/Application/Standalone.WPF/app.config b/lib/Application/Standalone.WPF/app.config index 8d59f19..873cdb2 100644 --- a/lib/Application/Standalone.WPF/app.config +++ b/lib/Application/Standalone.WPF/app.config @@ -1,11 +1,11 @@ - + - +
- + 300 @@ -30,4 +30,12 @@ + + + + + + + + diff --git a/lib/Application/Standalone.WPF/packages.config b/lib/Application/Standalone.WPF/packages.config deleted file mode 100644 index e83d985..0000000 --- a/lib/Application/Standalone.WPF/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/lib/Application/Standalone/App.config b/lib/Application/Standalone/App.config index a3d9f4c..feb91b4 100644 --- a/lib/Application/Standalone/App.config +++ b/lib/Application/Standalone/App.config @@ -7,13 +7,17 @@ - + - + + + + + @@ -30,4 +34,4 @@ - \ No newline at end of file + diff --git a/lib/Application/Standalone/FodyWeavers.xml b/lib/Application/Standalone/FodyWeavers.xml index bb0f322..256b951 100644 --- a/lib/Application/Standalone/FodyWeavers.xml +++ b/lib/Application/Standalone/FodyWeavers.xml @@ -1,4 +1,4 @@  - - + + \ No newline at end of file diff --git a/lib/Application/Standalone/FodyWeavers.xsd b/lib/Application/Standalone/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/lib/Application/Standalone/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/lib/Application/Standalone/Forms/AboutDialog.cs b/lib/Application/Standalone/Forms/AboutDialog.cs index 3585f94..bde1059 100644 --- a/lib/Application/Standalone/Forms/AboutDialog.cs +++ b/lib/Application/Standalone/Forms/AboutDialog.cs @@ -69,7 +69,7 @@ public string AssemblyTitle return titleAttribute.Title; } } - return System.IO.Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().CodeBase); + return System.IO.Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().Location); } } diff --git a/lib/Application/Standalone/Forms/MainAdapter.cs b/lib/Application/Standalone/Forms/MainAdapter.cs index 28e0543..31cbc7f 100644 --- a/lib/Application/Standalone/Forms/MainAdapter.cs +++ b/lib/Application/Standalone/Forms/MainAdapter.cs @@ -20,7 +20,7 @@ namespace Standalone.Forms { - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public class MainAdapter : Core.ApplicationBase { public DbServiceFactory ServiceFactory { get; set; } diff --git a/lib/Application/Standalone/Forms/RetrieveFieldsViewAdapter.cs b/lib/Application/Standalone/Forms/RetrieveFieldsViewAdapter.cs index f90f510..c60175c 100644 --- a/lib/Application/Standalone/Forms/RetrieveFieldsViewAdapter.cs +++ b/lib/Application/Standalone/Forms/RetrieveFieldsViewAdapter.cs @@ -106,7 +106,7 @@ public override string Text public IEnumerable GetChildren(Node node = null) { - ISubject toExpand = null; + //ISubject toExpand = null; if (node == null) foreach (var s in _configuration) yield return new SubjectNode() { HasChildren = true, Subject = s }; diff --git a/lib/Application/Standalone/Properties/AssemblyInfo.cs b/lib/Application/Standalone/Properties/AssemblyInfo.cs deleted file mode 100644 index 7ff0b2d..0000000 --- a/lib/Application/Standalone/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Standalone")] -[assembly: AssemblyDescription("WinForms implementation of standalone application. Loading icon by https://dribbble.com/mangustas")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("Standalone")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("01d6f316-b4d1-4d78-9c0b-cf958492de46")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/Application/Standalone/Properties/Resources.Designer.cs b/lib/Application/Standalone/Properties/Resources.Designer.cs index 7622e29..a3db465 100644 --- a/lib/Application/Standalone/Properties/Resources.Designer.cs +++ b/lib/Application/Standalone/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Standalone.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/lib/Application/Standalone/Properties/Settings.Designer.cs b/lib/Application/Standalone/Properties/Settings.Designer.cs index 7b27a14..8b34bcd 100644 --- a/lib/Application/Standalone/Properties/Settings.Designer.cs +++ b/lib/Application/Standalone/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace Standalone.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/lib/Application/Standalone/Properties/Settings.settings b/lib/Application/Standalone/Properties/Settings.settings index 6a9ef28..e5d818e 100644 --- a/lib/Application/Standalone/Properties/Settings.settings +++ b/lib/Application/Standalone/Properties/Settings.settings @@ -8,7 +8,7 @@ -1 - + diff --git a/lib/Application/Standalone/Standalone.csproj b/lib/Application/Standalone/Standalone.csproj index 10b5df7..c8dcdcf 100644 --- a/lib/Application/Standalone/Standalone.csproj +++ b/lib/Application/Standalone/Standalone.csproj @@ -1,181 +1,77 @@ - - - - - Debug - AnyCPU - {5AAD85B2-212D-421C-9C9B-8B2675550E1E} - WinExe - Properties - Standalone - Standalone - v4.5 - 512 - ..\ - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll - - - ..\..\packages\FCTB.2.16.1.1\lib\FastColoredTextBox.dll - - - ..\..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll - - - ..\..\packages\PropertyChanged.Fody.1.48.2.0\Lib\NET35\PropertyChanged.dll - False - - - - - False - ..\..\packages\System.Data.SQLite.Core.1.0.94.0\lib\net45\System.Data.SQLite.dll - - - - - - - - - - - - - Form - - - AboutDialog.cs - - - Form - - - Main.cs - - - - - UserControl - - - RetrieveFieldsView.cs - - - - - - - - - - - - - - - AboutDialog.cs - - - Main.cs - - - RetrieveFieldsView.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - PreserveNewest - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - {f46b0af8-b45b-4897-995f-bba8a290999a} - dbqf.Serialization - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} - dbqf.core.tests - - - {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} - dbqf.WinForms - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {a9091adb-fc19-4982-bce4-6a0425f974d6} - Standalone.Core - - - - - - - - - - - - + + + net6.0-windows7.0 + Debug + AnyCPU + {5AAD85B2-212D-421C-9C9B-8B2675550E1E} + WinExe + Properties + Standalone + Standalone + 512 + ..\ + + + + WinForms implementation of standalone application. Loading icon by https://dribbble.com/mangustas + Copyright © Stuart Attenborrow 2016 + Stuart Attenborrow + 2.0.0 + + + + + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} + dbqf.core.tests + + + {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} + dbqf.WinForms + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {a9091adb-fc19-4982-bce4-6a0425f974d6} + Standalone.Core + + + + + + + + + + + 5.0.0 + + + 5.1.1 + + + + 6.6.3 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + 3.4.1 + + + 1.0.116 + + \ No newline at end of file diff --git a/lib/Application/Standalone/packages.config b/lib/Application/Standalone/packages.config deleted file mode 100644 index 5e0a67a..0000000 --- a/lib/Application/Standalone/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/lib/Backends/dbqf.MsAccess/Properties/AssemblyInfo.cs b/lib/Backends/dbqf.MsAccess/Properties/AssemblyInfo.cs deleted file mode 100644 index 60cf56f..0000000 --- a/lib/Backends/dbqf.MsAccess/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.MsAccess")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("dbqf.MsAccess")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e5fe3fc8-2283-48b4-8662-c899884f21b4")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/Backends/dbqf.MsAccess/SqlGenerator.cs b/lib/Backends/dbqf.MsAccess/SqlGenerator.cs index cb6d2c9..b747a15 100644 --- a/lib/Backends/dbqf.MsAccess/SqlGenerator.cs +++ b/lib/Backends/dbqf.MsAccess/SqlGenerator.cs @@ -21,7 +21,7 @@ public SqlGenerator(IMatrixConfiguration configuration) /// /// /// - public virtual void UpdateCommand(IDbCommand cmd) + public override void UpdateCommand(IDbCommand cmd) { Validate(); diff --git a/lib/Backends/dbqf.MsAccess/dbqf.MsAccess.csproj b/lib/Backends/dbqf.MsAccess/dbqf.MsAccess.csproj index af92fac..5e29d85 100644 --- a/lib/Backends/dbqf.MsAccess/dbqf.MsAccess.csproj +++ b/lib/Backends/dbqf.MsAccess/dbqf.MsAccess.csproj @@ -1,61 +1,27 @@ - - - - - Debug - AnyCPU - {5336BDDD-C373-494B-94E7-AEAABC8CD88D} - Library - Properties - dbqf.MsAccess - dbqf.MsAccess - v2.0 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - - + + + Debug + AnyCPU + {5336BDDD-C373-494B-94E7-AEAABC8CD88D} + Library + Properties + dbqf.MsAccess + dbqf.MsAccess + netstandard2.0 + 512 + + Stuart Attenborrow + Copyright © Stuart Attenborrow 2015 + 1.0.0 + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + \ No newline at end of file diff --git a/lib/Backends/dbqf.Sql/Properties/AssemblyInfo.cs b/lib/Backends/dbqf.Sql/Properties/AssemblyInfo.cs deleted file mode 100644 index 4f30f63..0000000 --- a/lib/Backends/dbqf.Sql/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.Sql")] -[assembly: AssemblyDescription("dbqf.Sql contains backend SQL building and execution for use with dbqf.core.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("dbqf.Sql")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("372e8cc8-9311-4edc-b4d9-b3af58e9dd3c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/Backends/dbqf.Sql/dbqf.Sql.csproj b/lib/Backends/dbqf.Sql/dbqf.Sql.csproj index 5fe175f..78f4bdb 100644 --- a/lib/Backends/dbqf.Sql/dbqf.Sql.csproj +++ b/lib/Backends/dbqf.Sql/dbqf.Sql.csproj @@ -1,92 +1,23 @@ - - - - - Debug - AnyCPU - {8677A10F-415F-4F5F-ABC5-726EDE1CB372} - Library - Properties - dbqf.Sql - dbqf.Sql - v2.0 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - - + + + Debug + AnyCPU + {8677A10F-415F-4F5F-ABC5-726EDE1CB372} + Library + Properties + dbqf.Sql + dbqf.Sql + netstandard2.0 + 512 + dbqf.Sql contains backend SQL building and execution for use with dbqf.core. + Stuart Attenborrow + Copyright © Stuart Attenborrow 2016 + 2.0.0 + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + \ No newline at end of file diff --git a/lib/DbQueryFramework.sln b/lib/DbQueryFramework.sln index 969a6f8..539a311 100644 --- a/lib/DbQueryFramework.sln +++ b/lib/DbQueryFramework.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32210.238 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dbqf.core", "dbqf.core\dbqf.core.csproj", "{AB9BDEC4-8264-49A2-B2B6-EF6276341535}" EndProject diff --git a/lib/Frontends/dbqf.WPF/AdvancedView.xaml b/lib/Frontends/dbqf.WPF/AdvancedView.xaml index e8081c8..74ae7d7 100644 --- a/lib/Frontends/dbqf.WPF/AdvancedView.xaml +++ b/lib/Frontends/dbqf.WPF/AdvancedView.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" + xmlns:i="http://schemas.microsoft.com/xaml/behaviors" xmlns:uc="clr-namespace:dbqf.WPF" xmlns:types="clr-namespace:dbqf.WPF.Advanced" mc:Ignorable="d" diff --git a/lib/Frontends/dbqf.WPF/FodyWeavers.xml b/lib/Frontends/dbqf.WPF/FodyWeavers.xml index df428ee..0273f6e 100644 --- a/lib/Frontends/dbqf.WPF/FodyWeavers.xml +++ b/lib/Frontends/dbqf.WPF/FodyWeavers.xml @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/lib/Frontends/dbqf.WPF/FodyWeavers.xsd b/lib/Frontends/dbqf.WPF/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/lib/Frontends/dbqf.WPF/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/lib/Frontends/dbqf.WPF/Properties/AssemblyInfo.cs b/lib/Frontends/dbqf.WPF/Properties/AssemblyInfo.cs deleted file mode 100644 index abadd36..0000000 --- a/lib/Frontends/dbqf.WPF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.WPF")] -[assembly: AssemblyDescription("dbqf.WPF contains the WPF components for use with dbqf.core")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("dbqf.WPF")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("af346b9f-1145-43ca-9f61-bf910595040b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/Frontends/dbqf.WPF/Properties/Resources.Designer.cs b/lib/Frontends/dbqf.WPF/Properties/Resources.Designer.cs deleted file mode 100644 index e494b8c..0000000 --- a/lib/Frontends/dbqf.WPF/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.34209 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace dbqf.WPF.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("dbqf.WPF.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/lib/Frontends/dbqf.WPF/Properties/Resources.resx b/lib/Frontends/dbqf.WPF/Properties/Resources.resx deleted file mode 100644 index 7080a7d..0000000 --- a/lib/Frontends/dbqf.WPF/Properties/Resources.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/lib/Frontends/dbqf.WPF/UIElements/Controls/BetweenControl.xaml.cs b/lib/Frontends/dbqf.WPF/UIElements/Controls/BetweenControl.xaml.cs index a21097e..20c18d3 100644 --- a/lib/Frontends/dbqf.WPF/UIElements/Controls/BetweenControl.xaml.cs +++ b/lib/Frontends/dbqf.WPF/UIElements/Controls/BetweenControl.xaml.cs @@ -19,7 +19,7 @@ namespace dbqf.WPF.UIElements.Controls /// /// Interaction logic for BetweenControl.xaml /// - [ImplementPropertyChanged] + [AddINotifyPropertyChangedInterface] public partial class BetweenControl : UserControl { public BetweenControl() diff --git a/lib/Frontends/dbqf.WPF/dbqf.WPF.csproj b/lib/Frontends/dbqf.WPF/dbqf.WPF.csproj index 5d86d22..f7c0608 100644 --- a/lib/Frontends/dbqf.WPF/dbqf.WPF.csproj +++ b/lib/Frontends/dbqf.WPF/dbqf.WPF.csproj @@ -1,145 +1,43 @@ - - - - - Debug - AnyCPU - {A4415051-8BE4-4D13-9A30-A9495A4701EE} - Library - Properties - dbqf.WPF - dbqf.WPF - v4.0 - 512 - - ..\ - 4727c75b - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - ..\..\packages\PropertyChanged.Fody.1.48.2.0\Lib\NET35\PropertyChanged.dll - False - - - - - - False - ..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net40-client\System.Windows.Interactivity.dll - - - - - - - - - - - - - AdvancedView.xaml - - - - - - FieldPathCombo.xaml - - - PresetView.xaml - - - - - True - True - Resources.resx - - - - StandardView.xaml - - - - - - - - BetweenControl.xaml - - - - - - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - + + + Debug + AnyCPU + {A4415051-8BE4-4D13-9A30-A9495A4701EE} + Library + Properties + dbqf.WPF + dbqf.WPF + net6.0-windows + 512 + + ..\ + true + true + + + dbqf.WPF contains the WPF components for use with dbqf.core + Copyright © Stuart Attenborrow 2016 + Stuart Attenborrow + 2.0.0 + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + + + + + + 6.6.3 + runtime; build; native; contentfiles; analyzers; buildtransitive + All + + + + 3.4.1 + + + \ No newline at end of file diff --git a/lib/Frontends/dbqf.WPF/packages.config b/lib/Frontends/dbqf.WPF/packages.config deleted file mode 100644 index bc2ea53..0000000 --- a/lib/Frontends/dbqf.WPF/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lib/Frontends/dbqf.WinForms.tests/Properties/AssemblyInfo.cs b/lib/Frontends/dbqf.WinForms.tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 54efb61..0000000 --- a/lib/Frontends/dbqf.WinForms.tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.WinForms.tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("dbqf.WinForms.tests")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b339dcdf-a5af-4121-893e-bdd0221b6d4d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/Frontends/dbqf.WinForms.tests/app.config b/lib/Frontends/dbqf.WinForms.tests/app.config new file mode 100644 index 0000000..689a2a5 --- /dev/null +++ b/lib/Frontends/dbqf.WinForms.tests/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/lib/Frontends/dbqf.WinForms.tests/dbqf.WinForms.tests.csproj b/lib/Frontends/dbqf.WinForms.tests/dbqf.WinForms.tests.csproj index 3c3ab91..588c1ba 100644 --- a/lib/Frontends/dbqf.WinForms.tests/dbqf.WinForms.tests.csproj +++ b/lib/Frontends/dbqf.WinForms.tests/dbqf.WinForms.tests.csproj @@ -1,79 +1,48 @@ - - - - - Debug - AnyCPU - {4BCD0945-359F-4381-98D5-2D913CBE4A76} - Library - Properties - dbqf.WinForms.tests - dbqf.WinForms.tests - v4.5 - 512 - ..\ - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - - - - - - - - - - - - - - - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} - dbqf.core.tests - - - {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} - dbqf.WinForms - - - - - - + + + Debug + AnyCPU + {4BCD0945-359F-4381-98D5-2D913CBE4A76} + Library + Properties + dbqf.WinForms.tests + dbqf.WinForms.tests + net6.0-windows7.0 + true + true + 512 + ..\ + + + + Copyright © Stuart Attenborrow 2015 + Stuart Attenborrow + 1.0.0 + + + + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} + dbqf.core.tests + + + {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} + dbqf.WinForms + + + + + 3.13.3 + + + \ No newline at end of file diff --git a/lib/Frontends/dbqf.WinForms.tests/packages.config b/lib/Frontends/dbqf.WinForms.tests/packages.config deleted file mode 100644 index ad37a52..0000000 --- a/lib/Frontends/dbqf.WinForms.tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/lib/Frontends/dbqf.WinForms/Properties/AssemblyInfo.cs b/lib/Frontends/dbqf.WinForms/Properties/AssemblyInfo.cs deleted file mode 100644 index 9c8c52b..0000000 --- a/lib/Frontends/dbqf.WinForms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.WinForms")] -[assembly: AssemblyDescription("dbqf.WinForms contains the WinForms components for use with dbqf.core.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("dbqf.WinForms")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d9bdf07d-8c16-4e12-8211-302c27ddc61c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/Frontends/dbqf.WinForms/dbqf.WinForms.csproj b/lib/Frontends/dbqf.WinForms/dbqf.WinForms.csproj index b23de6d..f4f3915 100644 --- a/lib/Frontends/dbqf.WinForms/dbqf.WinForms.csproj +++ b/lib/Frontends/dbqf.WinForms/dbqf.WinForms.csproj @@ -1,222 +1,99 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {B4727DD4-CEF3-4740-8B90-CE6E2B1C8D26} - Library - Properties - dbqf.WinForms - dbqf.WinForms - v2.0 - 512 - - - - true - full - false - ..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\bin\Release\ - TRACE - prompt - 4 - true - - - - - false - - - ..\DbQueryFramework.Key.pfx - - - - - - - - - - - UserControl - - - AdvancedView.cs - - - UserControl - - - AdvancedPartJunctionView.cs - - - UserControl - - - AdvancedPartNodeView.cs - - - - - - Component - - - - - UserControl - - - FieldPathCombo.cs - - - UserControl - - - MultiPartTextBox.cs - - - - UserControl - - - PresetView.cs - - - - UserControl - - - StandardView.cs - - - UserControl - - - StandardPartView.cs - - - - - - - - UserControl - - - BetweenControl.cs - - - UserControl - - - DatePickerControl.cs - - - - - - - True - True - Resources.resx - - - - - - AdvancedView.cs - - - AdvancedPartJunctionView.cs - - - AdvancedPartNodeView.cs - - - FieldPathCombo.cs - - - MultiPartTextBox.cs - - - PresetView.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - StandardView.cs - - - StandardPartView.cs - - - BetweenControl.cs - - - DatePickerControl.cs - - - - - {AB9BDEC4-8264-49A2-B2B6-EF6276341535} - dbqf.core - - - - - DbQueryFramework.Key.pfx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {B4727DD4-CEF3-4740-8B90-CE6E2B1C8D26} + Library + Properties + dbqf.WinForms + dbqf.WinForms + net6.0-windows7.0 + true + true + 512 + + dbqf.WinForms contains the WinForms components for use with dbqf.core. + Copyright © Stuart Attenborrow 2016 + Stuart Attenborrow + 2.0.0 + false + + + + AdvancedView.cs + + + AdvancedPartJunctionView.cs + + + AdvancedPartNodeView.cs + + + FieldPathCombo.cs + + + MultiPartTextBox.cs + + + PresetView.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + StandardView.cs + + + StandardPartView.cs + + + BetweenControl.cs + + + DatePickerControl.cs + + + + + {AB9BDEC4-8264-49A2-B2B6-EF6276341535} + dbqf.core + + + + + DbQueryFramework.Key.pfx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/130dd04b/dbqf.core.tests/NuGetUpgradeLog.html b/lib/MigrationBackup/130dd04b/dbqf.core.tests/NuGetUpgradeLog.html new file mode 100644 index 0000000..afb3077 --- /dev/null +++ b/lib/MigrationBackup/130dd04b/dbqf.core.tests/NuGetUpgradeLog.html @@ -0,0 +1,167 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - dbqf.core.tests

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + D:\GitHub\dbqf\lib\MigrationBackup\130dd04b\dbqf.core.tests
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
ChinookDatabase.Sqlite + v1.4.0
NUnit + v3.13.3
System.Data.SQLite + v1.0.116

Transitive dependencies:

Package IdVersion
EntityFramework + v6.4.4
Stub.System.Data.SQLite.Core.NetFramework + v1.0.116
System.Data.SQLite.Core + v1.0.116
System.Data.SQLite.EF6 + v1.0.116
System.Data.SQLite.Linq + v1.0.116

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/lib/MigrationBackup/130dd04b/dbqf.core.tests/dbqf.core.tests.csproj b/lib/MigrationBackup/130dd04b/dbqf.core.tests/dbqf.core.tests.csproj new file mode 100644 index 0000000..e593496 --- /dev/null +++ b/lib/MigrationBackup/130dd04b/dbqf.core.tests/dbqf.core.tests.csproj @@ -0,0 +1,129 @@ + + + + + + + Debug + AnyCPU + {BC5AAA8E-D0F7-48DE-9F71-3A7C21BDD6D1} + Library + Properties + dbqf.core.tests + dbqf.core.tests + v4.5 + 512 + ..\ + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll + + + + + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net45\System.Data.SQLite.dll + + + ..\packages\System.Data.SQLite.EF6.1.0.116.0\lib\net45\System.Data.SQLite.EF6.dll + + + ..\packages\System.Data.SQLite.Linq.1.0.116.0\lib\net45\System.Data.SQLite.Linq.dll + + + + + + + + + + + + + + + + + + + + + + + + True + True + Settings.settings + + + + + + + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/130dd04b/dbqf.core.tests/packages.config b/lib/MigrationBackup/130dd04b/dbqf.core.tests/packages.config new file mode 100644 index 0000000..5a59894 --- /dev/null +++ b/lib/MigrationBackup/130dd04b/dbqf.core.tests/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/NuGetUpgradeLog.html b/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/NuGetUpgradeLog.html new file mode 100644 index 0000000..2450640 --- /dev/null +++ b/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/NuGetUpgradeLog.html @@ -0,0 +1,162 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - dbqf.Serialization.tests

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + D:\GitHub\dbqf\lib\MigrationBackup\204b4f9e\dbqf.Serialization.tests
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
NUnit + v3.13.3

Transitive dependencies:

Package IdVersion
+ No transitive dependencies found. +

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/dbqf.Serialization.tests.csproj b/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/dbqf.Serialization.tests.csproj new file mode 100644 index 0000000..2cf01aa --- /dev/null +++ b/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/dbqf.Serialization.tests.csproj @@ -0,0 +1,78 @@ + + + + + + Debug + AnyCPU + {281B5D3F-E4B0-480C-A0CD-4CB3F34B8240} + Library + Properties + dbqf.Serialization.tests + dbqf.Serialization.tests + v2.0 + 512 + ..\ + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/packages.config b/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/packages.config new file mode 100644 index 0000000..e754e5d --- /dev/null +++ b/lib/MigrationBackup/204b4f9e/dbqf.Serialization.tests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/NuGetUpgradeLog.html b/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/NuGetUpgradeLog.html new file mode 100644 index 0000000..43419d0 --- /dev/null +++ b/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/NuGetUpgradeLog.html @@ -0,0 +1,162 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - Frontends\dbqf.WinForms.tests

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + D:\GitHub\dbqf\lib\MigrationBackup\4037093f\Frontends\dbqf.WinForms.tests
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
NUnit + v3.13.3

Transitive dependencies:

Package IdVersion
+ No transitive dependencies found. +

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/dbqf.WinForms.tests.csproj b/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/dbqf.WinForms.tests.csproj new file mode 100644 index 0000000..e85f89d --- /dev/null +++ b/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/dbqf.WinForms.tests.csproj @@ -0,0 +1,89 @@ + + + + + + Debug + AnyCPU + {4BCD0945-359F-4381-98D5-2D913CBE4A76} + Library + Properties + dbqf.WinForms.tests + dbqf.WinForms.tests + v4.8 + 512 + ..\ + + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll + + + + + + + + + + + + + + + + + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} + dbqf.core.tests + + + {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} + dbqf.WinForms + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/packages.config b/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/packages.config new file mode 100644 index 0000000..ead4ce5 --- /dev/null +++ b/lib/MigrationBackup/4037093f/Frontends/dbqf.WinForms.tests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/4bd13565/Application/Standalone/NuGetUpgradeLog.html b/lib/MigrationBackup/4bd13565/Application/Standalone/NuGetUpgradeLog.html new file mode 100644 index 0000000..45723e7 --- /dev/null +++ b/lib/MigrationBackup/4bd13565/Application/Standalone/NuGetUpgradeLog.html @@ -0,0 +1,167 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - Application\Standalone

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + D:\GitHub\dbqf\lib\MigrationBackup\4bd13565\Application\Standalone
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
Castle.Core + v5.0.0
Castle.Windsor + v5.1.1
FCTB + v2.16.24
Fody + v6.6.3
NDesk.Options + v0.2.1
PropertyChanged.Fody + v3.4.1
System.Data.SQLite.Core + v1.0.116

Transitive dependencies:

Package IdVersion
Stub.System.Data.SQLite.Core.NetFramework + v1.0.116

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/lib/MigrationBackup/4bd13565/Application/Standalone/Standalone.csproj b/lib/MigrationBackup/4bd13565/Application/Standalone/Standalone.csproj new file mode 100644 index 0000000..620aafb --- /dev/null +++ b/lib/MigrationBackup/4bd13565/Application/Standalone/Standalone.csproj @@ -0,0 +1,194 @@ + + + + + + Debug + AnyCPU + {5AAD85B2-212D-421C-9C9B-8B2675550E1E} + WinExe + Properties + Standalone + Standalone + v4.8 + 512 + ..\ + + + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\packages\Castle.Core.5.0.0\lib\net462\Castle.Core.dll + + + ..\..\packages\Castle.Windsor.5.1.1\lib\net45\Castle.Windsor.dll + + + ..\..\packages\FCTB.2.16.24\lib\FastColoredTextBox.dll + + + ..\..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll + + + ..\..\packages\PropertyChanged.Fody.3.4.1\lib\net40\PropertyChanged.dll + + + + + + ..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net45\System.Data.SQLite.dll + + + + + + + + + + + + + + + Form + + + AboutDialog.cs + + + Form + + + Main.cs + + + + + UserControl + + + RetrieveFieldsView.cs + + + + + + + + + + + + + + + AboutDialog.cs + + + Main.cs + + + RetrieveFieldsView.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + PreserveNewest + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} + dbqf.core.tests + + + {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} + dbqf.WinForms + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {a9091adb-fc19-4982-bce4-6a0425f974d6} + Standalone.Core + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/4bd13565/Application/Standalone/packages.config b/lib/MigrationBackup/4bd13565/Application/Standalone/packages.config new file mode 100644 index 0000000..b567546 --- /dev/null +++ b/lib/MigrationBackup/4bd13565/Application/Standalone/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/NuGetUpgradeLog.html b/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/NuGetUpgradeLog.html new file mode 100644 index 0000000..aeffc8c --- /dev/null +++ b/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/NuGetUpgradeLog.html @@ -0,0 +1,164 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - Frontends\dbqf.WPF

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + D:\GitHub\dbqf\lib\MigrationBackup\d81c1cbe\Frontends\dbqf.WPF
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
Expression.Blend.Sdk + v1.0.2
Fody + v6.6.3
PropertyChanged.Fody + v3.4.1

Transitive dependencies:

Package IdVersion
+ No transitive dependencies found. +

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/dbqf.WPF.csproj b/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/dbqf.WPF.csproj new file mode 100644 index 0000000..17c680a --- /dev/null +++ b/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/dbqf.WPF.csproj @@ -0,0 +1,154 @@ + + + + + + Debug + AnyCPU + {A4415051-8BE4-4D13-9A30-A9495A4701EE} + Library + Properties + dbqf.WPF + dbqf.WPF + v4.8 + 512 + + ..\ + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + + + + ..\..\packages\PropertyChanged.Fody.3.4.1\lib\net40\PropertyChanged.dll + + + + + + False + ..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net40-client\System.Windows.Interactivity.dll + + + + + + + + + + + + + AdvancedView.xaml + + + + + + FieldPathCombo.xaml + + + PresetView.xaml + + + + + True + True + Resources.resx + + + + StandardView.xaml + + + + + + + + BetweenControl.xaml + + + + + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/packages.config b/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/packages.config new file mode 100644 index 0000000..1a51758 --- /dev/null +++ b/lib/MigrationBackup/d81c1cbe/Frontends/dbqf.WPF/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/dfc20534/Application/Standalone.Core/NuGetUpgradeLog.html b/lib/MigrationBackup/dfc20534/Application/Standalone.Core/NuGetUpgradeLog.html new file mode 100644 index 0000000..e6c36b1 --- /dev/null +++ b/lib/MigrationBackup/dfc20534/Application/Standalone.Core/NuGetUpgradeLog.html @@ -0,0 +1,165 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - Application\Standalone.Core

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + D:\GitHub\dbqf\lib\MigrationBackup\dfc20534\Application\Standalone.Core
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
Castle.Core + v5.0.0
Castle.Windsor + v5.1.1
Fody + v6.6.3
PropertyChanged.Fody + v3.4.1
System.Data.SQLite.Core + v1.0.116

Transitive dependencies:

Package IdVersion
Stub.System.Data.SQLite.Core.NetFramework + v1.0.116

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/lib/MigrationBackup/dfc20534/Application/Standalone.Core/Standalone.Core.csproj b/lib/MigrationBackup/dfc20534/Application/Standalone.Core/Standalone.Core.csproj new file mode 100644 index 0000000..359a02f --- /dev/null +++ b/lib/MigrationBackup/dfc20534/Application/Standalone.Core/Standalone.Core.csproj @@ -0,0 +1,156 @@ + + + + + + Debug + AnyCPU + {A9091ADB-FC19-4982-BCE4-6A0425F974D6} + Library + Properties + Standalone.Core + Standalone.Core + v4.8 + 512 + ..\ + + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + + ..\..\packages\Castle.Core.5.0.0\lib\net462\Castle.Core.dll + + + ..\..\packages\Castle.Windsor.5.1.1\lib\net45\Castle.Windsor.dll + + + ..\..\packages\PropertyChanged.Fody.3.4.1\lib\net40\PropertyChanged.dll + + + + + + ..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net45\System.Data.SQLite.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {5336bddd-c373-494b-94e7-aeaabc8cd88d} + dbqf.MsAccess + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/dfc20534/Application/Standalone.Core/packages.config b/lib/MigrationBackup/dfc20534/Application/Standalone.Core/packages.config new file mode 100644 index 0000000..33c6773 --- /dev/null +++ b/lib/MigrationBackup/dfc20534/Application/Standalone.Core/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/NuGetUpgradeLog.html b/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/NuGetUpgradeLog.html new file mode 100644 index 0000000..30492eb --- /dev/null +++ b/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/NuGetUpgradeLog.html @@ -0,0 +1,167 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - Application\Standalone.WPF

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + D:\GitHub\dbqf\lib\MigrationBackup\f1ebad9e\Application\Standalone.WPF
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
Castle.Core + v5.0.0
Castle.Windsor + v5.1.1
Expression.Blend.Sdk + v1.0.2
Fody + v6.6.3
PropertyChanged.Fody + v3.4.1
System.Data.SQLite.Core + v1.0.116
WpfAnimatedGif + v2.0.2

Transitive dependencies:

Package IdVersion
Stub.System.Data.SQLite.Core.NetFramework + v1.0.116

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/Standalone.WPF.csproj b/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/Standalone.WPF.csproj new file mode 100644 index 0000000..ecab2be --- /dev/null +++ b/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/Standalone.WPF.csproj @@ -0,0 +1,210 @@ + + + + + + Debug + AnyCPU + {AF36D489-5EAC-4555-84A2-5FD03D700AD2} + WinExe + Properties + Standalone.WPF + Standalone.WPF + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + ..\ + + + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + + + + + ..\..\packages\Castle.Core.5.0.0\lib\net462\Castle.Core.dll + + + ..\..\packages\Castle.Windsor.5.1.1\lib\net45\Castle.Windsor.dll + + + + ..\..\packages\PropertyChanged.Fody.3.4.1\lib\net40\PropertyChanged.dll + + + + + + + ..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net45\System.Data.SQLite.dll + + + + + + + + ..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll + + + + + + + + 4.0 + + + + + + + + ..\..\packages\WpfAnimatedGif.2.0.2\lib\net40\WpfAnimatedGif.dll + + + + + MSBuild:Compile + Designer + + + LoadingControl.xaml + + + + RetrieveFieldsView.xaml + + + + + + + + + + + + + + + + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + PreserveNewest + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {a4415051-8be4-4d13-9a30-a9495a4701ee} + dbqf.WPF + + + {a9091adb-fc19-4982-bce4-6a0425f974d6} + Standalone.Core + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + \ No newline at end of file diff --git a/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/packages.config b/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/packages.config new file mode 100644 index 0000000..61c606a --- /dev/null +++ b/lib/MigrationBackup/f1ebad9e/Application/Standalone.WPF/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lib/Samples/1-Getting-Started/1-Getting-Started.csproj b/lib/Samples/1-Getting-Started/1-Getting-Started.csproj index ac890b3..c644898 100644 --- a/lib/Samples/1-Getting-Started/1-Getting-Started.csproj +++ b/lib/Samples/1-Getting-Started/1-Getting-Started.csproj @@ -1,92 +1,31 @@ - - - - - Debug - AnyCPU - {826095E0-D952-4E50-B1AD-E63DCC45122B} - WinExe - Properties - _1_Getting_Started - 1-Getting-Started - v2.0 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} - dbqf.WinForms - - - - + + + + WinExe + net6.0-windows + Debug + AnyCPU + {826095E0-D952-4E50-B1AD-E63DCC45122B} + WinExe + Properties + _1_Getting_Started + 1-Getting-Started + 512 + + + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} + dbqf.WinForms + + + \ No newline at end of file diff --git a/lib/Samples/1-Getting-Started/Properties/AssemblyInfo.cs b/lib/Samples/1-Getting-Started/Properties/AssemblyInfo.cs deleted file mode 100644 index 3cfec21..0000000 --- a/lib/Samples/1-Getting-Started/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("1-Getting-Started")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("1-Getting-Started")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cb56bd28-2ae2-48f0-8a4d-031ab33542a1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/Samples/2-Query-SQL/2-Query-SQL.csproj b/lib/Samples/2-Query-SQL/2-Query-SQL.csproj index 6a60285..08a97ac 100644 --- a/lib/Samples/2-Query-SQL/2-Query-SQL.csproj +++ b/lib/Samples/2-Query-SQL/2-Query-SQL.csproj @@ -1,97 +1,39 @@ - - - - - Debug - AnyCPU - {30418998-E47B-4211-B2B9-DF304CD51C88} - WinExe - Properties - _2_Query_SQL - 2-Query-SQL - v2.0 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} - dbqf.WinForms - - - {344a56f4-3878-4af5-93e0-28b498f6e346} - Samples.Common - - - - + + + + WinExe + net6.0-windows + Debug + AnyCPU + {30418998-E47B-4211-B2B9-DF304CD51C88} + WinExe + Properties + _2_Query_SQL + 2-Query-SQL + 512 + + + + + + + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} + dbqf.WinForms + + + {344a56f4-3878-4af5-93e0-28b498f6e346} + Samples.Common + + + \ No newline at end of file diff --git a/lib/Samples/2-Query-SQL/Form1.cs b/lib/Samples/2-Query-SQL/Form1.cs index a2f0de4..ca364a6 100644 --- a/lib/Samples/2-Query-SQL/Form1.cs +++ b/lib/Samples/2-Query-SQL/Form1.cs @@ -1,4 +1,5 @@ -using Samples.Common; +using Microsoft.Data.SqlClient; +using Samples.Common; using System; using System.Text; using System.Windows.Forms; @@ -18,7 +19,7 @@ private void btnSimple_Click(object sender, System.EventArgs e) var config = new TestConfiguration(); // We need a command to populate CommandText. This can be any type implementing IDbCommand. - var cmd = new System.Data.SqlClient.SqlCommand(); + var cmd = new SqlCommand(); // Using the builtin SqlGenerator we can construct our SQL. new dbqf.Sql.SqlGenerator(config) @@ -40,7 +41,7 @@ private void btnSimple_Click(object sender, System.EventArgs e) private void btnJoin_Click(object sender, System.EventArgs e) { var config = new TestConfiguration(); - var cmd = new System.Data.SqlClient.SqlCommand(); + var cmd = new SqlCommand(); new dbqf.Sql.SqlGenerator(config) .Column(dbqf.Criterion.FieldPath.FromDefault(config["Bar"]["Name"])) @@ -57,7 +58,7 @@ private void btnJoin_Click(object sender, System.EventArgs e) private void btnParameterized_Click(object sender, System.EventArgs e) { var config = new TestConfiguration(); - var cmd = new System.Data.SqlClient.SqlCommand(); + var cmd = new SqlCommand(); new dbqf.Sql.SqlGenerator(config) .Column(dbqf.Criterion.FieldPath.FromDefault(config["Bar"]["Name"])) .Column(dbqf.Criterion.FieldPath.FromDefault(config["Bar"]["FooId"])) @@ -79,10 +80,10 @@ private void btnParameterized_Click(object sender, System.EventArgs e) } - private void UpdateSql(string prefix, System.Data.SqlClient.SqlCommand cmd) + private void UpdateSql(string prefix, SqlCommand cmd) { var sql = cmd.CommandText; - foreach (System.Data.SqlClient.SqlParameter p in cmd.Parameters) + foreach (SqlParameter p in cmd.Parameters) sql = sql.Replace(p.ParameterName, p.Value.ToString()); txtSql.Text = prefix + Environment.NewLine + sql; } diff --git a/lib/Samples/2-Query-SQL/Properties/AssemblyInfo.cs b/lib/Samples/2-Query-SQL/Properties/AssemblyInfo.cs deleted file mode 100644 index e9f5f71..0000000 --- a/lib/Samples/2-Query-SQL/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("2-Query-SQL")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("2-Query-SQL")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("2a877236-0fd0-4296-ae21-c3f4816dc0fc")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/Samples/3-Get-Results/3-Get-Results.csproj b/lib/Samples/3-Get-Results/3-Get-Results.csproj index 9ca51de..3a8ea82 100644 --- a/lib/Samples/3-Get-Results/3-Get-Results.csproj +++ b/lib/Samples/3-Get-Results/3-Get-Results.csproj @@ -1,99 +1,40 @@ - - - - - Debug - AnyCPU - {D2A8FF18-1D6A-40A0-84D3-6DCEF94F8676} - WinExe - Properties - _3_Get_Results - 3-Get-Results - v2.0 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} - dbqf.WinForms - - - {344a56f4-3878-4af5-93e0-28b498f6e346} - Samples.Common - - - - + + + + WinExe + net6.0-windows + Debug + AnyCPU + {D2A8FF18-1D6A-40A0-84D3-6DCEF94F8676} + WinExe + Properties + _3_Get_Results + 3-Get-Results + v2.0 + 512 + + + + + + + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {b4727dd4-cef3-4740-8b90-ce6e2b1c8d26} + dbqf.WinForms + + + {344a56f4-3878-4af5-93e0-28b498f6e346} + Samples.Common + + + \ No newline at end of file diff --git a/lib/Samples/3-Get-Results/Form1.cs b/lib/Samples/3-Get-Results/Form1.cs index 3d78502..482f206 100644 --- a/lib/Samples/3-Get-Results/Form1.cs +++ b/lib/Samples/3-Get-Results/Form1.cs @@ -8,12 +8,8 @@ using dbqf.WinForms; using dbqf.WinForms.UIElements; using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Data.SqlClient; -using System.Drawing; -using System.Text; +using Microsoft.Data.SqlClient; using System.Windows.Forms; namespace _3_Get_Results diff --git a/lib/Samples/3-Get-Results/Properties/AssemblyInfo.cs b/lib/Samples/3-Get-Results/Properties/AssemblyInfo.cs deleted file mode 100644 index 95e04c7..0000000 --- a/lib/Samples/3-Get-Results/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("3-Get-Results")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("3-Get-Results")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d2a8ff18-1d6a-40a0-84d3-6dcef94f8676")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/Samples/Samples.Common/Properties/AssemblyInfo.cs b/lib/Samples/Samples.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 766d2aa..0000000 --- a/lib/Samples/Samples.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Samples.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Samples.Common")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("344a56f4-3878-4af5-93e0-28b498f6e346")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/Samples/Samples.Common/Samples.Common.csproj b/lib/Samples/Samples.Common/Samples.Common.csproj index f337f0b..505994d 100644 --- a/lib/Samples/Samples.Common/Samples.Common.csproj +++ b/lib/Samples/Samples.Common/Samples.Common.csproj @@ -1,60 +1,28 @@ - - - - - Debug - AnyCPU - {344A56F4-3878-4AF5-93E0-28B498F6E346} - Library - Properties - Samples.Common - Samples.Common - v2.0 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - - + + + + netstandard2.0 + Debug + AnyCPU + {344A56F4-3878-4AF5-93E0-28B498F6E346} + Library + Properties + Samples.Common + Samples.Common + v2.0 + 512 + + + + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + \ No newline at end of file diff --git a/lib/Sandbox/App.config b/lib/Sandbox/App.config index 74ba56c..988c41c 100644 --- a/lib/Sandbox/App.config +++ b/lib/Sandbox/App.config @@ -1,14 +1,18 @@  - + - + + + + + - \ No newline at end of file + diff --git a/lib/Sandbox/Properties/AssemblyInfo.cs b/lib/Sandbox/Properties/AssemblyInfo.cs deleted file mode 100644 index 7161326..0000000 --- a/lib/Sandbox/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sandbox")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sandbox")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("356c4ebc-42b1-4358-9c9d-461e4b5745b5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/Sandbox/Sandbox.csproj b/lib/Sandbox/Sandbox.csproj index ec69cbd..0da9744 100644 --- a/lib/Sandbox/Sandbox.csproj +++ b/lib/Sandbox/Sandbox.csproj @@ -1,102 +1,45 @@ - - - - - Debug - AnyCPU - {5EB67725-5496-492F-8C0C-09760F6198C6} - Exe - Properties - Sandbox - Sandbox - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {f46b0af8-b45b-4897-995f-bba8a290999a} - dbqf.Serialization - - - {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} - dbqf.core.tests - - - {a9091adb-fc19-4982-bce4-6a0425f974d6} - Standalone.Core - - - {5aad85b2-212d-421c-9c9b-8b2675550e1e} - Standalone - - - - - + + + Debug + AnyCPU + {5EB67725-5496-492F-8C0C-09760F6198C6} + Properties + Sandbox + Sandbox + Exe + net6.0-windows + 512 + Copyright © Stuart Attenborrow 2014 + Stuart Attenborrow + 1.0.0 + + + + + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + {bc5aaa8e-d0f7-48de-9f71-3a7c21bdd6d1} + dbqf.core.tests + + + {a9091adb-fc19-4982-bce4-6a0425f974d6} + Standalone.Core + + + {5aad85b2-212d-421c-9c9b-8b2675550e1e} + Standalone + + \ No newline at end of file diff --git a/lib/dbqf.Serialization.tests/Properties/AssemblyInfo.cs b/lib/dbqf.Serialization.tests/Properties/AssemblyInfo.cs deleted file mode 100644 index e0f2ee4..0000000 --- a/lib/dbqf.Serialization.tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.Serialization.tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("dbqf.Serialization.tests")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("637f5973-08fd-4932-ac29-7d6dd012c5e3")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/dbqf.Serialization.tests/dbqf.Serialization.tests.csproj b/lib/dbqf.Serialization.tests/dbqf.Serialization.tests.csproj index 31b90b8..dcde27b 100644 --- a/lib/dbqf.Serialization.tests/dbqf.Serialization.tests.csproj +++ b/lib/dbqf.Serialization.tests/dbqf.Serialization.tests.csproj @@ -1,74 +1,38 @@ - - - - - Debug - AnyCPU - {281B5D3F-E4B0-480C-A0CD-4CB3F34B8240} - Library - Properties - dbqf.Serialization.tests - dbqf.Serialization.tests - v2.0 - 512 - ..\ - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll - True - - - - - - - - - - - - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {f46b0af8-b45b-4897-995f-bba8a290999a} - dbqf.Serialization - - - - - - - - - + + + Debug + AnyCPU + {281B5D3F-E4B0-480C-A0CD-4CB3F34B8240} + Library + Properties + dbqf.Serialization.tests + dbqf.Serialization.tests + netstandard2.0 + 512 + ..\ + + + + Copyright © Stuart Attenborrow 2015 + Stuart Attenborrow + + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {f46b0af8-b45b-4897-995f-bba8a290999a} + dbqf.Serialization + + + + + 3.13.3 + + + \ No newline at end of file diff --git a/lib/dbqf.Serialization.tests/packages.config b/lib/dbqf.Serialization.tests/packages.config deleted file mode 100644 index c29756e..0000000 --- a/lib/dbqf.Serialization.tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/lib/dbqf.Serialization/Properties/AssemblyInfo.cs b/lib/dbqf.Serialization/Properties/AssemblyInfo.cs deleted file mode 100644 index 27dacbe..0000000 --- a/lib/dbqf.Serialization/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.Serialization")] -[assembly: AssemblyDescription("dbqf.Serialization contains DTO's and assemblers for dbqf.core and dbqf.Sql libraries.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("dbqf.Serialization")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("01728b15-6979-47e4-b0b1-3c7d293eadcd")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/dbqf.Serialization/dbqf.Serialization.csproj b/lib/dbqf.Serialization/dbqf.Serialization.csproj index 7b03415..291214d 100644 --- a/lib/dbqf.Serialization/dbqf.Serialization.csproj +++ b/lib/dbqf.Serialization/dbqf.Serialization.csproj @@ -1,112 +1,27 @@ - - - - - Debug - AnyCPU - {F46B0AF8-B45B-4897-995F-BBA8A290999A} - Library - Properties - dbqf.Serialization - dbqf.Serialization - v2.0 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - - - + + + Debug + AnyCPU + {F46B0AF8-B45B-4897-995F-BBA8A290999A} + Library + Properties + dbqf.Serialization + dbqf.Serialization + netstandard2.0 + 512 + dbqf.Serialization contains DTO's and assemblers for dbqf.core and dbqf.Sql libraries. + Copyright © Stuart Attenborrow 2016 + Stuart Attenborrow + 2.0.0 + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + \ No newline at end of file diff --git a/lib/dbqf.core/Properties/AssemblyInfo.cs b/lib/dbqf.core/Properties/AssemblyInfo.cs deleted file mode 100644 index fb69439..0000000 --- a/lib/dbqf.core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.core")] -[assembly: AssemblyDescription("Core library for dbqf that contains the base definitions of types required for complete frontend and backend database search capability.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stuart Attenborrow")] -[assembly: AssemblyProduct("Database Query Framework")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0b84ec09-ae1d-4f57-a91b-43f628e64e45")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/lib/dbqf.core/dbqf.core.csproj b/lib/dbqf.core/dbqf.core.csproj index 50c9175..d8ce7be 100644 --- a/lib/dbqf.core/dbqf.core.csproj +++ b/lib/dbqf.core/dbqf.core.csproj @@ -1,130 +1,16 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {AB9BDEC4-8264-49A2-B2B6-EF6276341535} - Library - Properties - dbqf - dbqf.core - v2.0 - 512 - ..\ - - - true - full - false - ..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\bin\Release\ - TRACE - prompt - 4 - true - - - - - false - - - ..\DbQueryFramework.Key.pfx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DbQueryFramework.Key.pfx - - - - + + + Library + Properties + dbqf + dbqf.core + netstandard2.0 + 512 + Copyright © Stuart Attenborrow 2014 + 1.0.0 + Stuart Attenborrow + + + + \ No newline at end of file diff --git a/lib/dbqf.tests/Chinook.sqlite b/lib/dbqf.tests/Chinook.sqlite deleted file mode 100644 index aa10b63..0000000 Binary files a/lib/dbqf.tests/Chinook.sqlite and /dev/null differ diff --git a/lib/dbqf.tests/Processing/Generator_Fixture.cs b/lib/dbqf.tests/Processing/Generator_Fixture.cs index 7c9e4cb..6ffac30 100644 --- a/lib/dbqf.tests/Processing/Generator_Fixture.cs +++ b/lib/dbqf.tests/Processing/Generator_Fixture.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/lib/dbqf.tests/Processing/Sqlite_Fixture.cs b/lib/dbqf.tests/Processing/Sqlite_Fixture.cs index ef2a275..0fdc5b9 100644 --- a/lib/dbqf.tests/Processing/Sqlite_Fixture.cs +++ b/lib/dbqf.tests/Processing/Sqlite_Fixture.cs @@ -16,7 +16,7 @@ public class Sqlite_Fixture { private Chinook _db; - [TestFixtureSetUp] + [SetUp] public void Setup() { _db = new Chinook(); diff --git a/lib/dbqf.tests/Properties/AssemblyInfo.cs b/lib/dbqf.tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 0ea5c00..0000000 --- a/lib/dbqf.tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("dbqf.core.tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("dbqf.core.tests")] -[assembly: AssemblyCopyright("Copyright © Stuart Attenborrow 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("78baad40-2c0b-4a55-ae20-1db4a1c9d5d5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/lib/dbqf.tests/Properties/Settings.settings b/lib/dbqf.tests/Properties/Settings.settings index f14b2a8..c239621 100644 --- a/lib/dbqf.tests/Properties/Settings.settings +++ b/lib/dbqf.tests/Properties/Settings.settings @@ -4,10 +4,10 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Server=(local)\SQLEXPRESS;Database=AdventureWorks;Trusted_Connection=True;</ConnectionString> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Server=(local);Database=AdventureWorks2008R2;Trusted_Connection=True;</ConnectionString> </SerializableConnectionString> - Server=(local)\SQLEXPRESS;Database=AdventureWorks;Trusted_Connection=True; + Server=(local);Database=AdventureWorks2008R2;Trusted_Connection=True; \ No newline at end of file diff --git a/lib/dbqf.tests/SqlProvider/SqlCommandComparer.cs b/lib/dbqf.tests/SqlProvider/SqlCommandComparer.cs index 84a9bc3..3bc0d8f 100644 --- a/lib/dbqf.tests/SqlProvider/SqlCommandComparer.cs +++ b/lib/dbqf.tests/SqlProvider/SqlCommandComparer.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using NUnit.Framework; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data; namespace dbqf.core.tests.SqlProvider diff --git a/lib/dbqf.tests/app.config b/lib/dbqf.tests/app.config index 5698fd9..4be4a19 100644 --- a/lib/dbqf.tests/app.config +++ b/lib/dbqf.tests/app.config @@ -1,19 +1,13 @@  +
- + - - - - - - - - @@ -21,4 +15,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/lib/dbqf.tests/dbqf.core.tests.csproj b/lib/dbqf.tests/dbqf.core.tests.csproj index d01144b..a5a3e92 100644 --- a/lib/dbqf.tests/dbqf.core.tests.csproj +++ b/lib/dbqf.tests/dbqf.core.tests.csproj @@ -1,117 +1,52 @@ - - - - - Debug - AnyCPU - {BC5AAA8E-D0F7-48DE-9F71-3A7C21BDD6D1} - Library - Properties - dbqf.core.tests - dbqf.core.tests - v4.5 - 512 - ..\ - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - - - - False - ..\packages\System.Data.SQLite.Core.1.0.93.0\lib\net45\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.93.0\lib\net45\System.Data.SQLite.EF6.dll - - - False - ..\packages\System.Data.SQLite.Linq.1.0.93.0\lib\net45\System.Data.SQLite.Linq.dll - - - - - - - - - - - - - - - - - - - - - - - - True - True - Settings.settings - - - - - - - - - - {ab9bdec4-8264-49a2-b2b6-ef6276341535} - dbqf.core - - - {8677a10f-415f-4f5f-abc5-726ede1cb372} - dbqf.Sql - - - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - + + + Debug + AnyCPU + {BC5AAA8E-D0F7-48DE-9F71-3A7C21BDD6D1} + Library + Properties + dbqf.core.tests + dbqf.core.tests + netstandard2.0 + 512 + ..\ + + + Copyright © Stuart Attenborrow 2015 + 1.0.0 + Stuart Attenborrow + + + + + + + {ab9bdec4-8264-49a2-b2b6-ef6276341535} + dbqf.core + + + {8677a10f-415f-4f5f-abc5-726ede1cb372} + dbqf.Sql + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + 1.4.0 + + + + 3.13.3 + + + + 1.0.116 + + + \ No newline at end of file diff --git a/lib/dbqf.tests/packages.config b/lib/dbqf.tests/packages.config deleted file mode 100644 index 7a4377d..0000000 --- a/lib/dbqf.tests/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file