diff --git a/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj b/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj index 02c00dc9a..729c91dbf 100644 --- a/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj +++ b/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj @@ -2,8 +2,7 @@ Library - net481;net48;net472;net462 - true + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 True diff --git a/Avalonia_Apps/Libraries/BaseLib/BaseLib_net.csproj b/Avalonia_Apps/Libraries/BaseLib/BaseLib_net.csproj deleted file mode 100644 index fd3d8a0b9..000000000 --- a/Avalonia_Apps/Libraries/BaseLib/BaseLib_net.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - Library - net6.0;net7.0;net8.0;net9.0;net481-windows;net48-windows;net472-windows;net462-windows - True - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Avalonia_Apps/Libraries/BaseLib/Helper/IoC.cs b/Avalonia_Apps/Libraries/BaseLib/Helper/IoC.cs index bdb9d9a53..b56f2f0ac 100644 --- a/Avalonia_Apps/Libraries/BaseLib/Helper/IoC.cs +++ b/Avalonia_Apps/Libraries/BaseLib/Helper/IoC.cs @@ -19,11 +19,6 @@ /// namespace BaseLib.Helper; -/// -/// Class IoC. -/// Implements the -/// -/// public class IoC { /// diff --git a/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj b/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj index 266b856f2..44acfc58b 100644 --- a/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj +++ b/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj @@ -1,8 +1,8 @@  - net481;net48;net472;net462 - false + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 + false diff --git a/Avalonia_Apps/Libraries/BaseLibTests/BaseLib_netTests.csproj b/Avalonia_Apps/Libraries/BaseLibTests/BaseLib_netTests.csproj index 6560dd564..b883aa3bf 100644 --- a/Avalonia_Apps/Libraries/BaseLibTests/BaseLib_netTests.csproj +++ b/Avalonia_Apps/Libraries/BaseLibTests/BaseLib_netTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0;net9.0;net481-windows;net48-windows;net472-windows;net462-windows + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 false @@ -19,7 +19,7 @@ - + diff --git a/CSharpBible/AboutEx/AboutEx.csproj b/CSharpBible/AboutEx/AboutEx.csproj index d9ac06c4a..9f3e34fb5 100644 --- a/CSharpBible/AboutEx/AboutEx.csproj +++ b/CSharpBible/AboutEx/AboutEx.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net4.8.1-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows WinExe false true diff --git a/CSharpBible/AboutExTests/AboutExTests.csproj b/CSharpBible/AboutExTests/AboutExTests.csproj index c82e46be9..09857dcab 100644 --- a/CSharpBible/AboutExTests/AboutExTests.csproj +++ b/CSharpBible/AboutExTests/AboutExTests.csproj @@ -1,22 +1,26 @@ - + Library CSharpBible.AboutExTests AboutExTests - net9.0 + net4.8.1-windows;net9.0-windows False UnitTest + true - + all runtime; build; native; contentfiles; analyzers; buildtransitive + + + \ No newline at end of file diff --git a/CSharpBible/AboutExTests/Visual/FrmAboutTests.cs b/CSharpBible/AboutExTests/Visual/FrmAboutTests.cs index 437893f81..b6899c1ed 100644 --- a/CSharpBible/AboutExTests/Visual/FrmAboutTests.cs +++ b/CSharpBible/AboutExTests/Visual/FrmAboutTests.cs @@ -13,6 +13,7 @@ // *********************************************************************** using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Threading; +using System.Windows.Forms; namespace CSharpBible.AboutEx.Visual.Tests { diff --git a/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj b/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj index e187a90d1..df100d5cb 100644 --- a/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj +++ b/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj @@ -2,7 +2,7 @@ Exe - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 @@ -15,6 +15,9 @@ + + + True @@ -22,9 +25,9 @@ Resources.resx - True - True - Settings.settings + True + True + Settings.settings @@ -34,9 +37,9 @@ - - PublicSettingsSingleFileGenerator - Settings.Designer.cs - + + PublicSettingsSingleFileGenerator + Settings.Designer.cs + diff --git a/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template_net.csproj b/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template_net.csproj index 13ca7e068..9435b9e05 100644 --- a/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template_net.csproj +++ b/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template_net.csproj @@ -15,8 +15,7 @@ - - + diff --git a/CSharpBible/Basics/Basic_Del00_Template/Properties/Settings.Designer.cs b/CSharpBible/Basics/Basic_Del00_Template/Properties/Settings.Designer.cs index bfc22b606..54f26f891 100644 --- a/CSharpBible/Basics/Basic_Del00_Template/Properties/Settings.Designer.cs +++ b/CSharpBible/Basics/Basic_Del00_Template/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Basic_Del00_Template.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/CSharpBible/Basics/Basic_Del00_Template/Views/MainView.cs b/CSharpBible/Basics/Basic_Del00_Template/Views/MainView.cs index 646f59aa5..84a5e720a 100644 --- a/CSharpBible/Basics/Basic_Del00_Template/Views/MainView.cs +++ b/CSharpBible/Basics/Basic_Del00_Template/Views/MainView.cs @@ -2,6 +2,7 @@ using System.Windows.Input; using ConsoleDisplay.View; using Basic_Del00_Template.ViewModels; +using BaseLib.Interfaces; namespace Basic_Del00_Template.Views { diff --git a/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj b/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj index 9fc404595..a22598bbe 100644 --- a/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj +++ b/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj @@ -1,7 +1,7 @@  - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 true false @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_Template_netTests.csproj b/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_Template_netTests.csproj index 88ad2a187..f846a7569 100644 --- a/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_Template_netTests.csproj +++ b/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_Template_netTests.csproj @@ -15,14 +15,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/CSharpBible/Basics/Basic_Del00_TemplateTests/Views/TestConsole.cs b/CSharpBible/Basics/Basic_Del00_TemplateTests/Views/TestConsole.cs index 4d0b477b1..ec66f1733 100644 --- a/CSharpBible/Basics/Basic_Del00_TemplateTests/Views/TestConsole.cs +++ b/CSharpBible/Basics/Basic_Del00_TemplateTests/Views/TestConsole.cs @@ -11,7 +11,8 @@ // // // *********************************************************************** -using ConsoleDisplay.View; +using BaseLib.Helper; +using BaseLib.Interfaces; using System; namespace Basic_Del00_Template.Views.Tests diff --git a/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj b/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj index 749b37d37..57150576d 100644 --- a/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj +++ b/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj @@ -2,7 +2,7 @@ Exe - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 @@ -18,7 +18,10 @@ - + + + + True True diff --git a/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action_net.csproj b/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action_net.csproj index 7313701ed..dad9fd101 100644 --- a/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action_net.csproj +++ b/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action_net.csproj @@ -15,9 +15,9 @@ - - - + + + True diff --git a/CSharpBible/Basics/Basic_Del01_Action/Views/MainView.cs b/CSharpBible/Basics/Basic_Del01_Action/Views/MainView.cs index 263d469bf..0dd03ce93 100644 --- a/CSharpBible/Basics/Basic_Del01_Action/Views/MainView.cs +++ b/CSharpBible/Basics/Basic_Del01_Action/Views/MainView.cs @@ -2,6 +2,7 @@ using System.Windows.Input; using ConsoleDisplay.View; using Basic_Del01_Action.ViewModels; +using BaseLib.Interfaces; namespace Basic_Del01_Action.Views { diff --git a/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj b/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj index 5e238deeb..9ba9ef883 100644 --- a/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj +++ b/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj @@ -1,7 +1,7 @@  - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 true false @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_Action_netTests.csproj b/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_Action_netTests.csproj index 6805e6794..720e9186e 100644 --- a/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_Action_netTests.csproj +++ b/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_Action_netTests.csproj @@ -15,14 +15,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/CSharpBible/Basics/Basic_Del01_ActionTests/Views/TestConsole.cs b/CSharpBible/Basics/Basic_Del01_ActionTests/Views/TestConsole.cs index fecba6a3c..d7d037ca7 100644 --- a/CSharpBible/Basics/Basic_Del01_ActionTests/Views/TestConsole.cs +++ b/CSharpBible/Basics/Basic_Del01_ActionTests/Views/TestConsole.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using ConsoleDisplay.View; +using BaseLib.Interfaces; using System; namespace Basic_Del01_Action.Views.Tests diff --git a/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj b/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj index 749b37d37..57150576d 100644 --- a/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj +++ b/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj @@ -2,7 +2,7 @@ Exe - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 @@ -18,7 +18,10 @@ - + + + + True True diff --git a/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter_net.csproj b/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter_net.csproj index 7313701ed..83155ee7f 100644 --- a/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter_net.csproj +++ b/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter_net.csproj @@ -14,11 +14,11 @@ - - - - - + + + + + True True diff --git a/CSharpBible/Basics/Basic_Del02_Filter/Views/MainView.cs b/CSharpBible/Basics/Basic_Del02_Filter/Views/MainView.cs index 4757139b9..e2e583a69 100644 --- a/CSharpBible/Basics/Basic_Del02_Filter/Views/MainView.cs +++ b/CSharpBible/Basics/Basic_Del02_Filter/Views/MainView.cs @@ -2,38 +2,38 @@ using System.Windows.Input; using ConsoleDisplay.View; using Basic_Del02_Filter.ViewModels; +using BaseLib.Interfaces; -namespace Basic_Del02_Filter.Views +namespace Basic_Del02_Filter.Views; + +public class MainView : ICommand { - public class MainView : ICommand - { - public MainViewModel DataContext { get; set; } = new(); - public IConsole console { get; set; } = new MyConsole(); + public MainViewModel DataContext { get; set; } = new(); + public IConsole console { get; set; } = new MyConsole(); - public event EventHandler? CanExecuteChanged; + public event EventHandler? CanExecuteChanged; - public bool CanExecute(object? parameter) - { - return true; - } + public bool CanExecute(object? parameter) + { + return true; + } - bool IsGreaterThan5(int parameter) => parameter > 5; - bool IsEven(int parameter)=> parameter % 2 == 0; + bool IsGreaterThan5(int parameter) => parameter > 5; + bool IsEven(int parameter)=> parameter % 2 == 0; - Predicate IsGreaterThan(int parameter2) => (i)=>i > parameter2; + Predicate IsGreaterThan(int parameter2) => (i)=>i > parameter2; - public void Execute(object? parameter) - { - console.WriteLine(DataContext.Greeting); - console.WriteLine($"Original: {String.Join(", ", DataContext.GetList)}"); - // using the function IsGreaterThan5 as delegate - console.WriteLine($"Filtered(IsGreaterThan5): {String.Join(", ", DataContext.GetFilteredData(IsGreaterThan5))}"); - // using the function IsEven as delegate - console.WriteLine($"Filtered(IsEven): {String.Join(", ", DataContext.GetFilteredData(IsEven))}"); - // using the function IsGreaterThan with 1 as delegate - console.WriteLine($"Filtered(IsGreaterThan(1)): {String.Join(", ", DataContext.GetFilteredData(IsGreaterThan(1)))}"); - // using an anonymous function as delegate - console.WriteLine($"Filtered(anon odd): {String.Join(", ", DataContext.GetFilteredData((i)=>i%2!=0))}"); - } + public void Execute(object? parameter) + { + console.WriteLine(DataContext.Greeting); + console.WriteLine($"Original: {String.Join(", ", DataContext.GetList)}"); + // using the function IsGreaterThan5 as delegate + console.WriteLine($"Filtered(IsGreaterThan5): {String.Join(", ", DataContext.GetFilteredData(IsGreaterThan5))}"); + // using the function IsEven as delegate + console.WriteLine($"Filtered(IsEven): {String.Join(", ", DataContext.GetFilteredData(IsEven))}"); + // using the function IsGreaterThan with 1 as delegate + console.WriteLine($"Filtered(IsGreaterThan(1)): {String.Join(", ", DataContext.GetFilteredData(IsGreaterThan(1)))}"); + // using an anonymous function as delegate + console.WriteLine($"Filtered(anon odd): {String.Join(", ", DataContext.GetFilteredData((i)=>i%2!=0))}"); } } diff --git a/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj b/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj index a652b1f02..167afbe71 100644 --- a/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj +++ b/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj @@ -1,7 +1,7 @@  - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 true false @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_Filter_netTests.csproj b/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_Filter_netTests.csproj index b1132a6ee..a1b34c99d 100644 --- a/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_Filter_netTests.csproj +++ b/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_Filter_netTests.csproj @@ -15,14 +15,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/CSharpBible/Basics/Basic_Del02_FilterTests/Views/TestConsole.cs b/CSharpBible/Basics/Basic_Del02_FilterTests/Views/TestConsole.cs index 44323bd52..f3afd2acb 100644 --- a/CSharpBible/Basics/Basic_Del02_FilterTests/Views/TestConsole.cs +++ b/CSharpBible/Basics/Basic_Del02_FilterTests/Views/TestConsole.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using ConsoleDisplay.View; +using BaseLib.Interfaces; using System; namespace Basic_Del02_Filter.Views.Tests diff --git a/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj b/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj index e187a90d1..550c6edaf 100644 --- a/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj +++ b/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj @@ -2,7 +2,7 @@ Exe - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 @@ -15,7 +15,10 @@ - + + + + True True diff --git a/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General_net.csproj b/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General_net.csproj index 7313701ed..734ee5fa9 100644 --- a/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General_net.csproj +++ b/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General_net.csproj @@ -14,11 +14,10 @@ - - - - - + + + + True True diff --git a/CSharpBible/Basics/Basic_Del03_General/Views/MainView.cs b/CSharpBible/Basics/Basic_Del03_General/Views/MainView.cs index fd881746c..a6c431e0a 100644 --- a/CSharpBible/Basics/Basic_Del03_General/Views/MainView.cs +++ b/CSharpBible/Basics/Basic_Del03_General/Views/MainView.cs @@ -2,25 +2,25 @@ using System.Windows.Input; using ConsoleDisplay.View; using Basic_Del03_General.ViewModels; +using BaseLib.Interfaces; -namespace Basic_Del03_General.Views +namespace Basic_Del03_General.Views; + +public class MainView : ICommand { - public class MainView : ICommand - { - public MainViewModel DataContext { get; set; } = new(); - public IConsole console { get; set; } = new MyConsole(); + public MainViewModel DataContext { get; set; } = new(); + public IConsole console { get; set; } = new MyConsole(); - public event EventHandler? CanExecuteChanged; + public event EventHandler? CanExecuteChanged; - public bool CanExecute(object? parameter) - { - return true; - } + public bool CanExecute(object? parameter) + { + return true; + } - public void Execute(object? parameter) - { - console.WriteLine(DataContext.Greeting); - console.WriteLine($"Result: {DataContext.CalcResult}"); - } + public void Execute(object? parameter) + { + console.WriteLine(DataContext.Greeting); + console.WriteLine($"Result: {DataContext.CalcResult}"); } } diff --git a/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj b/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj index 03dacd40c..aaf77718c 100644 --- a/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj +++ b/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj @@ -1,7 +1,7 @@  - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 true false @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_General_netTests.csproj b/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_General_netTests.csproj index 3377629d5..47d21c90f 100644 --- a/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_General_netTests.csproj +++ b/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_General_netTests.csproj @@ -15,14 +15,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj index e187a90d1..550c6edaf 100644 --- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj +++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj @@ -2,7 +2,7 @@ Exe - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 @@ -15,7 +15,10 @@ - + + + + True True diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff_net.csproj b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff_net.csproj index 7313701ed..bfb0e2362 100644 --- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff_net.csproj +++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff_net.csproj @@ -14,11 +14,11 @@ - - - - - + + + + + True True diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Views/MainView.cs b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Views/MainView.cs index 971d306c2..e4382688f 100644 --- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Views/MainView.cs +++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Views/MainView.cs @@ -2,24 +2,24 @@ using System.Windows.Input; using ConsoleDisplay.View; using Basic_Del04_TestImposibleStuff.ViewModels; +using BaseLib.Interfaces; -namespace Basic_Del04_TestImposibleStuff.Views +namespace Basic_Del04_TestImposibleStuff.Views; + +public class MainView : ICommand { - public class MainView : ICommand - { - public MainViewModel DataContext { get; set; } = new(); - public IConsole console { get; set; } = new MyConsole(); + public MainViewModel DataContext { get; set; } = new(); + public IConsole console { get; set; } = new MyConsole(); - public event EventHandler? CanExecuteChanged; + public event EventHandler? CanExecuteChanged; - public bool CanExecute(object? parameter) - { - return true; - } + public bool CanExecute(object? parameter) + { + return true; + } - public void Execute(object? parameter) - { - console.WriteLine(DataContext.Greeting); - } + public void Execute(object? parameter) + { + console.WriteLine(DataContext.Greeting); } } diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj index ee8378f59..c4a0c0e71 100644 --- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj +++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj @@ -1,7 +1,7 @@  - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 true false @@ -15,14 +15,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuff_netTests.csproj b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuff_netTests.csproj index d8712818d..a4d8cf693 100644 --- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuff_netTests.csproj +++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuff_netTests.csproj @@ -15,14 +15,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Views/TestConsole.cs b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Views/TestConsole.cs index 88e608438..a5b9c5c76 100644 --- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Views/TestConsole.cs +++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Views/TestConsole.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using ConsoleDisplay.View; +using BaseLib.Interfaces; using System; namespace Basic_Del04_TestImposibleStuff.Views.Tests diff --git a/CSharpBible/Basics/C#-Basics.props b/CSharpBible/Basics/C#-Basics.props index 5dd64e3cf..5b9ef936c 100644 --- a/CSharpBible/Basics/C#-Basics.props +++ b/CSharpBible/Basics/C#-Basics.props @@ -1,15 +1,15 @@ ..\.. - ..\..\..\bin\$(MSBuildProjectName)\ - ..\..\..\obj\$(MSBuildProjectName)\ + $(UpDir)\..\bin\$(MSBuildProjectName)\ + $(UpDir)\..\obj\$(MSBuildProjectName)\ $(MSBuildProjectName.Replace(".","_").Replace("_net","")) - 9.0 + 12.0 enable NULLABLE disable JC-Soft Joe Care - Copyright © JC-Soft 2023 + Copyright © JC-Soft 2025 \ No newline at end of file diff --git a/CSharpBible/Basics/C#-Basics_net.props b/CSharpBible/Basics/C#-Basics_net.props index 6009e939e..e4de7e0c6 100644 --- a/CSharpBible/Basics/C#-Basics_net.props +++ b/CSharpBible/Basics/C#-Basics_net.props @@ -1,14 +1,14 @@ ..\.. - ..\..\..\bin\$(MSBuildProjectName)\ - ..\..\..\obj.net\$(MSBuildProjectName)\ + $(UpDir)\..\bin\$(MSBuildProjectName)\ + $(UpDir)\..\obj.net\$(MSBuildProjectName)\ $(MSBuildProjectName.Replace(".","_").Replace("_net","")) - 9.0 + 12.0 enable disable JC-Soft Joe Care - Copyright © JC-Soft 2023 + Copyright © JC-Soft 2025 \ No newline at end of file diff --git a/CSharpBible/CSharpBible.sln b/CSharpBible/CSharpBible.sln index 797e8f779..ca16cbed4 100644 --- a/CSharpBible/CSharpBible.sln +++ b/CSharpBible/CSharpBible.sln @@ -75,8 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc32WPFTests", "Calc\Calc EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLib", "Libraries\MVVM_BaseLib\MVVM_BaseLib.csproj", "{ABC8A3FB-12D1-40ED-AA6C-DBFF48B7A080}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLib_net", "Libraries\MVVM_BaseLib\MVVM_BaseLib_net.csproj", "{F1D5E39A-CCC5-40C3-BA67-BAE7B66F6C0E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonDialogs", "Libraries\CommonDialogs\CommonDialogs.csproj", "{F00E843B-7625-425C-B74F-46E04D99E137}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonDialogs_net", "Libraries\CommonDialogs\CommonDialogs_net.csproj", "{7F6EC75C-1EDF-4A89-8D9B-D09E57770A13}" @@ -94,9 +92,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathLibraryTests", "Libraries\MathLibraryTests\MathLibraryTests.csproj", "{AD2B36C5-FA6E-4B42-921D-37F667D7F9C0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ListBinding", "MVVM_Tutorial\ListBinding\ListBinding.csproj", "{85A3CD48-2240-45B2-9757-F03877201923}" - ProjectSection(ProjectDependencies) = postProject - {F1D5E39A-CCC5-40C3-BA67-BAE7B66F6C0E} = {F1D5E39A-CCC5-40C3-BA67-BAE7B66F6C0E} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SyncAsyncParallel", "MVVM_Tutorial\SyncAsyncParallel\SyncAsyncParallel.csproj", "{373A4CB4-0164-43DF-A51B-52368B1C9FA3}" EndProject @@ -185,27 +180,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Werner_Flaschbier_ConsoleTe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Display_netTest", "Display_Test\Display_netTest.csproj", "{5B2D89EC-28CF-493C-B503-74DCB0F68D73}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleDisplay_net", "Libraries\ConsoleDisplay\ConsoleDisplay_net.csproj", "{C0610610-96D6-45C4-A6B6-1A089839C37A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsole_net", "TestConsole\TestConsole_net.csproj", "{90DDFE5D-E27B-449C-8C1B-6275C8E4BD67}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsoleTests", "TestConsoleTests\TestConsoleTests.csproj", "{A29E68D2-E956-4C72-898A-7445C09C4AEB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsoleDemo", "TestConsoleDemo\TestConsoleDemo.csproj", "{29598C75-C195-4159-A235-B4843820BB2D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleDisplay_netTests", "Libraries\ConsoleDisplayTests\ConsoleDisplay_netTests.csproj", "{6E6FBC29-5A19-4444-BCFE-21E6C88378E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SomeThing", "SomeThing\SomeThing\SomeThing.csproj", "{9960C80E-9A03-4D27-BD75-7E1B90A3EDB0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SomeThing2", "SomeThing\SomeThing2\SomeThing2.csproj", "{1F55EC24-0EAD-484E-B3C0-7F69D4C6D955}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ItemsControlTut3_net", "MVVM_Tutorial\ItemsControlTut3\ItemsControlTut3_net.csproj", "{0B01FB9D-88A8-4C58-AED4-1EDC9AF6934A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snake_Base_net", "Games\Snake_Base\Snake_Base_net.csproj", "{2AE86666-F71E-4655-9A60-911C5A54DEC3}" - ProjectSection(ProjectDependencies) = postProject - {C0610610-96D6-45C4-A6B6-1A089839C37A} = {C0610610-96D6-45C4-A6B6-1A089839C37A} - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VTileEdit", "Games\VTileEdit\VTileEdit.csproj", "{A5CDA595-5AC3-43D1-A4B0-87A00588160D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_TiledDisplay_net", "Games\MVVM_TiledDisplay_net\MVVM_TiledDisplay_net.csproj", "{6D223626-69C8-4EC0-B73E-FBD29484C37F}" @@ -222,22 +208,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_DrawGrid2", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLibTests", "Libraries\MVVM_BaseLibTests\MVVM_BaseLibTests.csproj", "{E9E7DD4E-90AD-4A0A-A219-4E902247CAAB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLibTests_net", "Libraries\MVVM_BaseLibTests\MVVM_BaseLibTests_net.csproj", "{184DAE30-9D1C-430B-A7CC-9A9F60E64BDB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApp", "MVVM_Tutorial\WpfApp1\WpfApp.csproj", "{20AA77E3-3884-4C10-9B62-D48DA98D846A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polyline", "Graphics\Polyline\Polyline.csproj", "{070E91DD-75E9-4186-A773-A2FB576AD1AB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseLib", "Libraries\BaseLib\BaseLib.csproj", "{3A6D15DB-3EC0-4A8D-96CF-39A55D71C508}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseLib_net", "Libraries\BaseLib\BaseLib_net.csproj", "{07DF5268-5BCE-46D7-B357-2F69BF013FB1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snake_Base_netTests", "Games\Snake_BaseTests\Snake_Base_netTests.csproj", "{E651DCE4-FD4B-4736-9FF7-2B38A9CE5002}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64Base", "Calc\Calc64Base\Calc64Base.csproj", "{5B519E7C-1335-439C-900E-BF0E5FAD92BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64Base_net", "Calc\Calc64Base\Calc64Base_net.csproj", "{C540C246-6012-4092-82CB-75468A590C00}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc32_net", "Calc\Calc32\Calc32_net.csproj", "{C5CFA539-54BE-44DD-887A-00567A0982F8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc32WPF_net", "Calc\Calc32WPF\Calc32WPF_net.csproj", "{B6DB23AF-F580-46B5-B5FA-570333B24A78}" @@ -247,12 +225,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc32WPF_netTests", "Calc\ {B6DB23AF-F580-46B5-B5FA-570333B24A78} = {B6DB23AF-F580-46B5-B5FA-570333B24A78} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64Base_netTests", "Calc\Calc64BaseTests\Calc64Base_netTests.csproj", "{47B19FA5-50B8-4856-8D09-DC7AFFD4D3A1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64BaseTests", "Calc\Calc64BaseTests\Calc64BaseTests.csproj", "{363ABE13-A78E-401F-BAB7-F0259FC7EF83}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64WF", "Calc\Calc64WF\Calc64WF.csproj", "{E774D7FD-AAC7-45DF-B839-82C48E8DD18F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Lines_on_Grid", "Graphics\MVVM_Lines_on_Grid\MVVM_Lines_on_Grid.csproj", "{B2E5EE6D-2D56-4B4D-B34C-23C607A6B8F1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp1", "Mobile\MauiApp1\MauiApp1.csproj", "{9731A406-15A0-4A93-A812-483C19ECD846}" @@ -261,10 +235,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64WF_net", "Calc\Calc64 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WFSystem.Windows.Data", "Libraries\WFSystem.Data\WFSystem.Windows.Data.csproj", "{40A6110B-F1A0-4476-B64F-D629313D9FA1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64WFTests", "Calc\Calc64WFTests\Calc64WFTests.csproj", "{5532F188-437D-423B-B883-1ECF3BFAF7C1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WFSystem.Windows.Data_net", "Libraries\WFSystem.Data\WFSystem.Windows.Data_net.csproj", "{D0F700C1-F416-4F77-9E9F-D37A9B8E466A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasWPF2_ItemTemplateSelector", "Graphics\CanvasWPF2_ItemTemplateSelector\CanvasWPF2_ItemTemplateSelector.csproj", "{05957481-A4DD-4DF6-A2E8-9DCB1CF2F232}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_DrawGrid3_NonLin", "Graphics\MVVM_Converter_DrawGrid3_NonLin\MVVM_Converter_DrawGrid3_NonLin.csproj", "{92FEDA3D-2A80-464D-B629-42315B133CB7}" @@ -292,22 +262,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleDisplay", "Libraries EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Lines_on_Grid2", "Graphics\MVVM_Lines_on_Grid2\MVVM_Lines_on_Grid2.csproj", "{385737C2-FB69-44AD-ACBB-A2CBE11686E4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snake_Console_net", "Games\Snake_Console\Snake_Console_net.csproj", "{B804C315-1A8A-4952-966C-3E590CF1AEE0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snake_Console", "Games\Snake_Console\Snake_Console.csproj", "{F30BC8EB-5AC7-4FD0-A5B7-33057AEF8ECA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snake_Base", "Games\Snake_Base\Snake_Base.csproj", "{9D934BB9-B0C6-4CBC-81AB-35AFC52784EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseLib_netTests", "Libraries\BaseLibTests\BaseLib_netTests.csproj", "{2C343E75-F10B-4FF6-A5F3-CD73DB22079C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseLibTests", "Libraries\BaseLibTests\BaseLibTests.csproj", "{33D1CD60-0C70-4645-A50E-CA82F83CE0A5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Display_Test", "Display_Test\Display_Test.csproj", "{E8D9DBBF-0516-4FA7-A5D0-F66DFD196C5C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game_Base_net", "Games\Game_Base\Game_Base_net.csproj", "{56E4E9D9-F140-41FA-967A-A153EF99B4D6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game_Base_netTests", "Games\Game_BaseTests\Game_Base_netTests.csproj", "{81333FA4-3337-42EA-A154-35BF25356346}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game_Base", "Games\Game_Base\Game_Base.csproj", "{4B6719F3-89B1-4C4F-9690-150D0ABDA36F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game_BaseTests", "Games\Game_BaseTests\Game_BaseTests.csproj", "{C7A0CD1D-504A-44DE-AFA1-61BE31DCAE41}" @@ -350,8 +312,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc32_netTests", "Calc\Cal EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_18_MultiConvertersTests", "MVVM_Tutorial\MVVM_18_MultiConvertersTests\MVVM_18_MultiConvertersTests.csproj", "{9A36CBEB-BDAF-4FE8-B4A9-604C71110A8E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calc64Base_win", "Calc\Calc64Base\Calc64Base_win.csproj", "{B405793C-2446-4427-9329-034518031CD7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2D5888F1-086D-4457-B115-01E17625BCA6}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -583,26 +543,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Patterns_Tutorial", "Patter EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_00_Template", "Patterns_Tutorial\Pattern_00_Template\Pattern_00_Template.csproj", "{6CB3FF5D-96FE-4765-8C15-69B3664F296C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_00_Template_net", "Patterns_Tutorial\Pattern_00_Template\Pattern_00_Template_net.csproj", "{377FEE6C-E6A4-40E5-B723-7872326E66B9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_00_Template_netTests", "Patterns_Tutorial\Pattern_00_TemplateTests\Pattern_00_Template_netTests.csproj", "{47B22880-83E3-406D-839C-D97E56F9A37E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_00_TemplateTests", "Patterns_Tutorial\Pattern_00_TemplateTests\Pattern_00_TemplateTests.csproj", "{3E21F611-8039-46F5-85B5-92AC892A3521}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_01_Singleton", "Patterns_Tutorial\Pattern_01_Singleton\Pattern_01_Singleton.csproj", "{507B6692-06C5-4EA2-98B5-BDE2D5A55B51}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_01_Singleton_net", "Patterns_Tutorial\Pattern_01_Singleton\Pattern_01_Singleton_net.csproj", "{E6869BD3-E28A-4973-9FC6-2DC16EE75DAF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_01_Singleton_netTests", "Patterns_Tutorial\Pattern_01_SingletonTests\Pattern_01_Singleton_netTests.csproj", "{59BA7331-E966-4962-8B91-01EBAA91E0F4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_01_SingletonTests", "Patterns_Tutorial\Pattern_01_SingletonTests\Pattern_01_SingletonTests.csproj", "{C7BAC762-25F8-4D1F-B3FF-94ECA9199BE6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_02_Observer", "Patterns_Tutorial\Pattern_02_Observer\Pattern_02_Observer.csproj", "{5ADB16FD-B2A7-4605-A954-6F4A183519DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_02_Observer_net", "Patterns_Tutorial\Pattern_02_Observer\Pattern_02_Observer_net.csproj", "{99FD6482-8C75-48FB-8580-01000F850B17}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_02_Observer_netTests", "Patterns_Tutorial\Pattern_02_ObserverTests\Pattern_02_Observer_netTests.csproj", "{2A2F636A-FE6E-4FFF-97D8-18B697B2DDB8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pattern_02_ObserverTests", "Patterns_Tutorial\Pattern_02_ObserverTests\Pattern_02_ObserverTests.csproj", "{856DF852-7271-480F-9A12-F49DFE086263}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_28_1_DataGridExtTests", "MVVM_Tutorial\MVVM_28_1_DataGridExtTests\MVVM_28_1_DataGridExtTests.csproj", "{0A933D61-5F46-4754-A0D8-ADB1F2DEA0E6}" @@ -657,8 +605,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OleDbTest", "DB\OLEDBTest\O EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OleDbTest2", "DB\OLEDBTest2\OleDbTest2.csproj", "{A4A4C6CA-FF07-43FD-B1DB-EC9B5E01D11A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleDisplay_win", "Libraries\ConsoleDisplay\ConsoleDisplay_win.csproj", "{B43805C8-BF34-403A-8933-F1A63AEBDF71}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MdbBrowser", "DB\MdbBrowser\MdbBrowser.csproj", "{F29AAF44-60FE-4189-81C4-FE3A60161394}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MdbBrowserTests", "DB\MdbBrowserTests\MdbBrowserTests.csproj", "{1CF4EBB0-6BBB-456A-9258-83F62D026530}" @@ -667,8 +613,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Werner_Flaschbier_Console", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sokoban_Base_win", "Games\Sokoban_Base\Sokoban_Base_win.csproj", "{AFA889B1-B728-4E16-96B7-9733376B0EA4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Werner_Flaschbier_Base_win", "Games\Werner_Flaschbier\Werner_Flaschbier_Base_win.csproj", "{877417AD-1F8B-48A8-A0C1-A18FEA269564}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{FCA75665-06E8-45DB-94A0-756B79925C54}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Tests\Test.csproj", "{B8F06FF4-1C87-4483-9B0A-CEC862622BDA}" @@ -742,47 +686,31 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "All_Graphics_net", "Graphics\All_Graphics\All_Graphics_net.csproj", "{9A889644-C632-4CC0-AB47-FF8D14932188}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basics", "Basics", "{FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36}" + ProjectSection(SolutionItems) = preProject + Basics\C#-Basics.props = Basics\C#-Basics.props + Basics\C#-Basics_net.props = Basics\C#-Basics_net.props + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del00_Template", "Basics\Basic_Del00_Template\Basic_Del00_Template.csproj", "{F83B6A40-B596-4A5E-81A3-92565F06BD94}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del00_Template_net", "Basics\Basic_Del00_Template\Basic_Del00_Template_net.csproj", "{7757E901-AE0D-424E-A555-49A7EE8A314F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del00_TemplateTests", "Basics\Basic_Del00_TemplateTests\Basic_Del00_TemplateTests.csproj", "{90DBF676-6543-4845-8A05-2CB5C9425E3F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del00_Template_netTests", "Basics\Basic_Del00_TemplateTests\Basic_Del00_Template_netTests.csproj", "{3C4E2021-48CD-4487-8E4E-54E85EF7C69B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del01_Action", "Basics\Basic_Del01_Action\Basic_Del01_Action.csproj", "{82D37BD6-A8B7-439A-9998-1D38FF8F08BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del01_Action_net", "Basics\Basic_Del01_Action\Basic_Del01_Action_net.csproj", "{FCE1C83E-5C74-41DF-9C26-775F0BD6AA70}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del01_ActionTests", "Basics\Basic_Del01_ActionTests\Basic_Del01_ActionTests.csproj", "{94375706-915F-42D8-B013-0B888F4DD4B0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del01_Action_netTests", "Basics\Basic_Del01_ActionTests\Basic_Del01_Action_netTests.csproj", "{E12773A9-E9B4-4AB0-AB97-B8291AC29DCC}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del02_Filter", "Basics\Basic_Del02_Filter\Basic_Del02_Filter.csproj", "{5B3B245A-5916-4DE7-AF6D-C71C703E0E6E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del02_Filter_net", "Basics\Basic_Del02_Filter\Basic_Del02_Filter_net.csproj", "{6D09848F-E58E-479B-A1E8-7E3F1FF90DA2}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del02_FilterTests", "Basics\Basic_Del02_FilterTests\Basic_Del02_FilterTests.csproj", "{90814AD6-B387-49A7-9657-020FB917BE1A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del02_Filter_netTests", "Basics\Basic_Del02_FilterTests\Basic_Del02_Filter_netTests.csproj", "{35C18531-353E-44D7-8516-43105B89E5CB}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del03_General", "Basics\Basic_Del03_General\Basic_Del03_General.csproj", "{265F2A9D-E12A-4664-B5C8-C338566DD0FC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del03_General_net", "Basics\Basic_Del03_General\Basic_Del03_General_net.csproj", "{282545E3-0E75-4F5D-BDBA-8C8C74F1CEEE}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del03_GeneralTests", "Basics\Basic_Del03_GeneralTests\Basic_Del03_GeneralTests.csproj", "{66171F39-F3B1-4714-BFDB-2040551D3D2E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del03_General_netTests", "Basics\Basic_Del03_GeneralTests\Basic_Del03_General_netTests.csproj", "{085B1327-58FB-4359-A54C-402D3F810079}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del04_TestImposibleStuff", "Basics\Basic_Del04_TestImposibleStuff\Basic_Del04_TestImposibleStuff.csproj", "{7E33210D-6A0F-4DB8-951D-B981BE3CB0C7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del04_TestImposibleStuff_net", "Basics\Basic_Del04_TestImposibleStuff\Basic_Del04_TestImposibleStuff_net.csproj", "{D18EA39C-E0F4-4450-9C27-CB471A424A8E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del04_TestImposibleStuffTests", "Basics\Basic_Del04_TestImposibleStuffTests\Basic_Del04_TestImposibleStuffTests.csproj", "{10AEE6DD-C38F-4CCA-BCFE-AC4B74C75EBF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic_Del04_TestImposibleStuff_netTests", "Basics\Basic_Del04_TestImposibleStuffTests\Basic_Del04_TestImposibleStuff_netTests.csproj", "{0EA31342-17C3-40F4-9717-F64DF27F2C59}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calc32Cons_net", "Calc\Calc32Cons\Calc32Cons_net.csproj", "{21DEBE3D-3302-4CDA-B06A-DB25778CB9E3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Asteroids_net", "Games\Asteroids\Asteroids_net.csproj", "{7F4E5B8E-0C7A-4B3B-B23E-E4360DCE6205}" @@ -1039,6 +967,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Calc32", "Calc32", "{71DD55 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Calc64", "Calc64", "{2D95FC04-8ED8-4545-A337-295F52224983}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtendedConsole", "Libraries\ExtendedConsole\ExtendedConsole.csproj", "{2BBFDE44-4C04-4D27-9B69-42C29A0EAB73}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calc32.Model", "Calc\Calc32\Calc32.Model.csproj", "{03295528-1232-4F7B-AA42-81892547F2D7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calc32.WForms", "Calc\Calc32\Calc32.WForms.csproj", "{44BB5A3B-81B8-4888-B71B-F399FE66A0A3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calc32_net.WForms", "Calc\Calc32\Calc32_net.WForms.csproj", "{5E9D2F06-E4E1-4E2E-BE1A-A0F7E0CF785C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App2", "App2\App2.csproj", "{CE9E0C11-AACD-4F57-8C1B-7210AFABCA19}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VTileEditTests", "Games\VTileEditTests\VTileEditTests.csproj", "{7EE327D2-B598-4F77-A889-04EB6949A6BB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snake_BaseTests", "Games\Snake_BaseTests\Snake_BaseTests.csproj", "{2399EFC7-01EC-4574-9552-1A84857B076E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1133,9 +1075,6 @@ Global {ABC8A3FB-12D1-40ED-AA6C-DBFF48B7A080}.Debug|Any CPU.Build.0 = Debug|Any CPU {ABC8A3FB-12D1-40ED-AA6C-DBFF48B7A080}.Release|Any CPU.ActiveCfg = Release|Any CPU {ABC8A3FB-12D1-40ED-AA6C-DBFF48B7A080}.Release|Any CPU.Build.0 = Release|Any CPU - {F1D5E39A-CCC5-40C3-BA67-BAE7B66F6C0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1D5E39A-CCC5-40C3-BA67-BAE7B66F6C0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1D5E39A-CCC5-40C3-BA67-BAE7B66F6C0E}.Release|Any CPU.Build.0 = Release|Any CPU {F00E843B-7625-425C-B74F-46E04D99E137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F00E843B-7625-425C-B74F-46E04D99E137}.Debug|Any CPU.Build.0 = Debug|Any CPU {F00E843B-7625-425C-B74F-46E04D99E137}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1316,10 +1255,6 @@ Global {5B2D89EC-28CF-493C-B503-74DCB0F68D73}.Debug|Any CPU.Build.0 = Debug|Any CPU {5B2D89EC-28CF-493C-B503-74DCB0F68D73}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B2D89EC-28CF-493C-B503-74DCB0F68D73}.Release|Any CPU.Build.0 = Release|Any CPU - {C0610610-96D6-45C4-A6B6-1A089839C37A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0610610-96D6-45C4-A6B6-1A089839C37A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0610610-96D6-45C4-A6B6-1A089839C37A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0610610-96D6-45C4-A6B6-1A089839C37A}.Release|Any CPU.Build.0 = Release|Any CPU {90DDFE5D-E27B-449C-8C1B-6275C8E4BD67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90DDFE5D-E27B-449C-8C1B-6275C8E4BD67}.Debug|Any CPU.Build.0 = Debug|Any CPU {90DDFE5D-E27B-449C-8C1B-6275C8E4BD67}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1332,10 +1267,6 @@ Global {29598C75-C195-4159-A235-B4843820BB2D}.Debug|Any CPU.Build.0 = Debug|Any CPU {29598C75-C195-4159-A235-B4843820BB2D}.Release|Any CPU.ActiveCfg = Release|Any CPU {29598C75-C195-4159-A235-B4843820BB2D}.Release|Any CPU.Build.0 = Release|Any CPU - {6E6FBC29-5A19-4444-BCFE-21E6C88378E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E6FBC29-5A19-4444-BCFE-21E6C88378E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E6FBC29-5A19-4444-BCFE-21E6C88378E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E6FBC29-5A19-4444-BCFE-21E6C88378E1}.Release|Any CPU.Build.0 = Release|Any CPU {9960C80E-9A03-4D27-BD75-7E1B90A3EDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9960C80E-9A03-4D27-BD75-7E1B90A3EDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {9960C80E-9A03-4D27-BD75-7E1B90A3EDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1348,10 +1279,6 @@ Global {0B01FB9D-88A8-4C58-AED4-1EDC9AF6934A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B01FB9D-88A8-4C58-AED4-1EDC9AF6934A}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B01FB9D-88A8-4C58-AED4-1EDC9AF6934A}.Release|Any CPU.Build.0 = Release|Any CPU - {2AE86666-F71E-4655-9A60-911C5A54DEC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AE86666-F71E-4655-9A60-911C5A54DEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AE86666-F71E-4655-9A60-911C5A54DEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AE86666-F71E-4655-9A60-911C5A54DEC3}.Release|Any CPU.Build.0 = Release|Any CPU {A5CDA595-5AC3-43D1-A4B0-87A00588160D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A5CDA595-5AC3-43D1-A4B0-87A00588160D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A5CDA595-5AC3-43D1-A4B0-87A00588160D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1384,10 +1311,6 @@ Global {E9E7DD4E-90AD-4A0A-A219-4E902247CAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9E7DD4E-90AD-4A0A-A219-4E902247CAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9E7DD4E-90AD-4A0A-A219-4E902247CAAB}.Release|Any CPU.Build.0 = Release|Any CPU - {184DAE30-9D1C-430B-A7CC-9A9F60E64BDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {184DAE30-9D1C-430B-A7CC-9A9F60E64BDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {184DAE30-9D1C-430B-A7CC-9A9F60E64BDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {184DAE30-9D1C-430B-A7CC-9A9F60E64BDB}.Release|Any CPU.Build.0 = Release|Any CPU {20AA77E3-3884-4C10-9B62-D48DA98D846A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20AA77E3-3884-4C10-9B62-D48DA98D846A}.Debug|Any CPU.Build.0 = Debug|Any CPU {20AA77E3-3884-4C10-9B62-D48DA98D846A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1400,22 +1323,10 @@ Global {3A6D15DB-3EC0-4A8D-96CF-39A55D71C508}.Debug|Any CPU.Build.0 = Debug|Any CPU {3A6D15DB-3EC0-4A8D-96CF-39A55D71C508}.Release|Any CPU.ActiveCfg = Release|Any CPU {3A6D15DB-3EC0-4A8D-96CF-39A55D71C508}.Release|Any CPU.Build.0 = Release|Any CPU - {07DF5268-5BCE-46D7-B357-2F69BF013FB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07DF5268-5BCE-46D7-B357-2F69BF013FB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07DF5268-5BCE-46D7-B357-2F69BF013FB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07DF5268-5BCE-46D7-B357-2F69BF013FB1}.Release|Any CPU.Build.0 = Release|Any CPU - {E651DCE4-FD4B-4736-9FF7-2B38A9CE5002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E651DCE4-FD4B-4736-9FF7-2B38A9CE5002}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E651DCE4-FD4B-4736-9FF7-2B38A9CE5002}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E651DCE4-FD4B-4736-9FF7-2B38A9CE5002}.Release|Any CPU.Build.0 = Release|Any CPU {5B519E7C-1335-439C-900E-BF0E5FAD92BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5B519E7C-1335-439C-900E-BF0E5FAD92BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {5B519E7C-1335-439C-900E-BF0E5FAD92BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B519E7C-1335-439C-900E-BF0E5FAD92BC}.Release|Any CPU.Build.0 = Release|Any CPU - {C540C246-6012-4092-82CB-75468A590C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C540C246-6012-4092-82CB-75468A590C00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C540C246-6012-4092-82CB-75468A590C00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C540C246-6012-4092-82CB-75468A590C00}.Release|Any CPU.Build.0 = Release|Any CPU {C5CFA539-54BE-44DD-887A-00567A0982F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C5CFA539-54BE-44DD-887A-00567A0982F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {C5CFA539-54BE-44DD-887A-00567A0982F8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1428,18 +1339,10 @@ Global {1E374AC6-253C-43B1-AE51-C61BBFA9CDDB}.Debug|Any CPU.Build.0 = Debug|Any CPU {1E374AC6-253C-43B1-AE51-C61BBFA9CDDB}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E374AC6-253C-43B1-AE51-C61BBFA9CDDB}.Release|Any CPU.Build.0 = Release|Any CPU - {47B19FA5-50B8-4856-8D09-DC7AFFD4D3A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47B19FA5-50B8-4856-8D09-DC7AFFD4D3A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47B19FA5-50B8-4856-8D09-DC7AFFD4D3A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47B19FA5-50B8-4856-8D09-DC7AFFD4D3A1}.Release|Any CPU.Build.0 = Release|Any CPU {363ABE13-A78E-401F-BAB7-F0259FC7EF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {363ABE13-A78E-401F-BAB7-F0259FC7EF83}.Debug|Any CPU.Build.0 = Debug|Any CPU {363ABE13-A78E-401F-BAB7-F0259FC7EF83}.Release|Any CPU.ActiveCfg = Release|Any CPU {363ABE13-A78E-401F-BAB7-F0259FC7EF83}.Release|Any CPU.Build.0 = Release|Any CPU - {E774D7FD-AAC7-45DF-B839-82C48E8DD18F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E774D7FD-AAC7-45DF-B839-82C48E8DD18F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E774D7FD-AAC7-45DF-B839-82C48E8DD18F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E774D7FD-AAC7-45DF-B839-82C48E8DD18F}.Release|Any CPU.Build.0 = Release|Any CPU {B2E5EE6D-2D56-4B4D-B34C-23C607A6B8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2E5EE6D-2D56-4B4D-B34C-23C607A6B8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2E5EE6D-2D56-4B4D-B34C-23C607A6B8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1458,14 +1361,6 @@ Global {40A6110B-F1A0-4476-B64F-D629313D9FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU {40A6110B-F1A0-4476-B64F-D629313D9FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU {40A6110B-F1A0-4476-B64F-D629313D9FA1}.Release|Any CPU.Build.0 = Release|Any CPU - {5532F188-437D-423B-B883-1ECF3BFAF7C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5532F188-437D-423B-B883-1ECF3BFAF7C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5532F188-437D-423B-B883-1ECF3BFAF7C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5532F188-437D-423B-B883-1ECF3BFAF7C1}.Release|Any CPU.Build.0 = Release|Any CPU - {D0F700C1-F416-4F77-9E9F-D37A9B8E466A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0F700C1-F416-4F77-9E9F-D37A9B8E466A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0F700C1-F416-4F77-9E9F-D37A9B8E466A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0F700C1-F416-4F77-9E9F-D37A9B8E466A}.Release|Any CPU.Build.0 = Release|Any CPU {05957481-A4DD-4DF6-A2E8-9DCB1CF2F232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {05957481-A4DD-4DF6-A2E8-9DCB1CF2F232}.Debug|Any CPU.Build.0 = Debug|Any CPU {05957481-A4DD-4DF6-A2E8-9DCB1CF2F232}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1514,10 +1409,6 @@ Global {385737C2-FB69-44AD-ACBB-A2CBE11686E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {385737C2-FB69-44AD-ACBB-A2CBE11686E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {385737C2-FB69-44AD-ACBB-A2CBE11686E4}.Release|Any CPU.Build.0 = Release|Any CPU - {B804C315-1A8A-4952-966C-3E590CF1AEE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B804C315-1A8A-4952-966C-3E590CF1AEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B804C315-1A8A-4952-966C-3E590CF1AEE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B804C315-1A8A-4952-966C-3E590CF1AEE0}.Release|Any CPU.Build.0 = Release|Any CPU {F30BC8EB-5AC7-4FD0-A5B7-33057AEF8ECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F30BC8EB-5AC7-4FD0-A5B7-33057AEF8ECA}.Debug|Any CPU.Build.0 = Debug|Any CPU {F30BC8EB-5AC7-4FD0-A5B7-33057AEF8ECA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1526,10 +1417,6 @@ Global {9D934BB9-B0C6-4CBC-81AB-35AFC52784EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D934BB9-B0C6-4CBC-81AB-35AFC52784EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D934BB9-B0C6-4CBC-81AB-35AFC52784EE}.Release|Any CPU.Build.0 = Release|Any CPU - {2C343E75-F10B-4FF6-A5F3-CD73DB22079C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C343E75-F10B-4FF6-A5F3-CD73DB22079C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C343E75-F10B-4FF6-A5F3-CD73DB22079C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C343E75-F10B-4FF6-A5F3-CD73DB22079C}.Release|Any CPU.Build.0 = Release|Any CPU {33D1CD60-0C70-4645-A50E-CA82F83CE0A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {33D1CD60-0C70-4645-A50E-CA82F83CE0A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {33D1CD60-0C70-4645-A50E-CA82F83CE0A5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1538,14 +1425,6 @@ Global {E8D9DBBF-0516-4FA7-A5D0-F66DFD196C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8D9DBBF-0516-4FA7-A5D0-F66DFD196C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8D9DBBF-0516-4FA7-A5D0-F66DFD196C5C}.Release|Any CPU.Build.0 = Release|Any CPU - {56E4E9D9-F140-41FA-967A-A153EF99B4D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56E4E9D9-F140-41FA-967A-A153EF99B4D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56E4E9D9-F140-41FA-967A-A153EF99B4D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56E4E9D9-F140-41FA-967A-A153EF99B4D6}.Release|Any CPU.Build.0 = Release|Any CPU - {81333FA4-3337-42EA-A154-35BF25356346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81333FA4-3337-42EA-A154-35BF25356346}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81333FA4-3337-42EA-A154-35BF25356346}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81333FA4-3337-42EA-A154-35BF25356346}.Release|Any CPU.Build.0 = Release|Any CPU {4B6719F3-89B1-4C4F-9690-150D0ABDA36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B6719F3-89B1-4C4F-9690-150D0ABDA36F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B6719F3-89B1-4C4F-9690-150D0ABDA36F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1602,10 +1481,6 @@ Global {9A36CBEB-BDAF-4FE8-B4A9-604C71110A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU {9A36CBEB-BDAF-4FE8-B4A9-604C71110A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU {9A36CBEB-BDAF-4FE8-B4A9-604C71110A8E}.Release|Any CPU.Build.0 = Release|Any CPU - {B405793C-2446-4427-9329-034518031CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B405793C-2446-4427-9329-034518031CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B405793C-2446-4427-9329-034518031CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B405793C-2446-4427-9329-034518031CD7}.Release|Any CPU.Build.0 = Release|Any CPU {BE9DA1B8-3DD8-4A87-8ED8-4DF0940796FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BE9DA1B8-3DD8-4A87-8ED8-4DF0940796FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE9DA1B8-3DD8-4A87-8ED8-4DF0940796FC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2002,14 +1877,6 @@ Global {6CB3FF5D-96FE-4765-8C15-69B3664F296C}.Debug|Any CPU.Build.0 = Debug|Any CPU {6CB3FF5D-96FE-4765-8C15-69B3664F296C}.Release|Any CPU.ActiveCfg = Release|Any CPU {6CB3FF5D-96FE-4765-8C15-69B3664F296C}.Release|Any CPU.Build.0 = Release|Any CPU - {377FEE6C-E6A4-40E5-B723-7872326E66B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {377FEE6C-E6A4-40E5-B723-7872326E66B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {377FEE6C-E6A4-40E5-B723-7872326E66B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {377FEE6C-E6A4-40E5-B723-7872326E66B9}.Release|Any CPU.Build.0 = Release|Any CPU - {47B22880-83E3-406D-839C-D97E56F9A37E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47B22880-83E3-406D-839C-D97E56F9A37E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47B22880-83E3-406D-839C-D97E56F9A37E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47B22880-83E3-406D-839C-D97E56F9A37E}.Release|Any CPU.Build.0 = Release|Any CPU {3E21F611-8039-46F5-85B5-92AC892A3521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E21F611-8039-46F5-85B5-92AC892A3521}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E21F611-8039-46F5-85B5-92AC892A3521}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2018,14 +1885,6 @@ Global {507B6692-06C5-4EA2-98B5-BDE2D5A55B51}.Debug|Any CPU.Build.0 = Debug|Any CPU {507B6692-06C5-4EA2-98B5-BDE2D5A55B51}.Release|Any CPU.ActiveCfg = Release|Any CPU {507B6692-06C5-4EA2-98B5-BDE2D5A55B51}.Release|Any CPU.Build.0 = Release|Any CPU - {E6869BD3-E28A-4973-9FC6-2DC16EE75DAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6869BD3-E28A-4973-9FC6-2DC16EE75DAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6869BD3-E28A-4973-9FC6-2DC16EE75DAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6869BD3-E28A-4973-9FC6-2DC16EE75DAF}.Release|Any CPU.Build.0 = Release|Any CPU - {59BA7331-E966-4962-8B91-01EBAA91E0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59BA7331-E966-4962-8B91-01EBAA91E0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59BA7331-E966-4962-8B91-01EBAA91E0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59BA7331-E966-4962-8B91-01EBAA91E0F4}.Release|Any CPU.Build.0 = Release|Any CPU {C7BAC762-25F8-4D1F-B3FF-94ECA9199BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7BAC762-25F8-4D1F-B3FF-94ECA9199BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7BAC762-25F8-4D1F-B3FF-94ECA9199BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2034,14 +1893,6 @@ Global {5ADB16FD-B2A7-4605-A954-6F4A183519DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {5ADB16FD-B2A7-4605-A954-6F4A183519DA}.Release|Any CPU.ActiveCfg = Release|Any CPU {5ADB16FD-B2A7-4605-A954-6F4A183519DA}.Release|Any CPU.Build.0 = Release|Any CPU - {99FD6482-8C75-48FB-8580-01000F850B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99FD6482-8C75-48FB-8580-01000F850B17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99FD6482-8C75-48FB-8580-01000F850B17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99FD6482-8C75-48FB-8580-01000F850B17}.Release|Any CPU.Build.0 = Release|Any CPU - {2A2F636A-FE6E-4FFF-97D8-18B697B2DDB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A2F636A-FE6E-4FFF-97D8-18B697B2DDB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A2F636A-FE6E-4FFF-97D8-18B697B2DDB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A2F636A-FE6E-4FFF-97D8-18B697B2DDB8}.Release|Any CPU.Build.0 = Release|Any CPU {856DF852-7271-480F-9A12-F49DFE086263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {856DF852-7271-480F-9A12-F49DFE086263}.Debug|Any CPU.Build.0 = Debug|Any CPU {856DF852-7271-480F-9A12-F49DFE086263}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2150,10 +2001,6 @@ Global {A4A4C6CA-FF07-43FD-B1DB-EC9B5E01D11A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4A4C6CA-FF07-43FD-B1DB-EC9B5E01D11A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4A4C6CA-FF07-43FD-B1DB-EC9B5E01D11A}.Release|Any CPU.Build.0 = Release|Any CPU - {B43805C8-BF34-403A-8933-F1A63AEBDF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B43805C8-BF34-403A-8933-F1A63AEBDF71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B43805C8-BF34-403A-8933-F1A63AEBDF71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B43805C8-BF34-403A-8933-F1A63AEBDF71}.Release|Any CPU.Build.0 = Release|Any CPU {F29AAF44-60FE-4189-81C4-FE3A60161394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F29AAF44-60FE-4189-81C4-FE3A60161394}.Debug|Any CPU.Build.0 = Debug|Any CPU {F29AAF44-60FE-4189-81C4-FE3A60161394}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2170,10 +2017,6 @@ Global {AFA889B1-B728-4E16-96B7-9733376B0EA4}.Debug|Any CPU.Build.0 = Debug|Any CPU {AFA889B1-B728-4E16-96B7-9733376B0EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU {AFA889B1-B728-4E16-96B7-9733376B0EA4}.Release|Any CPU.Build.0 = Release|Any CPU - {877417AD-1F8B-48A8-A0C1-A18FEA269564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {877417AD-1F8B-48A8-A0C1-A18FEA269564}.Debug|Any CPU.Build.0 = Debug|Any CPU - {877417AD-1F8B-48A8-A0C1-A18FEA269564}.Release|Any CPU.ActiveCfg = Release|Any CPU - {877417AD-1F8B-48A8-A0C1-A18FEA269564}.Release|Any CPU.Build.0 = Release|Any CPU {B8F06FF4-1C87-4483-9B0A-CEC862622BDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B8F06FF4-1C87-4483-9B0A-CEC862622BDA}.Debug|Any CPU.Build.0 = Debug|Any CPU {B8F06FF4-1C87-4483-9B0A-CEC862622BDA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2318,82 +2161,42 @@ Global {F83B6A40-B596-4A5E-81A3-92565F06BD94}.Debug|Any CPU.Build.0 = Debug|Any CPU {F83B6A40-B596-4A5E-81A3-92565F06BD94}.Release|Any CPU.ActiveCfg = Release|Any CPU {F83B6A40-B596-4A5E-81A3-92565F06BD94}.Release|Any CPU.Build.0 = Release|Any CPU - {7757E901-AE0D-424E-A555-49A7EE8A314F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7757E901-AE0D-424E-A555-49A7EE8A314F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7757E901-AE0D-424E-A555-49A7EE8A314F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7757E901-AE0D-424E-A555-49A7EE8A314F}.Release|Any CPU.Build.0 = Release|Any CPU {90DBF676-6543-4845-8A05-2CB5C9425E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90DBF676-6543-4845-8A05-2CB5C9425E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {90DBF676-6543-4845-8A05-2CB5C9425E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU {90DBF676-6543-4845-8A05-2CB5C9425E3F}.Release|Any CPU.Build.0 = Release|Any CPU - {3C4E2021-48CD-4487-8E4E-54E85EF7C69B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C4E2021-48CD-4487-8E4E-54E85EF7C69B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C4E2021-48CD-4487-8E4E-54E85EF7C69B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C4E2021-48CD-4487-8E4E-54E85EF7C69B}.Release|Any CPU.Build.0 = Release|Any CPU {82D37BD6-A8B7-439A-9998-1D38FF8F08BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82D37BD6-A8B7-439A-9998-1D38FF8F08BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {82D37BD6-A8B7-439A-9998-1D38FF8F08BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {82D37BD6-A8B7-439A-9998-1D38FF8F08BA}.Release|Any CPU.Build.0 = Release|Any CPU - {FCE1C83E-5C74-41DF-9C26-775F0BD6AA70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCE1C83E-5C74-41DF-9C26-775F0BD6AA70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCE1C83E-5C74-41DF-9C26-775F0BD6AA70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCE1C83E-5C74-41DF-9C26-775F0BD6AA70}.Release|Any CPU.Build.0 = Release|Any CPU {94375706-915F-42D8-B013-0B888F4DD4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94375706-915F-42D8-B013-0B888F4DD4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {94375706-915F-42D8-B013-0B888F4DD4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {94375706-915F-42D8-B013-0B888F4DD4B0}.Release|Any CPU.Build.0 = Release|Any CPU - {E12773A9-E9B4-4AB0-AB97-B8291AC29DCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E12773A9-E9B4-4AB0-AB97-B8291AC29DCC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E12773A9-E9B4-4AB0-AB97-B8291AC29DCC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E12773A9-E9B4-4AB0-AB97-B8291AC29DCC}.Release|Any CPU.Build.0 = Release|Any CPU {5B3B245A-5916-4DE7-AF6D-C71C703E0E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5B3B245A-5916-4DE7-AF6D-C71C703E0E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {5B3B245A-5916-4DE7-AF6D-C71C703E0E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B3B245A-5916-4DE7-AF6D-C71C703E0E6E}.Release|Any CPU.Build.0 = Release|Any CPU - {6D09848F-E58E-479B-A1E8-7E3F1FF90DA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D09848F-E58E-479B-A1E8-7E3F1FF90DA2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D09848F-E58E-479B-A1E8-7E3F1FF90DA2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D09848F-E58E-479B-A1E8-7E3F1FF90DA2}.Release|Any CPU.Build.0 = Release|Any CPU {90814AD6-B387-49A7-9657-020FB917BE1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90814AD6-B387-49A7-9657-020FB917BE1A}.Debug|Any CPU.Build.0 = Debug|Any CPU {90814AD6-B387-49A7-9657-020FB917BE1A}.Release|Any CPU.ActiveCfg = Release|Any CPU {90814AD6-B387-49A7-9657-020FB917BE1A}.Release|Any CPU.Build.0 = Release|Any CPU - {35C18531-353E-44D7-8516-43105B89E5CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35C18531-353E-44D7-8516-43105B89E5CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35C18531-353E-44D7-8516-43105B89E5CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35C18531-353E-44D7-8516-43105B89E5CB}.Release|Any CPU.Build.0 = Release|Any CPU {265F2A9D-E12A-4664-B5C8-C338566DD0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {265F2A9D-E12A-4664-B5C8-C338566DD0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {265F2A9D-E12A-4664-B5C8-C338566DD0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {265F2A9D-E12A-4664-B5C8-C338566DD0FC}.Release|Any CPU.Build.0 = Release|Any CPU - {282545E3-0E75-4F5D-BDBA-8C8C74F1CEEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {282545E3-0E75-4F5D-BDBA-8C8C74F1CEEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {282545E3-0E75-4F5D-BDBA-8C8C74F1CEEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {282545E3-0E75-4F5D-BDBA-8C8C74F1CEEE}.Release|Any CPU.Build.0 = Release|Any CPU {66171F39-F3B1-4714-BFDB-2040551D3D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66171F39-F3B1-4714-BFDB-2040551D3D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU {66171F39-F3B1-4714-BFDB-2040551D3D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU {66171F39-F3B1-4714-BFDB-2040551D3D2E}.Release|Any CPU.Build.0 = Release|Any CPU - {085B1327-58FB-4359-A54C-402D3F810079}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {085B1327-58FB-4359-A54C-402D3F810079}.Debug|Any CPU.Build.0 = Debug|Any CPU - {085B1327-58FB-4359-A54C-402D3F810079}.Release|Any CPU.ActiveCfg = Release|Any CPU - {085B1327-58FB-4359-A54C-402D3F810079}.Release|Any CPU.Build.0 = Release|Any CPU {7E33210D-6A0F-4DB8-951D-B981BE3CB0C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E33210D-6A0F-4DB8-951D-B981BE3CB0C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E33210D-6A0F-4DB8-951D-B981BE3CB0C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E33210D-6A0F-4DB8-951D-B981BE3CB0C7}.Release|Any CPU.Build.0 = Release|Any CPU - {D18EA39C-E0F4-4450-9C27-CB471A424A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D18EA39C-E0F4-4450-9C27-CB471A424A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D18EA39C-E0F4-4450-9C27-CB471A424A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D18EA39C-E0F4-4450-9C27-CB471A424A8E}.Release|Any CPU.Build.0 = Release|Any CPU {10AEE6DD-C38F-4CCA-BCFE-AC4B74C75EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {10AEE6DD-C38F-4CCA-BCFE-AC4B74C75EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU {10AEE6DD-C38F-4CCA-BCFE-AC4B74C75EBF}.Release|Any CPU.ActiveCfg = Release|Any CPU {10AEE6DD-C38F-4CCA-BCFE-AC4B74C75EBF}.Release|Any CPU.Build.0 = Release|Any CPU - {0EA31342-17C3-40F4-9717-F64DF27F2C59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EA31342-17C3-40F4-9717-F64DF27F2C59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EA31342-17C3-40F4-9717-F64DF27F2C59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EA31342-17C3-40F4-9717-F64DF27F2C59}.Release|Any CPU.Build.0 = Release|Any CPU {21DEBE3D-3302-4CDA-B06A-DB25778CB9E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21DEBE3D-3302-4CDA-B06A-DB25778CB9E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {21DEBE3D-3302-4CDA-B06A-DB25778CB9E3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2866,6 +2669,36 @@ Global {0C5621AB-5BE2-49E2-85B1-2C3A17C2DCFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C5621AB-5BE2-49E2-85B1-2C3A17C2DCFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C5621AB-5BE2-49E2-85B1-2C3A17C2DCFA}.Release|Any CPU.Build.0 = Release|Any CPU + {2BBFDE44-4C04-4D27-9B69-42C29A0EAB73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2BBFDE44-4C04-4D27-9B69-42C29A0EAB73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2BBFDE44-4C04-4D27-9B69-42C29A0EAB73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2BBFDE44-4C04-4D27-9B69-42C29A0EAB73}.Release|Any CPU.Build.0 = Release|Any CPU + {03295528-1232-4F7B-AA42-81892547F2D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03295528-1232-4F7B-AA42-81892547F2D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03295528-1232-4F7B-AA42-81892547F2D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03295528-1232-4F7B-AA42-81892547F2D7}.Release|Any CPU.Build.0 = Release|Any CPU + {44BB5A3B-81B8-4888-B71B-F399FE66A0A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44BB5A3B-81B8-4888-B71B-F399FE66A0A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44BB5A3B-81B8-4888-B71B-F399FE66A0A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44BB5A3B-81B8-4888-B71B-F399FE66A0A3}.Release|Any CPU.Build.0 = Release|Any CPU + {5E9D2F06-E4E1-4E2E-BE1A-A0F7E0CF785C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5E9D2F06-E4E1-4E2E-BE1A-A0F7E0CF785C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5E9D2F06-E4E1-4E2E-BE1A-A0F7E0CF785C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5E9D2F06-E4E1-4E2E-BE1A-A0F7E0CF785C}.Release|Any CPU.Build.0 = Release|Any CPU + {CE9E0C11-AACD-4F57-8C1B-7210AFABCA19}.Debug|Any CPU.ActiveCfg = Debug|x64 + {CE9E0C11-AACD-4F57-8C1B-7210AFABCA19}.Debug|Any CPU.Build.0 = Debug|x64 + {CE9E0C11-AACD-4F57-8C1B-7210AFABCA19}.Debug|Any CPU.Deploy.0 = Debug|x64 + {CE9E0C11-AACD-4F57-8C1B-7210AFABCA19}.Release|Any CPU.ActiveCfg = Release|x64 + {CE9E0C11-AACD-4F57-8C1B-7210AFABCA19}.Release|Any CPU.Build.0 = Release|x64 + {CE9E0C11-AACD-4F57-8C1B-7210AFABCA19}.Release|Any CPU.Deploy.0 = Release|x64 + {7EE327D2-B598-4F77-A889-04EB6949A6BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7EE327D2-B598-4F77-A889-04EB6949A6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7EE327D2-B598-4F77-A889-04EB6949A6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7EE327D2-B598-4F77-A889-04EB6949A6BB}.Release|Any CPU.Build.0 = Release|Any CPU + {2399EFC7-01EC-4574-9552-1A84857B076E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2399EFC7-01EC-4574-9552-1A84857B076E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2399EFC7-01EC-4574-9552-1A84857B076E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2399EFC7-01EC-4574-9552-1A84857B076E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2878,7 +2711,6 @@ Global {9A31567A-4BDD-442A-912A-C82D020D6269} = {71DD55F8-E61A-49E8-B841-72984B85D38B} {5BD6F565-B18E-4B62-B51B-0EC58AD82AE1} = {71DD55F8-E61A-49E8-B841-72984B85D38B} {ABC8A3FB-12D1-40ED-AA6C-DBFF48B7A080} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} - {F1D5E39A-CCC5-40C3-BA67-BAE7B66F6C0E} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {F00E843B-7625-425C-B74F-46E04D99E137} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {7F6EC75C-1EDF-4A89-8D9B-D09E57770A13} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {58C1A208-2F56-4411-86B9-1DAA8165605D} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} @@ -2924,15 +2756,12 @@ Global {A5D73D86-9D5C-45E1-AE27-DDF8A5EE52E5} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {FA9F3597-4C9F-48FA-A507-54BF6825C637} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {5B2D89EC-28CF-493C-B503-74DCB0F68D73} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} - {C0610610-96D6-45C4-A6B6-1A089839C37A} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {90DDFE5D-E27B-449C-8C1B-6275C8E4BD67} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {A29E68D2-E956-4C72-898A-7445C09C4AEB} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {29598C75-C195-4159-A235-B4843820BB2D} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} - {6E6FBC29-5A19-4444-BCFE-21E6C88378E1} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {9960C80E-9A03-4D27-BD75-7E1B90A3EDB0} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {1F55EC24-0EAD-484E-B3C0-7F69D4C6D955} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {0B01FB9D-88A8-4C58-AED4-1EDC9AF6934A} = {1BD34A20-4B18-43A2-AEEE-1E24B93C8BC9} - {2AE86666-F71E-4655-9A60-911C5A54DEC3} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {A5CDA595-5AC3-43D1-A4B0-87A00588160D} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {6D223626-69C8-4EC0-B73E-FBD29484C37F} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {B4B321AC-D3C4-414C-A596-1B60D1200527} = {E1D77C39-936E-4ADB-8350-74B5A4401280} @@ -2941,26 +2770,18 @@ Global {4943798F-C5BA-4A79-929C-3D6427510A91} = {E1D77C39-936E-4ADB-8350-74B5A4401280} {1360C24E-066A-4C43-9C07-3D6A0DB2FBFD} = {E1D77C39-936E-4ADB-8350-74B5A4401280} {E9E7DD4E-90AD-4A0A-A219-4E902247CAAB} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} - {184DAE30-9D1C-430B-A7CC-9A9F60E64BDB} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {20AA77E3-3884-4C10-9B62-D48DA98D846A} = {1BD34A20-4B18-43A2-AEEE-1E24B93C8BC9} {070E91DD-75E9-4186-A773-A2FB576AD1AB} = {E1D77C39-936E-4ADB-8350-74B5A4401280} {3A6D15DB-3EC0-4A8D-96CF-39A55D71C508} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} - {07DF5268-5BCE-46D7-B357-2F69BF013FB1} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} - {E651DCE4-FD4B-4736-9FF7-2B38A9CE5002} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {5B519E7C-1335-439C-900E-BF0E5FAD92BC} = {2D95FC04-8ED8-4545-A337-295F52224983} - {C540C246-6012-4092-82CB-75468A590C00} = {2D95FC04-8ED8-4545-A337-295F52224983} {C5CFA539-54BE-44DD-887A-00567A0982F8} = {71DD55F8-E61A-49E8-B841-72984B85D38B} {B6DB23AF-F580-46B5-B5FA-570333B24A78} = {71DD55F8-E61A-49E8-B841-72984B85D38B} {1E374AC6-253C-43B1-AE51-C61BBFA9CDDB} = {71DD55F8-E61A-49E8-B841-72984B85D38B} - {47B19FA5-50B8-4856-8D09-DC7AFFD4D3A1} = {2D95FC04-8ED8-4545-A337-295F52224983} {363ABE13-A78E-401F-BAB7-F0259FC7EF83} = {2D95FC04-8ED8-4545-A337-295F52224983} - {E774D7FD-AAC7-45DF-B839-82C48E8DD18F} = {2D95FC04-8ED8-4545-A337-295F52224983} {B2E5EE6D-2D56-4B4D-B34C-23C607A6B8F1} = {E1D77C39-936E-4ADB-8350-74B5A4401280} {9731A406-15A0-4A93-A812-483C19ECD846} = {8CCD8BF8-F2E9-4282-A9BC-817A051663D4} {CBF9810B-C6DB-47A6-9C5D-6E20DBF8B5E1} = {2D95FC04-8ED8-4545-A337-295F52224983} {40A6110B-F1A0-4476-B64F-D629313D9FA1} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} - {5532F188-437D-423B-B883-1ECF3BFAF7C1} = {2D95FC04-8ED8-4545-A337-295F52224983} - {D0F700C1-F416-4F77-9E9F-D37A9B8E466A} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {05957481-A4DD-4DF6-A2E8-9DCB1CF2F232} = {E1D77C39-936E-4ADB-8350-74B5A4401280} {92FEDA3D-2A80-464D-B629-42315B133CB7} = {E1D77C39-936E-4ADB-8350-74B5A4401280} {8DE194E5-C84B-4781-92CD-8539572499EC} = {E1D77C39-936E-4ADB-8350-74B5A4401280} @@ -2973,14 +2794,10 @@ Global {27777C75-0DA7-4489-BE60-51E74F921090} = {465E6B8C-A028-4C99-86E7-2710FFC62901} {9EA5388E-5333-4C8A-8B27-8E16AC4E7137} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {385737C2-FB69-44AD-ACBB-A2CBE11686E4} = {E1D77C39-936E-4ADB-8350-74B5A4401280} - {B804C315-1A8A-4952-966C-3E590CF1AEE0} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {F30BC8EB-5AC7-4FD0-A5B7-33057AEF8ECA} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {9D934BB9-B0C6-4CBC-81AB-35AFC52784EE} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} - {2C343E75-F10B-4FF6-A5F3-CD73DB22079C} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {33D1CD60-0C70-4645-A50E-CA82F83CE0A5} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {E8D9DBBF-0516-4FA7-A5D0-F66DFD196C5C} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} - {56E4E9D9-F140-41FA-967A-A153EF99B4D6} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} - {81333FA4-3337-42EA-A154-35BF25356346} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {4B6719F3-89B1-4C4F-9690-150D0ABDA36F} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {C7A0CD1D-504A-44DE-AFA1-61BE31DCAE41} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {F0207D93-9C3B-4C45-84AE-F4CD3D12AB84} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} @@ -2995,7 +2812,6 @@ Global {3C09ADED-DB10-4E3D-AC4E-D0E314638E1F} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {CBE80569-113E-4FFF-A00C-230CBB120934} = {71DD55F8-E61A-49E8-B841-72984B85D38B} {9A36CBEB-BDAF-4FE8-B4A9-604C71110A8E} = {FA5C6934-CFA9-4A3C-B027-C1F7D4899984} - {B405793C-2446-4427-9329-034518031CD7} = {2D95FC04-8ED8-4545-A337-295F52224983} {BE9DA1B8-3DD8-4A87-8ED8-4DF0940796FC} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} {305696C7-1982-47BF-96F5-972AE87FFD17} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} {9BF13892-7211-42C7-ACD7-C09935B8312C} = {465E6B8C-A028-4C99-86E7-2710FFC62901} @@ -3100,16 +2916,10 @@ Global {9F960971-F7C9-4978-8843-28FEA1A4662F} = {465E6B8C-A028-4C99-86E7-2710FFC62901} {6B028F0A-7484-407E-A7E8-312CFAB53B18} = {465E6B8C-A028-4C99-86E7-2710FFC62901} {6CB3FF5D-96FE-4765-8C15-69B3664F296C} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} - {377FEE6C-E6A4-40E5-B723-7872326E66B9} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} - {47B22880-83E3-406D-839C-D97E56F9A37E} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} {3E21F611-8039-46F5-85B5-92AC892A3521} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} {507B6692-06C5-4EA2-98B5-BDE2D5A55B51} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} - {E6869BD3-E28A-4973-9FC6-2DC16EE75DAF} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} - {59BA7331-E966-4962-8B91-01EBAA91E0F4} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} {C7BAC762-25F8-4D1F-B3FF-94ECA9199BE6} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} {5ADB16FD-B2A7-4605-A954-6F4A183519DA} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} - {99FD6482-8C75-48FB-8580-01000F850B17} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} - {2A2F636A-FE6E-4FFF-97D8-18B697B2DDB8} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} {856DF852-7271-480F-9A12-F49DFE086263} = {A02EA190-2D03-40BD-B524-1B7CEB1CA0BF} {0A933D61-5F46-4754-A0D8-ADB1F2DEA0E6} = {BA409E0A-C840-4305-83C7-2934BEFE9E5E} {28368089-C065-4279-A3C4-6D2815789327} = {BA409E0A-C840-4305-83C7-2934BEFE9E5E} @@ -3137,12 +2947,10 @@ Global {F3128138-A2B7-4C09-9D0A-A93DD4F855A5} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} {4C4A49FF-E89F-4108-A4BD-551634A3C4CE} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} {A4A4C6CA-FF07-43FD-B1DB-EC9B5E01D11A} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} - {B43805C8-BF34-403A-8933-F1A63AEBDF71} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {F29AAF44-60FE-4189-81C4-FE3A60161394} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} {1CF4EBB0-6BBB-456A-9258-83F62D026530} = {ABF85DD5-B281-4889-9A8E-5DB3185A8DD5} {200CCE0D-1796-4570-8EDD-7093F0072678} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {AFA889B1-B728-4E16-96B7-9733376B0EA4} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} - {877417AD-1F8B-48A8-A0C1-A18FEA269564} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {B8F06FF4-1C87-4483-9B0A-CEC862622BDA} = {FCA75665-06E8-45DB-94A0-756B79925C54} {16C31B01-EC91-41E5-8290-EBB887E75F23} = {6A18D579-BB15-42D9-ACB1-F7201C790CE8} {0D10C533-F687-40E9-AF63-B06345EAB5DF} = {6A18D579-BB15-42D9-ACB1-F7201C790CE8} @@ -3179,25 +2987,15 @@ Global {439F5255-5ABB-4097-A718-9D47615FBB0C} = {1BD34A20-4B18-43A2-AEEE-1E24B93C8BC9} {9A889644-C632-4CC0-AB47-FF8D14932188} = {E1D77C39-936E-4ADB-8350-74B5A4401280} {F83B6A40-B596-4A5E-81A3-92565F06BD94} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {7757E901-AE0D-424E-A555-49A7EE8A314F} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {90DBF676-6543-4845-8A05-2CB5C9425E3F} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {3C4E2021-48CD-4487-8E4E-54E85EF7C69B} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {82D37BD6-A8B7-439A-9998-1D38FF8F08BA} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {FCE1C83E-5C74-41DF-9C26-775F0BD6AA70} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {94375706-915F-42D8-B013-0B888F4DD4B0} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {E12773A9-E9B4-4AB0-AB97-B8291AC29DCC} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {5B3B245A-5916-4DE7-AF6D-C71C703E0E6E} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {6D09848F-E58E-479B-A1E8-7E3F1FF90DA2} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {90814AD6-B387-49A7-9657-020FB917BE1A} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {35C18531-353E-44D7-8516-43105B89E5CB} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {265F2A9D-E12A-4664-B5C8-C338566DD0FC} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {282545E3-0E75-4F5D-BDBA-8C8C74F1CEEE} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {66171F39-F3B1-4714-BFDB-2040551D3D2E} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {085B1327-58FB-4359-A54C-402D3F810079} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {7E33210D-6A0F-4DB8-951D-B981BE3CB0C7} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {D18EA39C-E0F4-4450-9C27-CB471A424A8E} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {10AEE6DD-C38F-4CCA-BCFE-AC4B74C75EBF} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} - {0EA31342-17C3-40F4-9717-F64DF27F2C59} = {FA8A64D6-C0D5-4AD2-92BB-D2718B9D7D36} {21DEBE3D-3302-4CDA-B06A-DB25778CB9E3} = {71DD55F8-E61A-49E8-B841-72984B85D38B} {7F4E5B8E-0C7A-4B3B-B23E-E4360DCE6205} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} {B67C74E4-CA8C-4278-A5E5-C1006A9E6837} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} @@ -3321,6 +3119,13 @@ Global {0C5621AB-5BE2-49E2-85B1-2C3A17C2DCFA} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} {71DD55F8-E61A-49E8-B841-72984B85D38B} = {278CFF7F-D799-45EE-BADB-8C8380F05716} {2D95FC04-8ED8-4545-A337-295F52224983} = {278CFF7F-D799-45EE-BADB-8C8380F05716} + {2BBFDE44-4C04-4D27-9B69-42C29A0EAB73} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10} + {03295528-1232-4F7B-AA42-81892547F2D7} = {71DD55F8-E61A-49E8-B841-72984B85D38B} + {44BB5A3B-81B8-4888-B71B-F399FE66A0A3} = {71DD55F8-E61A-49E8-B841-72984B85D38B} + {5E9D2F06-E4E1-4E2E-BE1A-A0F7E0CF785C} = {71DD55F8-E61A-49E8-B841-72984B85D38B} + {CE9E0C11-AACD-4F57-8C1B-7210AFABCA19} = {A7AA5940-00E1-4F63-B85A-90BF6A35EA05} + {7EE327D2-B598-4F77-A889-04EB6949A6BB} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} + {2399EFC7-01EC-4574-9552-1A84857B076E} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DAF8B3ED-D51A-4CDA-8BF1-1E032CF0AC4F} diff --git a/CSharpBible/Calc/Calc32/Calc32.Model.csproj b/CSharpBible/Calc/Calc32/Calc32.Model.csproj index 32b00d7f0..7fff000f3 100644 --- a/CSharpBible/Calc/Calc32/Calc32.Model.csproj +++ b/CSharpBible/Calc/Calc32/Calc32.Model.csproj @@ -2,8 +2,8 @@ library - net462-windows;net472-windows;net48-windows;net481-windows - + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 + @@ -34,7 +34,7 @@ - + diff --git a/CSharpBible/Calc/Calc32/Calc32.WForms.csproj b/CSharpBible/Calc/Calc32/Calc32.WForms.csproj index 1799aeeab..ecaaa1b2d 100644 --- a/CSharpBible/Calc/Calc32/Calc32.WForms.csproj +++ b/CSharpBible/Calc/Calc32/Calc32.WForms.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true @@ -33,7 +33,7 @@ - + @@ -52,6 +52,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Calc32.Properties diff --git a/CSharpBible/Calc/Calc32/Calc32.csproj b/CSharpBible/Calc/Calc32/Calc32.csproj index bfb8ca8e9..cee347937 100644 --- a/CSharpBible/Calc/Calc32/Calc32.csproj +++ b/CSharpBible/Calc/Calc32/Calc32.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true @@ -23,9 +23,6 @@ - - - True @@ -40,7 +37,7 @@ - ResXFileCodeGenerator + PublicResXFileCodeGenerator Resources.Designer.cs @@ -48,6 +45,7 @@ PublicSettingsSingleFileGenerator Settings.Designer.cs + Calc32.Properties @@ -57,4 +55,7 @@ + + + \ No newline at end of file diff --git a/CSharpBible/Calc/Calc32/Calc32_net.Model.csproj b/CSharpBible/Calc/Calc32/Calc32_net.Model.csproj deleted file mode 100644 index 10255c5bd..000000000 --- a/CSharpBible/Calc/Calc32/Calc32_net.Model.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - - Library - net6.0;net7.0;net8.0;net9.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharpBible/Calc/Calc32/Calc32_net.WForms.csproj b/CSharpBible/Calc/Calc32/Calc32_net.WForms.csproj index 5ac498b1c..a14e8a7fc 100644 --- a/CSharpBible/Calc/Calc32/Calc32_net.WForms.csproj +++ b/CSharpBible/Calc/Calc32/Calc32_net.WForms.csproj @@ -8,9 +8,18 @@ + + + + + + + + + @@ -23,7 +32,8 @@ - + + @@ -41,6 +51,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Calc32.Properties diff --git a/CSharpBible/Calc/Calc32/Calc32_net.csproj b/CSharpBible/Calc/Calc32/Calc32_net.csproj index 4b0fc6e13..00c0d286a 100644 --- a/CSharpBible/Calc/Calc32/Calc32_net.csproj +++ b/CSharpBible/Calc/Calc32/Calc32_net.csproj @@ -23,7 +23,7 @@ - + diff --git a/CSharpBible/Calc/Calc32/NonVisual/CalculatorClass.cs b/CSharpBible/Calc/Calc32/NonVisual/CalculatorClass.cs index 858ae94f8..b9cca5e93 100644 --- a/CSharpBible/Calc/Calc32/NonVisual/CalculatorClass.cs +++ b/CSharpBible/Calc/Calc32/NonVisual/CalculatorClass.cs @@ -124,6 +124,7 @@ public enum eOpMode /// Gets or sets the accumulator. /// /// The accumulator. + [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public int Accumulator { get => nAccumulator; @@ -134,6 +135,7 @@ public int Accumulator /// Gets or sets the memory. /// /// The memory. + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public int Memory { get => nMemory; diff --git a/CSharpBible/Calc/Calc32/Properties/Resources.Designer.cs b/CSharpBible/Calc/Calc32/Properties/Resources.Designer.cs index 0ea102f0f..27cd70455 100644 --- a/CSharpBible/Calc/Calc32/Properties/Resources.Designer.cs +++ b/CSharpBible/Calc/Calc32/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Calc32.WForms.Properties { +namespace Calc32.Properties { using System; @@ -22,7 +22,7 @@ namespace Calc32.WForms.Properties { [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 { + public class Resources { private static global::System.Resources.ResourceManager resourceMan; @@ -36,10 +36,10 @@ internal Resources() { /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Calc32.WForms.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Calc32.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -51,7 +51,7 @@ internal Resources() { /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -63,7 +63,7 @@ internal Resources() { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). /// - internal static System.Drawing.Icon Calc_32 { + public static System.Drawing.Icon Calc_32 { get { object obj = ResourceManager.GetObject("Calc_32", resourceCulture); return ((System.Drawing.Icon)(obj)); @@ -73,7 +73,7 @@ internal static System.Drawing.Icon Calc_32 { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap calculator_64 { + public static System.Drawing.Bitmap calculator_64 { get { object obj = ResourceManager.GetObject("calculator_64", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -83,7 +83,7 @@ internal static System.Drawing.Bitmap calculator_64 { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Exit { + public static System.Drawing.Bitmap Exit { get { object obj = ResourceManager.GetObject("Exit", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -93,7 +93,7 @@ internal static System.Drawing.Bitmap Exit { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Glow_White { + public static System.Drawing.Bitmap Glow_White { get { object obj = ResourceManager.GetObject("Glow_White", resourceCulture); return ((System.Drawing.Bitmap)(obj)); diff --git a/CSharpBible/Calc/Calc32/Properties/Settings.Designer.cs b/CSharpBible/Calc/Calc32/Properties/Settings.Designer.cs index dcd699bbd..c674f603d 100644 --- a/CSharpBible/Calc/Calc32/Properties/Settings.Designer.cs +++ b/CSharpBible/Calc/Calc32/Properties/Settings.Designer.cs @@ -8,12 +8,12 @@ // //------------------------------------------------------------------------------ -namespace Calc32.WForms.Properties { +namespace Calc32.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/CSharpBible/Calc/Calc32Cons/Calc32Cons.csproj b/CSharpBible/Calc/Calc32Cons/Calc32Cons.csproj index 86be6596d..18cc481fd 100644 --- a/CSharpBible/Calc/Calc32Cons/Calc32Cons.csproj +++ b/CSharpBible/Calc/Calc32Cons/Calc32Cons.csproj @@ -2,7 +2,7 @@ Exe - net462-windows;net472-windows;net481-windows;net48-windows + net462;net472;net481;net48 true @@ -30,7 +30,6 @@ - diff --git a/CSharpBible/Calc/Calc32Cons/Calc32Cons_net.csproj b/CSharpBible/Calc/Calc32Cons/Calc32Cons_net.csproj index e2c5ae34d..0c7918e93 100644 --- a/CSharpBible/Calc/Calc32Cons/Calc32Cons_net.csproj +++ b/CSharpBible/Calc/Calc32Cons/Calc32Cons_net.csproj @@ -30,7 +30,6 @@ - diff --git a/CSharpBible/Calc/Calc32Tests/Calc32Tests.csproj b/CSharpBible/Calc/Calc32Tests/Calc32Tests.csproj index 93ef276a5..aac9e104d 100644 --- a/CSharpBible/Calc/Calc32Tests/Calc32Tests.csproj +++ b/CSharpBible/Calc/Calc32Tests/Calc32Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/Calc/Calc32WPF/Calc32WPF.csproj b/CSharpBible/Calc/Calc32WPF/Calc32WPF.csproj index 6ae5dabd1..962139a14 100644 --- a/CSharpBible/Calc/Calc32WPF/Calc32WPF.csproj +++ b/CSharpBible/Calc/Calc32WPF/Calc32WPF.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/Calc/Calc32WPFTests/Calc32WPFTests.csproj b/CSharpBible/Calc/Calc32WPFTests/Calc32WPFTests.csproj index e22e18461..b50ea2b8e 100644 --- a/CSharpBible/Calc/Calc32WPFTests/Calc32WPFTests.csproj +++ b/CSharpBible/Calc/Calc32WPFTests/Calc32WPFTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/Calc/Calc64Base/Calc64Base.csproj b/CSharpBible/Calc/Calc64Base/Calc64Base.csproj index 45d0342ca..42e90e3bd 100644 --- a/CSharpBible/Calc/Calc64Base/Calc64Base.csproj +++ b/CSharpBible/Calc/Calc64Base/Calc64Base.csproj @@ -2,7 +2,7 @@ Library - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 diff --git a/CSharpBible/Calc/Calc64Base/Calc64Base_net.csproj b/CSharpBible/Calc/Calc64Base/Calc64Base_net.csproj deleted file mode 100644 index 2191dfeff..000000000 --- a/CSharpBible/Calc/Calc64Base/Calc64Base_net.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - Library - net6.0;net7.0;net8.0;net481;net48;net472;net462 - - - - - $(MSBuildProjectName.Replace(" ", "_").Replace("_net","")) - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharpBible/Calc/Calc64Base/Calc64Base_win.csproj b/CSharpBible/Calc/Calc64Base/Calc64Base_win.csproj deleted file mode 100644 index 5054a12e3..000000000 --- a/CSharpBible/Calc/Calc64Base/Calc64Base_win.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - Library - net481-windows;net48-windows;net472-windows;net462-windows - - - - - $(MSBuildProjectName.Replace(" ", "_").Replace("_net","")) - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharpBible/Calc/Calc64BaseTests/Calc64Base_netTests.csproj b/CSharpBible/Calc/Calc64BaseTests/Calc64Base_netTests.csproj deleted file mode 100644 index 8de629dbd..000000000 --- a/CSharpBible/Calc/Calc64BaseTests/Calc64Base_netTests.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - net6.0;net7.0;net8.0;net9.0 - - - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - diff --git a/CSharpBible/Calc/Calc64BaseTests/Calc64ModelTests.cs b/CSharpBible/Calc/Calc64BaseTests/Calc64ModelTests.cs index 6bbea90ac..99dea5cf8 100644 --- a/CSharpBible/Calc/Calc64BaseTests/Calc64ModelTests.cs +++ b/CSharpBible/Calc/Calc64BaseTests/Calc64ModelTests.cs @@ -1,4 +1,5 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Calc64Base.Models; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; namespace Calc64Base.Tests diff --git a/CSharpBible/Calc/Calc64WF/Calc64WF.csproj b/CSharpBible/Calc/Calc64WF/Calc64WF.csproj index 7d12e5c44..764635bf3 100644 --- a/CSharpBible/Calc/Calc64WF/Calc64WF.csproj +++ b/CSharpBible/Calc/Calc64WF/Calc64WF.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true @@ -29,7 +29,7 @@ - + diff --git a/CSharpBible/Calc/Calc64WF/Calc64WF_net.csproj b/CSharpBible/Calc/Calc64WF/Calc64WF_net.csproj index d1853b4b1..18b2ce275 100644 --- a/CSharpBible/Calc/Calc64WF/Calc64WF_net.csproj +++ b/CSharpBible/Calc/Calc64WF/Calc64WF_net.csproj @@ -2,7 +2,7 @@ WinExe - net481-windows;net48-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net48;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows true @@ -19,18 +19,12 @@ + - - - - - - - - - + + diff --git a/CSharpBible/Calc/Calc64WF/Visual/FrmCalc64Main.cs b/CSharpBible/Calc/Calc64WF/Visual/FrmCalc64Main.cs index c8d2478eb..d5c599b8a 100644 --- a/CSharpBible/Calc/Calc64WF/Visual/FrmCalc64Main.cs +++ b/CSharpBible/Calc/Calc64WF/Visual/FrmCalc64Main.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using System; +using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; using System.Windows.Forms; @@ -79,15 +80,14 @@ public partial class FrmCalc64Main : Form /// /// Gets the data context. /// - /// The data context. - public + /// The data context + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] #if NET7_0_OR_GREATER - - new + public new IFrmCalc64MainViewModel DataContext { get; private set; } +#else + public IFrmCalc64MainViewModel DataContext { get; private set; } #endif - IFrmCalc64MainViewModel DataContext - { get; private set; } - #endregion +#endregion #region Methods /// /// Initializes a new instance of the class. diff --git a/CSharpBible/Calc/Calc64WFTests/Calc64WFTests.csproj b/CSharpBible/Calc/Calc64WFTests/Calc64WFTests.csproj index e4631551d..623bab30f 100644 --- a/CSharpBible/Calc/Calc64WFTests/Calc64WFTests.csproj +++ b/CSharpBible/Calc/Calc64WFTests/Calc64WFTests.csproj @@ -7,7 +7,7 @@ Properties Calc64WF Calc64WFTests - net481-windows;net48-windows;net472-windows;net462-windows + net481;net48;net472;net462 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -31,9 +31,5 @@ - - - - \ No newline at end of file diff --git a/CSharpBible/Calc/Calc64WFTests/Calc64WF_netTests.csproj b/CSharpBible/Calc/Calc64WFTests/Calc64WF_netTests.csproj index 64898e371..bf22ea6db 100644 --- a/CSharpBible/Calc/Calc64WFTests/Calc64WF_netTests.csproj +++ b/CSharpBible/Calc/Calc64WFTests/Calc64WF_netTests.csproj @@ -25,6 +25,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/CSharpBible/Calc/Calc64WFTests/ViewModels/FrmCalc64MainViewModelTests.cs b/CSharpBible/Calc/Calc64WFTests/ViewModels/FrmCalc64MainViewModelTests.cs index 7ce3bd0aa..e77de154a 100644 --- a/CSharpBible/Calc/Calc64WFTests/ViewModels/FrmCalc64MainViewModelTests.cs +++ b/CSharpBible/Calc/Calc64WFTests/ViewModels/FrmCalc64MainViewModelTests.cs @@ -1,6 +1,9 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Calc64Base.Models.Interfaces; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using NSubstitute; using System; using System.ComponentModel; +using System.Drawing; using System.Windows.Forms; namespace Calc64WF.ViewModel.Tests @@ -24,6 +27,7 @@ public class FrmCalc64MainViewModelTests /// #pragma warning disable CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Erwägen Sie die Deklaration als Nullable. private FrmCalc64MainViewModel _ModelView; + private ICalculator _calc; #pragma warning restore CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Erwägen Sie die Deklaration als Nullable. /// @@ -33,8 +37,9 @@ public class FrmCalc64MainViewModelTests [TestInitialize] public void TestInitialize() { + _calc= Substitute.For(); ClearResults(); - _ModelView = new FrmCalc64MainViewModel(); + _ModelView = new FrmCalc64MainViewModel(_calc); _ModelView.PropertyChanged += MainWindow_VM_PropChanged; } @@ -83,7 +88,7 @@ public void MainWindow_VM_NumButton(string sButtons, int iPCCount, int iExpAkk, foreach (var button in sButtons) { if (button >= '0' && button <= '9') - _ModelView.btnNummber_Click(this, $"{button}", new EventArgs()); + _ModelView.NumberCommand.Execute( $"{button}"); } Assert.AreEqual(iPCCount, _PropChangedCount); Assert.AreEqual(iExpAkk, _ModelView.Accumulator); @@ -138,7 +143,7 @@ public void MainWindow_VM_OpButton(string sButtons, long iAcc, int iPCCount, lon foreach (var button in sButtons) { if (button >= '0' && button <= '9') - _ModelView.btnOperator_Click(this, $"-{button}", new EventArgs()); + _ModelView.OperationCommand.Execute($"-{button}"); } Assert.AreEqual(iPCCount, _PropChangedCount, $"Test: {sButtons}.PCCount"); diff --git a/CSharpBible/Calc/Calc64_Wpf/App.xaml.cs b/CSharpBible/Calc/Calc64_Wpf/App.xaml.cs index 4115edfbb..9d50ab890 100644 --- a/CSharpBible/Calc/Calc64_Wpf/App.xaml.cs +++ b/CSharpBible/Calc/Calc64_Wpf/App.xaml.cs @@ -1,7 +1,10 @@ using System.Windows; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using System; +using Calc64Base.Models.Interfaces; +using Calc64Base.Models; +using BaseLib.Helper; namespace Calc64_Wpf diff --git a/CSharpBible/Calc/Calc64_Wpf/Calc64_Wpf.csproj b/CSharpBible/Calc/Calc64_Wpf/Calc64_Wpf.csproj index f01a3fec3..5af96d16e 100644 --- a/CSharpBible/Calc/Calc64_Wpf/Calc64_Wpf.csproj +++ b/CSharpBible/Calc/Calc64_Wpf/Calc64_Wpf.csproj @@ -19,7 +19,7 @@ - + diff --git a/CSharpBible/ConsoleMouseApp/ConsoleMouseApp.csproj b/CSharpBible/ConsoleMouseApp/ConsoleMouseApp.csproj index d86f09793..909822a7a 100644 --- a/CSharpBible/ConsoleMouseApp/ConsoleMouseApp.csproj +++ b/CSharpBible/ConsoleMouseApp/ConsoleMouseApp.csproj @@ -2,7 +2,7 @@ Exe - net462-windows;net472-windows;net481-windows;net48-windows + net462;net472;net481;net48 true @@ -25,6 +25,7 @@ + diff --git a/CSharpBible/ConsoleMouseApp/ConsoleMouseApp_net.csproj b/CSharpBible/ConsoleMouseApp/ConsoleMouseApp_net.csproj index 8fc91ff14..c14d5d73a 100644 --- a/CSharpBible/ConsoleMouseApp/ConsoleMouseApp_net.csproj +++ b/CSharpBible/ConsoleMouseApp/ConsoleMouseApp_net.csproj @@ -31,6 +31,7 @@ + \ No newline at end of file diff --git a/CSharpBible/ConsoleMouseApp/Program.cs b/CSharpBible/ConsoleMouseApp/Program.cs index daeef372e..2239bbd83 100644 --- a/CSharpBible/ConsoleMouseApp/Program.cs +++ b/CSharpBible/ConsoleMouseApp/Program.cs @@ -17,6 +17,7 @@ using ConsoleLib; using System.Windows.Forms; using ConsoleMouseApp.View; +using ConsoleLib.Interfaces; namespace ConsoleMouseApp { @@ -48,7 +49,7 @@ static Program() App = new ConsoleMouseView(); // t.Draw(10, 40, ConsoleColor.Gray); - Mouse.parent = App; + Mouse.Parent = App; Mouse.Set(0, 0, " "); Mouse.BackColor = ConsoleColor.Red; @@ -68,7 +69,7 @@ static void Main(string[] args) App.Run(); Console.Write("Programm end ..."); - ExtendedConsole.Stop(); + ConsoleFramework.ExtendedConsole.Stop(); } #if NET5_0_OR_GREATER @@ -85,21 +86,17 @@ private static void App_CanvasResize(object sender, Point e) if (App == null) return; var cl = ConsoleFramework.Canvas.ClipRect; cl.Inflate(-3, -3); - App.dimension = cl; + App.Dimension = cl; } -#if NET5_0_OR_GREATER - private static void App_MouseMove(object? sender, MouseEventArgs e) -#else /// /// Handles the MouseMove event of the App control. /// /// The source of the event. /// The instance containing the event data. - private static void App_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e) -#endif + private static void App_MouseMove(object? sender, IMouseEvent e) { - Mouse.Set(Point.Subtract(e.Location, (Size?)Mouse.parent?.position ?? Size.Empty)); + Mouse.Set(Point.Subtract(e.MousePos, (Size?)Mouse.Parent?.Position ?? Size.Empty)); } #endregion diff --git a/CSharpBible/ConsoleMouseApp/View/ConsoleMouseView.cs b/CSharpBible/ConsoleMouseApp/View/ConsoleMouseView.cs index ff2f13039..bafa5fdab 100644 --- a/CSharpBible/ConsoleMouseApp/View/ConsoleMouseView.cs +++ b/CSharpBible/ConsoleMouseApp/View/ConsoleMouseView.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using ConsoleLib; +using ConsoleLib.Interfaces; using System; using System.Drawing; @@ -49,20 +50,20 @@ public ConsoleMouseView() var cl = ConsoleFramework.Canvas.ClipRect; cl.Inflate(-3, -3); - visible = false; - Boarder = ConsoleFramework.singleBoarder; + Visible = false; + Border = ConsoleFramework.singleBorder; ForeColor = ConsoleColor.Gray; BackColor = ConsoleColor.DarkGray; BoarderColor = ConsoleColor.Green; - dimension = cl; + Dimension = cl; One = new ConsoleLib.CommonControls.Button { - parent = this, + Parent = this, ForeColor = ConsoleColor.White, BackColor = ConsoleColor.Gray, - shadow = true, - position = new Point(5, 10), + Shadow = true, + Position = new Point(5, 10), Text = "░░1░░" }; One.OnClick += One_Click; @@ -71,15 +72,15 @@ public ConsoleMouseView() lblMousePos = new ConsoleLib.CommonControls.Label { - parent = this, + Parent = this, ForeColor = ConsoleColor.Gray, ParentBackground = true, - position = new Point(40, 2), + Position = new Point(40, 2), Text = "lblMousePos", size = new Size(15, 1) }; - visible = true; + Visible = true; OnMouseMove += App_MouseMove; } @@ -93,33 +94,33 @@ private ConsoleLib.CommonControls.Panel CreatePanel(Rectangle cl) { var result = new ConsoleLib.CommonControls.Panel { - parent = this, - Boarder = ConsoleFramework.doubleBoarder, + Parent = this, + Border = ConsoleFramework.doubleBoarder, ForeColor = ConsoleColor.Blue, BackColor = ConsoleColor.DarkBlue, BoarderColor = ConsoleColor.Green, - dimension = cl, - shadow = true + Dimension = cl, + Shadow = true }; var btnOK = new ConsoleLib.CommonControls.Button { - parent = result, + Parent = result, ForeColor = ConsoleColor.White, BackColor = ConsoleColor.Gray, - shadow = true, - position = new Point(2, 2), + Shadow = true, + Position = new Point(2, 2), Text = "░░░OK░░░", }; btnOK.OnClick += btnOK_Click; var btnCancel = new ConsoleLib.CommonControls.Button { - parent = result, + Parent = result, ForeColor = ConsoleColor.White, BackColor = ConsoleColor.Gray, - shadow = true, - position = new Point(14, 2), + Shadow = true, + Position = new Point(14, 2), Text = "░Cancel░", }; btnCancel.OnClick += btnCancel_Click; @@ -127,19 +128,15 @@ private ConsoleLib.CommonControls.Panel CreatePanel(Rectangle cl) return result; } -#if NET5_0_OR_GREATER - private void App_MouseMove(object? sender, System.Windows.Forms.MouseEventArgs e) -#else /// /// Handles the MouseMove event of the App control. /// /// The source of the event. /// The instance containing the event data. - private void App_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e) -#endif + private void App_MouseMove(object sender,IMouseEvent e) { if (lblMousePos == null) return; - lblMousePos.Text = e.Location.ToString(); + lblMousePos.Text = e.MousePos.ToString(); } #if NET5_0_OR_GREATER diff --git a/CSharpBible/DB/FoxCon/FoxCon.csproj b/CSharpBible/DB/FoxCon/FoxCon.csproj index 23de3cf0e..93febc074 100644 --- a/CSharpBible/DB/FoxCon/FoxCon.csproj +++ b/CSharpBible/DB/FoxCon/FoxCon.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/CSharpBible/DB/FoxCon/Model/FoxConMain.cs b/CSharpBible/DB/FoxCon/Model/FoxConMain.cs index 3b5f10f8b..2c470e401 100644 --- a/CSharpBible/DB/FoxCon/Model/FoxConMain.cs +++ b/CSharpBible/DB/FoxCon/Model/FoxConMain.cs @@ -1,4 +1,8 @@ -namespace FoxCon.Model +using OpenQA.Selenium; +using OpenQA.Selenium.Edge; +using OpenQA.Selenium.Support.UI; + +namespace FoxCon.Model { public static class FoxConMain { diff --git a/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj b/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj index 30488ea38..4fc5317fd 100644 --- a/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj +++ b/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj @@ -2,7 +2,7 @@ WinExe - net481-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net481;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows enable true AnyCPU;x86 @@ -22,7 +22,7 @@ - + diff --git a/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj b/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj index ffc14cfd6..953040dbd 100644 --- a/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj +++ b/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows disable enable diff --git a/CSharpBible/DB/OLEDBTest/OleDbTest.csproj b/CSharpBible/DB/OLEDBTest/OleDbTest.csproj index 6aa100e1b..a8df0f700 100644 --- a/CSharpBible/DB/OLEDBTest/OleDbTest.csproj +++ b/CSharpBible/DB/OLEDBTest/OleDbTest.csproj @@ -13,7 +13,7 @@ - + diff --git a/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj b/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj index 043e01d8e..043257947 100644 --- a/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj +++ b/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj @@ -13,7 +13,8 @@ - + + diff --git a/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj b/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj index c51afa54a..766f29fb8 100644 --- a/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj +++ b/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj @@ -1,8 +1,8 @@ - + Exe - net462-windows;net472-windows;net48-windows;net481-windows;net6.0;net7.0;net8.0 + net462;net472;net48;net481;net6.0;net7.0;net8.0 @@ -10,7 +10,7 @@ - + diff --git a/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj b/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj index 69a148d29..598f2ace2 100644 --- a/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj +++ b/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows;net6.0;net7.0;net8.0 + net462;net472;net48;net481;net6.0;net7.0;net8.0 true @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/DataGridEx/DataGridEx.csproj b/CSharpBible/DataGridEx/DataGridEx.csproj index a6274b940..ef983214b 100644 --- a/CSharpBible/DataGridEx/DataGridEx.csproj +++ b/CSharpBible/DataGridEx/DataGridEx.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows WinExe true true diff --git a/CSharpBible/DataGridExWPF/DataGridExWPF.csproj b/CSharpBible/DataGridExWPF/DataGridExWPF.csproj index 8266ffdee..54bf97203 100644 --- a/CSharpBible/DataGridExWPF/DataGridExWPF.csproj +++ b/CSharpBible/DataGridExWPF/DataGridExWPF.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows WinExe true true diff --git a/CSharpBible/DataGridExWPF/Visual/MainWindow.xaml b/CSharpBible/DataGridExWPF/Visual/MainWindow.xaml index 96f549962..d178e03d6 100644 --- a/CSharpBible/DataGridExWPF/Visual/MainWindow.xaml +++ b/CSharpBible/DataGridExWPF/Visual/MainWindow.xaml @@ -14,10 +14,9 @@ - + diff --git a/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj b/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj index 9b0fc2204..1cb39c3eb 100644 --- a/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj +++ b/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj @@ -14,10 +14,10 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -25,7 +25,7 @@ - + diff --git a/CSharpBible/Display_Test/Display_netTest.csproj b/CSharpBible/Display_Test/Display_netTest.csproj index b499714b8..3ba8ecf37 100644 --- a/CSharpBible/Display_Test/Display_netTest.csproj +++ b/CSharpBible/Display_Test/Display_netTest.csproj @@ -12,6 +12,6 @@ - + diff --git a/CSharpBible/Games/Game_Base/Game_Base.csproj b/CSharpBible/Games/Game_Base/Game_Base.csproj index 5a691f8ae..3f97e021e 100644 --- a/CSharpBible/Games/Game_Base/Game_Base.csproj +++ b/CSharpBible/Games/Game_Base/Game_Base.csproj @@ -2,7 +2,7 @@ Library - net481;net48;net472;net462 + net481;net48;net472;net462;net6.0;net7.0;net8.0;net9.0 diff --git a/CSharpBible/Games/Game_Base/Game_Base_net.csproj b/CSharpBible/Games/Game_Base/Game_Base_net.csproj deleted file mode 100644 index 62b5f38c4..000000000 --- a/CSharpBible/Games/Game_Base/Game_Base_net.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - Library - net6.0;net7.0;net8.0;net9.0 - - - - - - - - - diff --git a/CSharpBible/Games/Snake_Base/Snake_Base.csproj b/CSharpBible/Games/Snake_Base/Snake_Base.csproj index 6c1852d00..631ac3846 100644 --- a/CSharpBible/Games/Snake_Base/Snake_Base.csproj +++ b/CSharpBible/Games/Snake_Base/Snake_Base.csproj @@ -2,8 +2,8 @@ Library - net481;net48;net472;net462 - + net481;net48;net472;net462;net6.0;net7.0;net8.0;net9.0 + diff --git a/CSharpBible/Games/Snake_Base/Snake_Base_net.csproj b/CSharpBible/Games/Snake_Base/Snake_Base_net.csproj deleted file mode 100644 index 7e46e07a3..000000000 --- a/CSharpBible/Games/Snake_Base/Snake_Base_net.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - Library - net6.0;net7.0;net8.0;net9.0 - - - - - - - - - - - - - - - - - diff --git a/CSharpBible/Games/Snake_BaseTests/Snake_Base_netTests.csproj b/CSharpBible/Games/Snake_BaseTests/Snake_BaseTests.csproj similarity index 74% rename from CSharpBible/Games/Snake_BaseTests/Snake_Base_netTests.csproj rename to CSharpBible/Games/Snake_BaseTests/Snake_BaseTests.csproj index 98cc438e4..8bc00e8af 100644 --- a/CSharpBible/Games/Snake_BaseTests/Snake_Base_netTests.csproj +++ b/CSharpBible/Games/Snake_BaseTests/Snake_BaseTests.csproj @@ -1,28 +1,28 @@ - - - - net6.0;net7.0;net8.0 - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - + + + + net481;net48;net472;net462;net6.0;net7.0;net8.0;net9.0 + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/CSharpBible/Games/Snake_Console/Snake_Console.csproj b/CSharpBible/Games/Snake_Console/Snake_Console.csproj index b4cb8a6c2..62799c255 100644 --- a/CSharpBible/Games/Snake_Console/Snake_Console.csproj +++ b/CSharpBible/Games/Snake_Console/Snake_Console.csproj @@ -2,7 +2,7 @@ Exe - net481;net48;net472;net462 + net481;net48;net472;net462;net6.0;net7.0;net8.0;net9.0 diff --git a/CSharpBible/Games/Snake_Console/Snake_Console_net.csproj b/CSharpBible/Games/Snake_Console/Snake_Console_net.csproj deleted file mode 100644 index 6186a5485..000000000 --- a/CSharpBible/Games/Snake_Console/Snake_Console_net.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - Exe - net6.0;net7.0;net8.0;net9.0 - - - - - - - - - - - - - - diff --git a/CSharpBible/Games/Sokoban/Sokoban.csproj b/CSharpBible/Games/Sokoban/Sokoban.csproj index a381e614a..3c62ec140 100644 --- a/CSharpBible/Games/Sokoban/Sokoban.csproj +++ b/CSharpBible/Games/Sokoban/Sokoban.csproj @@ -19,11 +19,8 @@ - - - - - + + diff --git a/CSharpBible/Games/Sokoban_Base/Sokoban_Base_win.csproj b/CSharpBible/Games/Sokoban_Base/Sokoban_Base_win.csproj index be980572d..eb8791b2a 100644 --- a/CSharpBible/Games/Sokoban_Base/Sokoban_Base_win.csproj +++ b/CSharpBible/Games/Sokoban_Base/Sokoban_Base_win.csproj @@ -2,7 +2,7 @@ Library - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 diff --git a/CSharpBible/Games/Sudoku_Base/Sudoku_Base.csproj b/CSharpBible/Games/Sudoku_Base/Sudoku_Base.csproj index 34ea0274f..ec08dd491 100644 --- a/CSharpBible/Games/Sudoku_Base/Sudoku_Base.csproj +++ b/CSharpBible/Games/Sudoku_Base/Sudoku_Base.csproj @@ -2,8 +2,9 @@ Library - net481-windows;net48-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows - enable + net481;net48;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + true + enable diff --git a/CSharpBible/Games/Sudoku_BaseTests/Sudoku_BaseTests.csproj b/CSharpBible/Games/Sudoku_BaseTests/Sudoku_BaseTests.csproj index bd5343ecf..37975f150 100644 --- a/CSharpBible/Games/Sudoku_BaseTests/Sudoku_BaseTests.csproj +++ b/CSharpBible/Games/Sudoku_BaseTests/Sudoku_BaseTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net48-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net481;net48;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows true false AnyCPU;x86 diff --git a/CSharpBible/Games/Tetris_Base/Tetris_Base.csproj b/CSharpBible/Games/Tetris_Base/Tetris_Base.csproj index 4742e9a27..1ec5cc7ed 100644 --- a/CSharpBible/Games/Tetris_Base/Tetris_Base.csproj +++ b/CSharpBible/Games/Tetris_Base/Tetris_Base.csproj @@ -1,8 +1,8 @@ - net6.0;net7.0;net8.0;net9.0 - Exe + net481;net48;net472;net462;net6.0;net7.0;net8.0;net9.0 + Exe @@ -25,8 +25,5 @@ - - - diff --git a/CSharpBible/Games/VTileEdit/VTileEdit.csproj b/CSharpBible/Games/VTileEdit/VTileEdit.csproj index 2047f31fa..c3f814330 100644 --- a/CSharpBible/Games/VTileEdit/VTileEdit.csproj +++ b/CSharpBible/Games/VTileEdit/VTileEdit.csproj @@ -11,8 +11,9 @@ - - + + + diff --git a/CSharpBible/Games/VTileEditTests/VTileEditTests.csproj b/CSharpBible/Games/VTileEditTests/VTileEditTests.csproj index 9574ab07b..914011050 100644 --- a/CSharpBible/Games/VTileEditTests/VTileEditTests.csproj +++ b/CSharpBible/Games/VTileEditTests/VTileEditTests.csproj @@ -19,11 +19,11 @@ - + - + - + diff --git a/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Base.csproj b/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Base.csproj index ab820500f..fb59ff46b 100644 --- a/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Base.csproj +++ b/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Base.csproj @@ -19,8 +19,7 @@ - - + diff --git a/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Base_win.csproj b/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Base_win.csproj deleted file mode 100644 index ae96d7f86..000000000 --- a/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Base_win.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - net462-windows;net472-windows;net48-windows;net481-windows - Library - - - - - - - - - - - - - - - - - - - - - - True - True - Resource1.resx - - - - - - ResXFileCodeGenerator - Resource1.Designer.cs - - - diff --git a/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Console.csproj b/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Console.csproj index 5217d66f9..249dfcc8d 100644 --- a/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Console.csproj +++ b/CSharpBible/Games/Werner_Flaschbier/Werner_Flaschbier_Console.csproj @@ -19,12 +19,9 @@ - - - - - - + + + diff --git a/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_BaseTests.csproj b/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_BaseTests.csproj index 74587a20d..6a2cfac4e 100644 --- a/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_BaseTests.csproj +++ b/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_BaseTests.csproj @@ -7,6 +7,9 @@ + + + @@ -21,8 +24,7 @@ - - + diff --git a/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_ConsoleTests.csproj b/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_ConsoleTests.csproj index 2336c77e9..dca4fe735 100644 --- a/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_ConsoleTests.csproj +++ b/CSharpBible/Games/Werner_Flaschbier_BaseTests/Werner_Flaschbier_ConsoleTests.csproj @@ -19,7 +19,6 @@ - diff --git a/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj b/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj index 1d3a2eb36..4976071bb 100644 --- a/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj +++ b/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj @@ -10,7 +10,6 @@ - diff --git a/CSharpBible/Graphics/CanvasWPF/CanvasWPF.csproj b/CSharpBible/Graphics/CanvasWPF/CanvasWPF.csproj index e412a8960..fdb52991e 100644 --- a/CSharpBible/Graphics/CanvasWPF/CanvasWPF.csproj +++ b/CSharpBible/Graphics/CanvasWPF/CanvasWPF.csproj @@ -2,7 +2,7 @@ WinExe - net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows true diff --git a/CSharpBible/Graphics/CanvasWPF/Properties/Resources.resx b/CSharpBible/Graphics/CanvasWPF/Properties/Resources.resx index 6c09ac859..6ece0fe2e 100644 --- a/CSharpBible/Graphics/CanvasWPF/Properties/Resources.resx +++ b/CSharpBible/Graphics/CanvasWPF/Properties/Resources.resx @@ -125,7 +125,7 @@ Graphics #01: Demonstation for the canvas in WPF - ..\ViewModel\MainWindowViewmodel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + ..\ViewModels\MainWindowViewmodel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 Canvas WPF diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj index f8c524ce6..f01b9703e 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj @@ -2,7 +2,7 @@ WinExe - net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows + net472;net48;net481;net6.0-windows;net7.0-windows true diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.Designer.cs b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.Designer.cs index 06c4d9c91..050ee8eba 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.Designer.cs +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.Designer.cs @@ -88,23 +88,22 @@ public static string Description { /// /// Sucht eine lokalisierte Zeichenfolge, die using System; ///using MVVM.ViewModel; - ///using System.Collections.Generic; - ///using System.Linq; - ///using System.Text; ///using System.Threading.Tasks; ///using System.Collections.ObjectModel; ///using System.Threading; - ///using BaseLib.Helper.MVVM; ///using CommunityToolkit.Mvvm.ComponentModel; ///using CommunityToolkit.Mvvm.Input; + ///using BaseLib.Interfaces; + ///using BaseLib.Models.Interfaces; + ///using BaseLib.Models; /// ///namespace CanvasWPF2_CTItemTemplateSelector.ViewModel ///{ - /// /// <summary> - /// /// Class MainWindowViewModel. - /// /// Implements the <see cref="BaseViewModel" /> - /// /// </summary> - /// /// <seealso cref= [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt. + /// /// <summary> + /// /// Class MainWindowViewModel. + /// /// Implements the <see cref="BaseViewModel" /> + /// /// </summary> + /// /// <seealso cref="Bas [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt. /// public static string MainWindowViewModel { get { diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.resx b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.resx index e4fc17d3a..62eff3e82 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.resx +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Properties/Resources.resx @@ -125,7 +125,7 @@ Graphics #01: Demonstation for the canvas in WPF using Comunity-Toolkit - ..\ViewModel\MainWindowViewmodel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + ..\ViewModels\MainWindowViewmodel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 CT Canvas WPF diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/ViewModels/MainWindowViewmodel.cs b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/ViewModels/MainWindowViewmodel.cs index bd8efb840..400c340b4 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/ViewModels/MainWindowViewmodel.cs +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/ViewModels/MainWindowViewmodel.cs @@ -6,6 +6,8 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace CanvasWPF2_CTItemTemplateSelector.ViewModel { diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj index b62c1cbe1..f718ecf6b 100644 --- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj +++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj @@ -2,7 +2,7 @@ WinExe - net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows true diff --git a/CSharpBible/Graphics/CanvasWPF_CT/CanvasWPF_CT.csproj b/CSharpBible/Graphics/CanvasWPF_CT/CanvasWPF_CT.csproj index 0bf6927a9..8019462ba 100644 --- a/CSharpBible/Graphics/CanvasWPF_CT/CanvasWPF_CT.csproj +++ b/CSharpBible/Graphics/CanvasWPF_CT/CanvasWPF_CT.csproj @@ -2,7 +2,7 @@ WinExe - net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows + net472;net48;net481;net6.0-windows;net7.0-windows true diff --git a/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj b/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj index ca8ca8776..20d674004 100644 --- a/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj +++ b/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj @@ -2,7 +2,7 @@ WinExe - net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows true diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/App.xaml.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/App.xaml.cs index 45ff8a279..690d73264 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/App.xaml.cs +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/App.xaml.cs @@ -1,11 +1,10 @@ using System.Windows; -namespace MVVM_Converter_CTDrawGrid +namespace MVVM_Converter_CTDrawGrid; + +/// +/// Interaction logic for App.xaml +/// +public partial class App : Application { - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } } diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/MVVM_Converter_CTDrawGrid.csproj b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/MVVM_Converter_CTDrawGrid.csproj index 699b51375..3c4cc3a2e 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/MVVM_Converter_CTDrawGrid.csproj +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/MVVM_Converter_CTDrawGrid.csproj @@ -2,15 +2,17 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows true true - - + + + + diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/DrawGridModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/DrawGridModel.cs new file mode 100644 index 000000000..c61539915 --- /dev/null +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/DrawGridModel.cs @@ -0,0 +1,59 @@ +using BaseLib.Helper; +using CommunityToolkit.Mvvm.ComponentModel; +using MVVM.ViewModel; +using MVVM_Converter_CTDrawGrid.Models.Interfaces; +using System; +using Werner_Flaschbier_Base.Model; + +namespace MVVM_Converter_CTDrawGrid.Model; + +/// +/// Class DrawGridModel. +/// +public partial class DrawGridModel : BaseViewModelCT , IDrawGridModel +{ + /// + /// Gets or sets the act level. + /// + /// The act level. + [ObservableProperty] + private int _actLevel; + + /// + /// Gets or sets the level data. + /// + /// The level data. + [ObservableProperty] + private FieldDef[]? _levelData; + + + /// + /// Loads the level. + /// + public void LoadLevel() + { + _actLevel = 0; + LevelData = LevelDefs.GetLevel(0); + } + + /// + /// Nexts the level. + /// + public void NextLevel() + { + if (ActLevel < LevelDefs.Count) + ActLevel += 1; + LevelData = LevelDefs.GetLevel(ActLevel); + } + + /// + /// Previouses the level. + /// + public void PrevLevel() + { + if (ActLevel > 0) + ActLevel -= 1; + LevelData = LevelDefs.GetLevel(ActLevel); + } + +} diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/Interfaces/IDrawGridModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/Interfaces/IDrawGridModel.cs new file mode 100644 index 000000000..af558c45b --- /dev/null +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/Interfaces/IDrawGridModel.cs @@ -0,0 +1,14 @@ +using System.ComponentModel; +using Werner_Flaschbier_Base.Model; + +namespace MVVM_Converter_CTDrawGrid.Models.Interfaces; + +public interface IDrawGridModel :INotifyPropertyChanged +{ + FieldDef[]? LevelData { get; set; } + int ActLevel { get; set; } + + void LoadLevel(); + void NextLevel(); + void PrevLevel(); +} \ No newline at end of file diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/Model.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/Model.cs deleted file mode 100644 index 4e992c2fe..000000000 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Model/Model.cs +++ /dev/null @@ -1,64 +0,0 @@ -using BaseLib.Helper; -using System; -using Werner_Flaschbier_Base.Model; - -namespace MVVM_Converter_CTDrawGrid.Model; - -/// -/// Class Model. -/// -public static class Model -{ - private static int actLevel; - private static FieldDef[]? _levelData; - - /// - /// Gets or sets the level data. - /// - /// The level data. - public static FieldDef[]? LevelData { get => _levelData; set => PropertyHelper.SetProperty(ref _levelData,value, OnPropertyChanged); } - /// - /// Gets or sets the act level. - /// - /// The act level. - public static int ActLevel { get => actLevel; set => PropertyHelper.SetProperty(ref actLevel, value, OnPropertyChanged); } - /// - /// Gets or sets the property changed. - /// - /// The property changed. - public static EventHandler<(string, object, object)>? PropertyChanged { get; set; } - - /// - /// Loads the level. - /// - public static void LoadLevel() - { - actLevel = 0; - LevelData = LevelDefs.GetLevel(0); - } - - /// - /// Nexts the level. - /// - public static void NextLevel() - { - if (ActLevel < LevelDefs.Count) - ActLevel += 1; - LevelData = LevelDefs.GetLevel(ActLevel); - } - - /// - /// Previouses the level. - /// - public static void PrevLevel() - { - if (ActLevel > 0) - ActLevel -= 1; - LevelData = LevelDefs.GetLevel(ActLevel); - } - - private static void OnPropertyChanged(string arg1, T arg2, T arg3) - { - PropertyChanged?.Invoke(null, (arg1, arg2!, arg3!)); - } -} diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Resources.Designer.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Resources.Designer.cs index fa3c9a609..97afdb004 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Resources.Designer.cs +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Resources.Designer.cs @@ -89,7 +89,7 @@ public static string PlotFrameView { /// Sucht eine lokalisierte Zeichenfolge, die using CommunityToolkit.Mvvm.ComponentModel; ///using MVVM.ViewModel; ///using System.Drawing; - ///using Werner_Flaschbier_Base.Model; + ///using Werner_Flaschbier_Base.DrawGridModel; /// ///namespace MVVM_Converter_CTDrawGrid.ViewModel ///{ diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/DrawGridViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/DrawGridViewModel.cs index f4d9ecbe4..5c633aa2c 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/DrawGridViewModel.cs +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/DrawGridViewModel.cs @@ -1,5 +1,8 @@ -using CommunityToolkit.Mvvm.Input; +using BaseLib.Helper; +using CommunityToolkit.Mvvm.Input; +using BaseLib.Helper; using MVVM.ViewModel; +using MVVM_Converter_CTDrawGrid.Models.Interfaces; using System; using System.Reflection; @@ -12,6 +15,8 @@ namespace MVVM_Converter_CTDrawGrid.ViewModel; /// public partial class DrawGridViewModel:BaseViewModelCT { + private IDrawGridModel _drawGridModel; + /// /// Gets or sets the show client. /// @@ -21,9 +26,12 @@ public partial class DrawGridViewModel:BaseViewModelCT /// /// Initializes a new instance of the class. /// - public DrawGridViewModel() + public DrawGridViewModel(): this(IoC.GetRequiredService()) { - + } + public DrawGridViewModel(IDrawGridModel drawGridModel) + { + this._drawGridModel = drawGridModel; } /// Gets the plot frame source. @@ -36,20 +44,20 @@ public DrawGridViewModel() /// The load level command. [RelayCommand] private void LoadLevel() - => Model.Model.LoadLevel(); + => _drawGridModel.LoadLevel(); /// /// Gets or sets the next level command. /// /// The next level command. [RelayCommand] private void NextLevel() - => Model.Model.NextLevel(); + => _drawGridModel.NextLevel(); /// /// Gets or sets the previous level command. /// /// The previous level command. [RelayCommand] private void PrevLevel() - => Model.Model.PrevLevel(); + => _drawGridModel.PrevLevel(); } diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/MainWindowViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/MainWindowViewModel.cs index 635dd30b0..d5fe1dfe5 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/MainWindowViewModel.cs +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/MainWindowViewModel.cs @@ -31,21 +31,21 @@ public MainWindowViewModel() /// The load level command. [RelayCommand] private void LoadLevel() - => Model.Model.LoadLevel(); + => _drawGridModel.LoadLevel(); /// /// Gets or sets the next level command. /// /// The next level command. [RelayCommand] private void NextLevel() - => Model.Model.NextLevel(); + => _drawGridModel.NextLevel(); /// /// Gets or sets the previous level command. /// /// The previous level command. [RelayCommand] private void PrevLevel() - => Model.Model.PrevLevel(); + => _drawGridModel.PrevLevel(); } } diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/PlotFrameViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/PlotFrameViewModel.cs index fb604d8b6..80c23be80 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/PlotFrameViewModel.cs +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModels/PlotFrameViewModel.cs @@ -1,5 +1,9 @@ -using CommunityToolkit.Mvvm.ComponentModel; +using BaseLib.Helper; +using CommunityToolkit.Mvvm.ComponentModel; using MVVM.ViewModel; +using MVVM_Converter_CTDrawGrid.Models.Interfaces; +using System; +using System.ComponentModel; using System.Drawing; using Werner_Flaschbier_Base.Model; @@ -19,7 +23,7 @@ public partial class PlotFrameViewModel : BaseViewModelCT /// /// Initializes a new instance of the class. /// - public PlotFrameViewModel() + public PlotFrameViewModel(IDrawGridModel drawGridModel) { var _tiles = new TileData[20]; for (int i = 0; i < 20; i++) @@ -30,12 +34,13 @@ public PlotFrameViewModel() _tiles[i].tileType = i % 9; } Tiles = _tiles; - Model.Model.PropertyChanged += ModelPropertyChanged; + drawGridModel.PropertyChanged += ModelPropertyChanged; } - private void ModelPropertyChanged(object? sender, (string, object, object) e) + private void ModelPropertyChanged(object sender, PropertyChangedEventArgs e) { - if (e.Item3 is FieldDef[] fd) + if ( e.PropertyName == nameof(IDrawGridModel.LevelData) && + sender.GetType().GetProperty(e.PropertyName).GetValue(sender) is FieldDef[] fd) { TileData[] result = new TileData[fd.Length]; for (int i = 0; i < fd.Length; i++) diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/MVVM_Converter_CTDrawGrid2.csproj b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/MVVM_Converter_CTDrawGrid2.csproj index 537a77f86..071ed46e7 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/MVVM_Converter_CTDrawGrid2.csproj +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/MVVM_Converter_CTDrawGrid2.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows true @@ -11,8 +11,7 @@ - - + diff --git a/CSharpBible/Graphics/MVVM_Converter_CTImgGrid/MVVM_Converter_CTImgGrid.csproj b/CSharpBible/Graphics/MVVM_Converter_CTImgGrid/MVVM_Converter_CTImgGrid.csproj index c6a57748a..dff9ac470 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTImgGrid/MVVM_Converter_CTImgGrid.csproj +++ b/CSharpBible/Graphics/MVVM_Converter_CTImgGrid/MVVM_Converter_CTImgGrid.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows true false @@ -12,8 +12,7 @@ - - + diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid/MVVM_Converter_DrawGrid.csproj b/CSharpBible/Graphics/MVVM_Converter_DrawGrid/MVVM_Converter_DrawGrid.csproj index 92d770be5..26441183a 100644 --- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid/MVVM_Converter_DrawGrid.csproj +++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid/MVVM_Converter_DrawGrid.csproj @@ -2,15 +2,14 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows true true - - + diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid2/MVVM_Converter_DrawGrid2.csproj b/CSharpBible/Graphics/MVVM_Converter_DrawGrid2/MVVM_Converter_DrawGrid2.csproj index ca7cc21ff..093647867 100644 --- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid2/MVVM_Converter_DrawGrid2.csproj +++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid2/MVVM_Converter_DrawGrid2.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows true @@ -16,8 +16,7 @@ - - + diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.resx b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.resx index 618b2c0cf..9e5eae870 100644 --- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.resx +++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.resx @@ -125,7 +125,7 @@ ..\Views\PlotFrame.xaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - ..\ViewModel\PlotFrameViewModel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + ..\ViewModels\PlotFrameViewModel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 MVVM Graphics: Draw-grid diff --git a/CSharpBible/Graphics/MVVM_Converter_ImgGrid/MVVM_Converter_ImgGrid.csproj b/CSharpBible/Graphics/MVVM_Converter_ImgGrid/MVVM_Converter_ImgGrid.csproj index da78ad3e2..19a1ebe5f 100644 --- a/CSharpBible/Graphics/MVVM_Converter_ImgGrid/MVVM_Converter_ImgGrid.csproj +++ b/CSharpBible/Graphics/MVVM_Converter_ImgGrid/MVVM_Converter_ImgGrid.csproj @@ -2,15 +2,14 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net462;net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows true false - - + diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/MVVM_DynamicShape.csproj b/CSharpBible/Graphics/MVVM_DynamicShape/MVVM_DynamicShape.csproj index b75cb07f0..70d54964f 100644 --- a/CSharpBible/Graphics/MVVM_DynamicShape/MVVM_DynamicShape.csproj +++ b/CSharpBible/Graphics/MVVM_DynamicShape/MVVM_DynamicShape.csproj @@ -2,7 +2,7 @@ WinExe - net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net472;net48;net481;net6.0-windows;net7.0-windows;net8.0-windows true diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/DynamicShapeViewModel.cs b/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/DynamicShapeViewModel.cs index 3c283477b..2ba86936d 100644 --- a/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/DynamicShapeViewModel.cs +++ b/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/DynamicShapeViewModel.cs @@ -1,7 +1,8 @@ using System.Collections.ObjectModel; +using BaseLib.Helper; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_DynamicShape.Model; using MVVM_DynamicShape.Models.Interfaces; diff --git a/CSharpBible/Graphics/MVVM_ImageHandling/MVVM_ImageHandling.csproj b/CSharpBible/Graphics/MVVM_ImageHandling/MVVM_ImageHandling.csproj index d08024a3a..c71e13086 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandling/MVVM_ImageHandling.csproj +++ b/CSharpBible/Graphics/MVVM_ImageHandling/MVVM_ImageHandling.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs b/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs index 4c0081345..59a9daca4 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs +++ b/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs @@ -1,6 +1,7 @@ using System; +using BaseLib.Helper; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_ImageHandling.Models; namespace MVVM_ImageHandling.Tests diff --git a/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj b/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj index 54d67e2a4..9efb08016 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj +++ b/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandling_netTests.csproj b/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandling_netTests.csproj index 83c74c257..6b0608d47 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandling_netTests.csproj +++ b/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandling_netTests.csproj @@ -8,10 +8,10 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Graphics/PermutationTests/PermutationTests.csproj b/CSharpBible/Graphics/PermutationTests/PermutationTests.csproj index 1e94760d5..79a47307c 100644 --- a/CSharpBible/Graphics/PermutationTests/PermutationTests.csproj +++ b/CSharpBible/Graphics/PermutationTests/PermutationTests.csproj @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Graphics/PolySpline/PolySpline.csproj b/CSharpBible/Graphics/PolySpline/PolySpline.csproj index 43bd89f85..3eef31ace 100644 --- a/CSharpBible/Graphics/PolySpline/PolySpline.csproj +++ b/CSharpBible/Graphics/PolySpline/PolySpline.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/Graphics/Polyline/Polyline.csproj b/CSharpBible/Graphics/Polyline/Polyline.csproj index 5a880061b..58d5e0a85 100644 --- a/CSharpBible/Graphics/Polyline/Polyline.csproj +++ b/CSharpBible/Graphics/Polyline/Polyline.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/Graphics/Polyline/Polyline2.csproj b/CSharpBible/Graphics/Polyline/Polyline2.csproj index 6705e11b2..c1be6d99f 100644 --- a/CSharpBible/Graphics/Polyline/Polyline2.csproj +++ b/CSharpBible/Graphics/Polyline/Polyline2.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/Libraries/BaseLib/BaseLib.csproj b/CSharpBible/Libraries/BaseLib/BaseLib.csproj index 60f93c685..bfea5f3cb 100644 --- a/CSharpBible/Libraries/BaseLib/BaseLib.csproj +++ b/CSharpBible/Libraries/BaseLib/BaseLib.csproj @@ -2,8 +2,7 @@ Library - net481;net48;net472;net462 - true + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 True diff --git a/CSharpBible/Libraries/BaseLib/BaseLib_net.csproj b/CSharpBible/Libraries/BaseLib/BaseLib_net.csproj deleted file mode 100644 index 0dcf47367..000000000 --- a/CSharpBible/Libraries/BaseLib/BaseLib_net.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - Library - net6.0;net7.0;net8.0;net9.0;net481-windows;net48-windows;net472-windows;net462-windows - True - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharpBible/Libraries/BaseLib/Helper/IoC.cs b/CSharpBible/Libraries/BaseLib/Helper/IoC.cs index bdb9d9a53..b56f2f0ac 100644 --- a/CSharpBible/Libraries/BaseLib/Helper/IoC.cs +++ b/CSharpBible/Libraries/BaseLib/Helper/IoC.cs @@ -19,11 +19,6 @@ /// namespace BaseLib.Helper; -/// -/// Class IoC. -/// Implements the -/// -/// public class IoC { /// diff --git a/CSharpBible/Libraries/BaseLibTests/BaseLibTests.csproj b/CSharpBible/Libraries/BaseLibTests/BaseLibTests.csproj index 38a2a9faa..3d6d7e164 100644 --- a/CSharpBible/Libraries/BaseLibTests/BaseLibTests.csproj +++ b/CSharpBible/Libraries/BaseLibTests/BaseLibTests.csproj @@ -1,8 +1,8 @@  - net481;net48;net472;net462 - false + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 + false diff --git a/CSharpBible/Libraries/BaseLibTests/BaseLib_netTests.csproj b/CSharpBible/Libraries/BaseLibTests/BaseLib_netTests.csproj index 75e61830b..978dbeea9 100644 --- a/CSharpBible/Libraries/BaseLibTests/BaseLib_netTests.csproj +++ b/CSharpBible/Libraries/BaseLibTests/BaseLib_netTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0;net9.0;net481-windows;net48-windows;net472-windows;net462-windows + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 false @@ -19,7 +19,7 @@ - + diff --git a/CSharpBible/Libraries/CSFreeVision/CSFreeVision.csproj b/CSharpBible/Libraries/CSFreeVision/CSFreeVision.csproj index b29fbe62d..bea470d53 100644 --- a/CSharpBible/Libraries/CSFreeVision/CSFreeVision.csproj +++ b/CSharpBible/Libraries/CSFreeVision/CSFreeVision.csproj @@ -1,68 +1,25 @@ - - + + - Debug - AnyCPU - {05BBD8C1-C970-4B4B-AE79-892D25441E0C} + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 Library - Properties - CSFreeVision - CSFreeVision - ..\..\..\bin\$(MSBuildProjectName)\ - ..\..\..\obj\$(MSBuildProjectName)\ - ..\..\..\obj\$(MSBuildProjectName)\ - v4.8 - 512 - true + false + CSFreeVision + JC-Soft + CSFreeVision + Copyright © JC-Soft 2020 + 1.0.0.0 + 1.0.0.0 - - - true - full - false - ..\..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\..\bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - + Component - + Group.cs - - - - + Component - - - - \ No newline at end of file diff --git a/CSharpBible/Libraries/CSFreeVision/Class1.cs b/CSharpBible/Libraries/CSFreeVision/Class1.cs deleted file mode 100644 index a8bb7b560..000000000 --- a/CSharpBible/Libraries/CSFreeVision/Class1.cs +++ /dev/null @@ -1,27 +0,0 @@ -// *********************************************************************** -// Assembly : CSFreeVision -// Author : Mir -// Created : 12-19-2021 -// -// Last Modified By : Mir -// Last Modified On : 04-10-2020 -// *********************************************************************** -// -// Copyright © JC-Soft 2020 -// -// -// *********************************************************************** -/// -/// The CSFreeVision namespace. -/// -/// -namespace CSFreeVision -{ - /// - /// Class Class1. - /// - /// - public class Class1 - { - } -} diff --git a/CSharpBible/Libraries/CSFreeVision/Properties/AssemblyInfo.cs b/CSharpBible/Libraries/CSFreeVision/Properties/AssemblyInfo.cs index 909a787c5..fd27b7e3a 100644 --- a/CSharpBible/Libraries/CSFreeVision/Properties/AssemblyInfo.cs +++ b/CSharpBible/Libraries/CSFreeVision/Properties/AssemblyInfo.cs @@ -13,16 +13,6 @@ // *********************************************************************** using System.Reflection; using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("CSFreeVision")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("JC-Soft")] -[assembly: AssemblyProduct("CSFreeVision")] -[assembly: AssemblyCopyright("Copyright © JC-Soft 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -33,16 +23,3 @@ // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird [assembly: Guid("05bbd8c1-c970-4b4b-ae79-892d25441e0c")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -// indem Sie "*" wie unten gezeigt eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CSharpBible/Libraries/CommonDialogs/CommonDialogs.csproj b/CSharpBible/Libraries/CommonDialogs/CommonDialogs.csproj index 49c4117af..4d0655870 100644 --- a/CSharpBible/Libraries/CommonDialogs/CommonDialogs.csproj +++ b/CSharpBible/Libraries/CommonDialogs/CommonDialogs.csproj @@ -2,8 +2,8 @@ Library - net481-windows;net472-windows;net48-windows - $(TargetFrameWorks);net462-windows + net481;net472;net48 + $(TargetFrameWorks);net462 true true True diff --git a/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay.csproj b/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay.csproj index 5126ef5ab..cdf673c49 100644 --- a/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay.csproj +++ b/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay.csproj @@ -2,8 +2,8 @@ Library - net462;net472;net48;net481 - + net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462 + diff --git a/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay_win.csproj b/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay_win.csproj index ea6d69886..d4ea2fefe 100644 --- a/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay_win.csproj +++ b/CSharpBible/Libraries/ConsoleDisplay/ConsoleDisplay_win.csproj @@ -2,7 +2,7 @@ Library - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 @@ -20,7 +20,4 @@ - - - diff --git a/CSharpBible/Libraries/ConsoleLib/ConsoleLib.csproj b/CSharpBible/Libraries/ConsoleLib/ConsoleLib.csproj index ed46f2679..be31834be 100644 --- a/CSharpBible/Libraries/ConsoleLib/ConsoleLib.csproj +++ b/CSharpBible/Libraries/ConsoleLib/ConsoleLib.csproj @@ -1,7 +1,7 @@  - net481-windows;net48-windows;net472-windows;net462-windows + net481;net48;net472;net462 True @@ -18,10 +18,10 @@ - + - + \ No newline at end of file diff --git a/CSharpBible/Libraries/ConsoleLib/ConsoleLib_net.csproj b/CSharpBible/Libraries/ConsoleLib/ConsoleLib_net.csproj index 658ac968f..e83d4067c 100644 --- a/CSharpBible/Libraries/ConsoleLib/ConsoleLib_net.csproj +++ b/CSharpBible/Libraries/ConsoleLib/ConsoleLib_net.csproj @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/CSharpBible/Libraries/ExtendedConsole/ExtendedConsole.csproj b/CSharpBible/Libraries/ExtendedConsole/ExtendedConsole.csproj index b1423a357..d74b43732 100644 --- a/CSharpBible/Libraries/ExtendedConsole/ExtendedConsole.csproj +++ b/CSharpBible/Libraries/ExtendedConsole/ExtendedConsole.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net481-windows;net48-windows;net6.0-Windows;net7.0-Windows;net8.0-Windows;net9.0-Windows + net462;net472;net481;net48;net6.0-Windows;net7.0-Windows;net8.0-Windows;net9.0-Windows enable enable diff --git a/CSharpBible/Libraries/GenInterfaces/GenInterfaces.csproj b/CSharpBible/Libraries/GenInterfaces/GenInterfaces.csproj index f5da8b2a6..fa6a6c63f 100644 --- a/CSharpBible/Libraries/GenInterfaces/GenInterfaces.csproj +++ b/CSharpBible/Libraries/GenInterfaces/GenInterfaces.csproj @@ -2,7 +2,7 @@ Library - net8.0;net9.0 + net481;net6.0;net7.0;net8.0;net9.0 disable enable diff --git a/CSharpBible/Libraries/MVVM_BaseLib/Helper/StreamHelpers.cs b/CSharpBible/Libraries/MVVM_BaseLib/Helper/StreamHelpers.cs index 431c73e77..37674c9ee 100644 --- a/CSharpBible/Libraries/MVVM_BaseLib/Helper/StreamHelpers.cs +++ b/CSharpBible/Libraries/MVVM_BaseLib/Helper/StreamHelpers.cs @@ -1,23 +1,23 @@ // *********************************************************************** -// Assembly : Sudoku_Base +// Assembly : MVVM_BaseLib // Author : Mir // Created : 05-19-2023 // // Last Modified By : Mir // Last Modified On : 05-19-2023 // *********************************************************************** -// +// // Copyright © JC-Soft 2023 // // // *********************************************************************** using BaseLib.Interfaces; -using MVVM.View.Extension; using System; using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; + namespace BaseLib.Helper; public static class StreamHelpers diff --git a/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib.csproj b/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib.csproj index 3da73a900..256792016 100644 --- a/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib.csproj +++ b/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib.csproj @@ -2,7 +2,7 @@ Library - net481-windows;net48-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net481;net48;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows True AnyCPU;x86 True @@ -20,16 +20,14 @@ - - - - - + + + diff --git a/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib_net.csproj b/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib_net.csproj index 70a112d82..eb2237e38 100644 --- a/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib_net.csproj +++ b/CSharpBible/Libraries/MVVM_BaseLib/MVVM_BaseLib_net.csproj @@ -15,14 +15,11 @@ - - - - - - + + + diff --git a/CSharpBible/Libraries/MVVM_BaseLib/View/Extension/IoC.cs b/CSharpBible/Libraries/MVVM_BaseLib/View/Extension/IoC.cs index d19994033..efea98d99 100644 --- a/CSharpBible/Libraries/MVVM_BaseLib/View/Extension/IoC.cs +++ b/CSharpBible/Libraries/MVVM_BaseLib/View/Extension/IoC.cs @@ -11,6 +11,7 @@ // // // *********************************************************************** +using BaseLib.Helper; using Microsoft.Extensions.DependencyInjection; using System; using System.Windows.Markup; @@ -25,68 +26,8 @@ namespace MVVM.View.Extension; /// Implements the /// /// -public class IoC : MarkupExtension , IIoC +public class IoC2 : MarkupExtension , IIoC { - /// - /// Gets or sets the required service. - /// - /// The fully initialized service. - /// - /// using Microsoft.Extensions.DependencyInjection - /// // Build the DependencyInjection container - /// var builder = new ServiceCollection(); - /// builder.AddTransient<IInterface, CImplement1>(); - /// builder.AddSingleton<IInterface2, CSingleton>(); - /// IoC.GetReqSrv = builder.BuildServiceProvider().GetRequiredService; - /// - public static Func GetReqSrv { get; set; }=(t)=>throw new NotImplementedException("Please initialize the service first."); - /// - /// Gets or sets the requested service (can be null). - /// - /// The initialized service. - /// - /// using Microsoft.Extensions.DependencyInjection - /// // Build the DependencyInjection container - /// var builder = new ServiceCollection(); - /// builder.AddTransient<IInterface, CImplement1>(); - /// builder.AddSingleton<IInterface2, CSingleton>(); - /// IoC.GetSrv = builder.BuildServiceProvider().GetService; - /// - public static Func GetSrv { get; set; } = (t) => null; - /// - /// Gets or sets the get scope. - /// - /// The get scope. - public static Func GetScope { get; set; } = () => throw new NotImplementedException("Please initialize the service first."); - -#pragma warning disable CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Erwägen Sie die Deklaration als Nullable. - /// - /// The scope - /// - private static IServiceScope _Scope; - /// - /// The base scope - /// - private static IServiceScope _BaseScope; -#pragma warning restore CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Erwägen Sie die Deklaration als Nullable. - - /// - /// Gets the scope. - /// - /// The scope. - public static IServiceScope Scope => _Scope; - /// - /// Gets the required service. - /// - /// - /// T, the initialized service(class) - public static T GetRequiredService() => (T)GetReqSrv.Invoke(typeof(T)); - /// - /// Gets the service. - /// - /// - /// System.Nullable<T>, the initialized service(class) - public static T? GetService() => (T?)GetSrv.Invoke(typeof(T)); /// /// Gets or sets the type. /// @@ -97,44 +38,6 @@ public class IoC : MarkupExtension , IIoC /// /// Ein Dienstanbieter-Hilfsprogramm, das Dienste für die Markuperweiterung bereitstellen kann. /// Der Objektwert, der für die Eigenschaft festgelegt werden soll, auf die die Erweiterung angewendet wird. - public override object? ProvideValue(IServiceProvider serviceProvider) => GetReqSrv.Invoke(Type); + public override object? ProvideValue(IServiceProvider serviceProvider) => IoC.GetReqSrv.Invoke(Type); - /// Configures the class with the specified sp. - /// The sp. - /// - /// using Microsoft.Extensions.DependencyInjection - /// // Build the DependencyInjection container - /// var builder = new ServiceCollection() - /// .AddTransient<IInterface, CImplement1>() - /// .AddSingleton<IInterface2, CSingleton>(); - /// IoC.Configure(builder.BuildServiceProvider()); - /// - public static void Configure(IServiceProvider sp) - { - GetScope = sp.CreateScope; - _Scope = _BaseScope = GetScope(); - GetReqSrv = (t) => { var s = sp.GetService(t); return s ?? throw new InvalidOperationException($"No service for {t}"); }; - GetSrv = sp.GetService; - } - - /// - /// Gets the new scope. - /// - /// a scope. - /// . - public static IServiceScope GetNewScope(IServiceScope? aScope=null) - { - return _Scope = aScope ==null? GetScope(): aScope.ServiceProvider.CreateScope(); - } - - /// - /// Sets the current scope. - /// - /// The scope. - public static void SetCurrentScope(IServiceScope scope) - { - var sp = (_Scope = scope).ServiceProvider; - GetReqSrv = (t) => { var s = sp.GetService(t); return s ?? throw new InvalidOperationException($"No service for {t}"); }; - GetSrv = sp.GetService; - } } diff --git a/CSharpBible/Libraries/MVVM_BaseLib/ViewModel/IPropertyBinding.cs b/CSharpBible/Libraries/MVVM_BaseLib/ViewModel/IPropertyBinding.cs index bf012019e..c3421a004 100644 --- a/CSharpBible/Libraries/MVVM_BaseLib/ViewModel/IPropertyBinding.cs +++ b/CSharpBible/Libraries/MVVM_BaseLib/ViewModel/IPropertyBinding.cs @@ -27,5 +27,4 @@ public interface IPropertyBinding /// bool AddPropertyDependency(string prop1, string prop2, bool xForce =false); bool RemovePropertyDependency(string prop1, string prop2); - } \ No newline at end of file diff --git a/CSharpBible/Libraries/MVVM_BaseLibTests/MVVM_BaseLibTests.csproj b/CSharpBible/Libraries/MVVM_BaseLibTests/MVVM_BaseLibTests.csproj index c39be362e..86e0f25ca 100644 --- a/CSharpBible/Libraries/MVVM_BaseLibTests/MVVM_BaseLibTests.csproj +++ b/CSharpBible/Libraries/MVVM_BaseLibTests/MVVM_BaseLibTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net48-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net481;net48;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows true false AnyCPU;x86 diff --git a/CSharpBible/Libraries/MVVM_BaseLibTests/View/Extension/IoCTests.cs b/CSharpBible/Libraries/MVVM_BaseLibTests/View/Extension/IoCTests.cs index e54bc6f73..da06a492b 100644 --- a/CSharpBible/Libraries/MVVM_BaseLibTests/View/Extension/IoCTests.cs +++ b/CSharpBible/Libraries/MVVM_BaseLibTests/View/Extension/IoCTests.cs @@ -3,6 +3,7 @@ using System; using Microsoft.Extensions.DependencyInjection; using NSubstitute; +using BaseLib.Helper; namespace MVVM.View.Extension.Tests; @@ -83,7 +84,7 @@ public void GetServiceTest() [TestMethod()] public void ProvideValueTest() { - var ioc = new IoC + var ioc = new IoC2 { Type = typeof(Object) }; diff --git a/CSharpBible/Libraries/MathLIbrary/MathLibrary_net.csproj b/CSharpBible/Libraries/MathLIbrary/MathLibrary_net.csproj index aec3d04b5..78d8245f6 100644 --- a/CSharpBible/Libraries/MathLIbrary/MathLibrary_net.csproj +++ b/CSharpBible/Libraries/MathLIbrary/MathLibrary_net.csproj @@ -1,7 +1,7 @@  - net481-windows;net48-windows;net472-windows;net462-windows;net6.0;net7.0;net8.0;net9.0 + net481;net48;net472;net462;net6.0;net7.0;net8.0;net9.0 True diff --git a/CSharpBible/Libraries/WFSystem.Data/WFSystem.Windows.Data.csproj b/CSharpBible/Libraries/WFSystem.Data/WFSystem.Windows.Data.csproj index 9433bc4ad..4c0610613 100644 --- a/CSharpBible/Libraries/WFSystem.Data/WFSystem.Windows.Data.csproj +++ b/CSharpBible/Libraries/WFSystem.Data/WFSystem.Windows.Data.csproj @@ -2,7 +2,7 @@ Library - net481-windows;net48-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net48;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows True diff --git a/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3.csproj b/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3.csproj index e84c35db5..67e01a09f 100644 --- a/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3.csproj +++ b/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3.csproj @@ -1,11 +1,8 @@  - + WinExe - net6.0-windows - ..\..\..\bin\$(MSBuildProjectName)\ - ..\..\..\obj.net\$(MSBuildProjectName)\ - enable + net462;net472;net48;net481 true @@ -32,7 +29,7 @@ - + diff --git a/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3_net.csproj b/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3_net.csproj index 1e2181377..a34e0069f 100644 --- a/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3_net.csproj +++ b/CSharpBible/MVVM_Tutorial/ItemsControlTut3/ItemsControlTut3_net.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows;net7.0-windows;net8.0-windows + net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows true diff --git a/CSharpBible/MVVM_Tutorial/ItemsControlTut4/ItemsControlTut4.csproj b/CSharpBible/MVVM_Tutorial/ItemsControlTut4/ItemsControlTut4.csproj index e84c35db5..c84e34dda 100644 --- a/CSharpBible/MVVM_Tutorial/ItemsControlTut4/ItemsControlTut4.csproj +++ b/CSharpBible/MVVM_Tutorial/ItemsControlTut4/ItemsControlTut4.csproj @@ -30,9 +30,8 @@ - - + diff --git a/CSharpBible/MVVM_Tutorial/ListBinding/ListBinding.csproj b/CSharpBible/MVVM_Tutorial/ListBinding/ListBinding.csproj index 07476ca5a..a260c41ad 100644 --- a/CSharpBible/MVVM_Tutorial/ListBinding/ListBinding.csproj +++ b/CSharpBible/MVVM_Tutorial/ListBinding/ListBinding.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/ListBindingTests/ListBindingTests.csproj b/CSharpBible/MVVM_Tutorial/ListBindingTests/ListBindingTests.csproj index 03019eab4..1a496ece9 100644 --- a/CSharpBible/MVVM_Tutorial/ListBindingTests/ListBindingTests.csproj +++ b/CSharpBible/MVVM_Tutorial/ListBindingTests/ListBindingTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/App.xaml.cs index 0bcbfe68e..19c11a228 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/App.xaml.cs @@ -11,9 +11,12 @@ // // // *********************************************************************** +using BaseLib.Helper; using BaseLib.Interfaces; +using BaseLib.Models; +using BaseLib.Models.Interfaces; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_00_IoCTemplate.Models; using System.Windows; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/MVVM_00_IoCTemplate.csproj b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/MVVM_00_IoCTemplate.csproj index d059b0b81..d690c8e5b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/MVVM_00_IoCTemplate.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/MVVM_00_IoCTemplate.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/SimpleLog.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/SimpleLog.cs index 63c11f69a..51eaefbce 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/SimpleLog.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/SimpleLog.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using System; using System.Diagnostics; using System.Globalization; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/TemplateModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/TemplateModel.cs index 559002427..8d3dd8dae 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/TemplateModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/Models/TemplateModel.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Timers; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/ViewModels/TemplateViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/ViewModels/TemplateViewModel.cs index 93ee9da52..4ea4f4c62 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/ViewModels/TemplateViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplate/ViewModels/TemplateViewModel.cs @@ -11,7 +11,8 @@ // // // *********************************************************************** -using MVVM.View.Extension; +using BaseLib.Helper; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_00_IoCTemplate.Models; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/AppTests.cs index 0130bf507..55b97cf13 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/AppTests.cs @@ -1,9 +1,10 @@ using BaseLib.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_00_IoCTemplate.Models; using NSubstitute; using System; +using BaseLib.Models.Interfaces; namespace MVVM_00_IoCTemplate.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/MVVM_00_IoCTemplateTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/MVVM_00_IoCTemplateTests.csproj index 328f219b2..e159f48bc 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/MVVM_00_IoCTemplateTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/MVVM_00_IoCTemplateTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/SimpleLogTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/SimpleLogTests.cs index 06adf6938..1c399f283 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/SimpleLogTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/SimpleLogTests.cs @@ -1,4 +1,5 @@ using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; using NSubstitute; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/TemplateModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/TemplateModelTests.cs index 22af0bfa5..06ac94da5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/TemplateModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/Models/TemplateModelTests.cs @@ -17,6 +17,7 @@ using MVVM.ViewModel; using NSubstitute; using System.ComponentModel; +using BaseLib.Models.Interfaces; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/ViewModels/TemplateViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/ViewModels/TemplateViewModelTests.cs index f988f7e57..d3d833f13 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/ViewModels/TemplateViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_IoCTemplateTests/ViewModels/TemplateViewModelTests.cs @@ -16,7 +16,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_00_IoCTemplate.Models; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_Template/MVVM_00_Template.csproj b/CSharpBible/MVVM_Tutorial/MVVM_00_Template/MVVM_00_Template.csproj index e8c92f4a2..5b90d2052 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_Template/MVVM_00_Template.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_Template/MVVM_00_Template.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_TemplateTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_TemplateTests.csproj index a6e9db603..ef1b1ab5f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_TemplateTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_TemplateTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_Template_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_Template_netTests.csproj index 0f1f41d0f..703bec1b4 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_Template_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_00_TemplateTests/MVVM_00_Template_netTests.csproj @@ -17,6 +17,6 @@ - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplate/MVVM_00a_CTTemplate.csproj b/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplate/MVVM_00a_CTTemplate.csproj index b40b6ff14..b1c750397 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplate/MVVM_00a_CTTemplate.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplate/MVVM_00a_CTTemplate.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/AppTests.cs index 21d4ec70d..b8636cfac 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_00a_CTTemplate.Models; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/MVVM_00a_CTTemplateTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/MVVM_00a_CTTemplateTests.csproj index 2c04f401b..b5d8ff344 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/MVVM_00a_CTTemplateTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_00a_CTTemplateTests/MVVM_00a_CTTemplateTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChange/MVVM_03_NotifyChange.csproj b/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChange/MVVM_03_NotifyChange.csproj index f204d7f08..337d9ab12 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChange/MVVM_03_NotifyChange.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChange/MVVM_03_NotifyChange.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChangeTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChangeTests.csproj index d637756a0..d0533f439 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChangeTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChangeTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChange_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChange_netTests.csproj index 60958e994..0b17a17e5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChange_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_03_NotifyChangeTests/MVVM_03_NotifyChange_netTests.csproj @@ -16,7 +16,7 @@ - + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChange/MVVM_03a_CTNotifyChange.csproj b/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChange/MVVM_03a_CTNotifyChange.csproj index 7500b16c9..516990926 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChange/MVVM_03a_CTNotifyChange.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChange/MVVM_03a_CTNotifyChange.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChangeTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChangeTests.csproj index 54bf435e7..c60feb404 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChangeTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChangeTests.csproj @@ -1,7 +1,7 @@ - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChange_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChange_netTests.csproj index 8316d7c63..227a623a9 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChange_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_03a_CTNotifyChangeTests/MVVM_03a_CTNotifyChange_netTests.csproj @@ -16,7 +16,7 @@ - + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommand/MVVM_04_DelegateCommand.csproj b/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommand/MVVM_04_DelegateCommand.csproj index f204d7f08..337d9ab12 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommand/MVVM_04_DelegateCommand.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommand/MVVM_04_DelegateCommand.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommandTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommandTests.csproj index 1b3c0d823..457e68b43 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommandTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommandTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommand_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommand_netTests.csproj index a2764a290..72dbe3660 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommand_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_04_DelegateCommandTests/MVVM_04_DelegateCommand_netTests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommand/MVVM_04a_CTRelayCommand.csproj b/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommand/MVVM_04a_CTRelayCommand.csproj index bb44a3189..8cfcffe77 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommand/MVVM_04a_CTRelayCommand.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommand/MVVM_04a_CTRelayCommand.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommandTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommandTests.csproj index 8274068e2..3240ea0be 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommandTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommandTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommand_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommand_netTests.csproj index 7b110d53c..6794eb653 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommand_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_04a_CTRelayCommandTests/MVVM_04a_CTRelayCommand_netTests.csproj @@ -16,8 +16,8 @@ + - diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculator/MVVM_05_CommandParCalculator.csproj b/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculator/MVVM_05_CommandParCalculator.csproj index f204d7f08..337d9ab12 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculator/MVVM_05_CommandParCalculator.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculator/MVVM_05_CommandParCalculator.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculatorTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculatorTests.csproj index 880bc356b..0bcea5d82 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculatorTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculatorTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculator_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculator_netTests.csproj index 59f92a0ce..6ad961fc9 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculator_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_05_CommandParCalculatorTests/MVVM_05_CommandParCalculator_netTests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/App.xaml.cs index 66aef3120..303c3f73f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/App.xaml.cs @@ -11,8 +11,9 @@ // // // *********************************************************************** +using BaseLib.Helper; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_05a_CTCommandParCalc.Model; using MVVM_05a_CTCommandParCalc.Model.Interfaces; using System.Windows; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/MVVM_05a_CTCommandParCalc.csproj b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/MVVM_05a_CTCommandParCalc.csproj index 23a9b90c9..15c83895a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/MVVM_05a_CTCommandParCalc.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/MVVM_05a_CTCommandParCalc.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/ViewModels/CommandParCalculatorViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/ViewModels/CommandParCalculatorViewModel.cs index 776f49331..0d437e39f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/ViewModels/CommandParCalculatorViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalc/ViewModels/CommandParCalculatorViewModel.cs @@ -12,8 +12,9 @@ // // *********************************************************************** using System.ComponentModel; +using BaseLib.Helper; using CommunityToolkit.Mvvm.Input; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_05a_CTCommandParCalc.Data; using MVVM_05a_CTCommandParCalc.Model.Interfaces; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalcTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalcTests.csproj index ee6910dce..63551ac66 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalcTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalcTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalc_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalc_netTests.csproj index d5cc49a28..bb344e7a9 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalc_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/MVVM_05a_CTCommandParCalc_netTests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/ViewModels/CommandParCalculatorViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/ViewModels/CommandParCalculatorViewModelTests.cs index e6e51bc94..7fd82bb52 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/ViewModels/CommandParCalculatorViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_05a_CTCommandParCalcTests/ViewModels/CommandParCalculatorViewModelTests.cs @@ -12,7 +12,7 @@ // // *********************************************************************** using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_05a_CTCommandParCalc.Data; using MVVM_05a_CTCommandParCalc.Model; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters/MVVM_06_Converters.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters/MVVM_06_Converters.csproj index d644e9bef..d54f8d27a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters/MVVM_06_Converters.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters/MVVM_06_Converters.csproj @@ -3,7 +3,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_ConvertersTests/MVVM_06_ConvertersTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_ConvertersTests/MVVM_06_ConvertersTests.csproj index 831db5cba..ff40c6359 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_ConvertersTests/MVVM_06_ConvertersTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_ConvertersTests/MVVM_06_ConvertersTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_2/MVVM_06_Converters_2.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_2/MVVM_06_Converters_2.csproj index 7b68dbc32..ff29494eb 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_2/MVVM_06_Converters_2.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_2/MVVM_06_Converters_2.csproj @@ -3,7 +3,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3/MVVM_06_Converters_3.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3/MVVM_06_Converters_3.csproj index 40083b782..f081a65b3 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3/MVVM_06_Converters_3.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3/MVVM_06_Converters_3.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3Tests.csproj index e93a8b461..d72643059 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/App.xaml.cs index bbd111432..be0493df0 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/App.xaml.cs @@ -11,8 +11,9 @@ // // // *********************************************************************** +using BaseLib.Helper; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_06_Converters_4.Model; using System.Windows; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/MVVM_06_Converters_4.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/MVVM_06_Converters_4.csproj index 269a7adb4..5cc062678 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/MVVM_06_Converters_4.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/MVVM_06_Converters_4.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/PlotFrameViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/PlotFrameViewModel.cs index 65ad34ce0..65f9aea32 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/PlotFrameViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/PlotFrameViewModel.cs @@ -13,7 +13,7 @@ // *********************************************************************** using CommunityToolkit.Mvvm.ComponentModel; using MathLibrary.TwoDim; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_06_Converters_4.Model; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/VehicleViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/VehicleViewModel.cs index 693132a48..151f3414e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/VehicleViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4/ViewModels/VehicleViewModel.cs @@ -17,7 +17,8 @@ using System.ComponentModel; using System; using CommunityToolkit.Mvvm.Input; -using MVVM.View.Extension; +using BaseLib.Helper; +using BaseLib.Helper; namespace MVVM_06_Converters_4.ViewModels; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4Tests.csproj index 88f45fdff..a25d34718 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/PlotFrameTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/PlotFrameTests.cs index a45e46e20..37586e9d5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/PlotFrameTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/PlotFrameTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_06_Converters_4.Model; using NSubstitute; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/VehicleViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/VehicleViewTests.cs index 43d77eac4..eaf83f869 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/VehicleViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/View/VehicleViewTests.cs @@ -16,7 +16,7 @@ using System; using System.Threading; using NSubstitute; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_06_Converters_4.Model; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/PlotFrameViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/PlotFrameViewModelTests.cs index 2761bfc6e..c593abb7c 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/PlotFrameViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/PlotFrameViewModelTests.cs @@ -2,7 +2,7 @@ using MVVM.ViewModel; using System.Collections.Generic; using System; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_06_Converters_4.Model; using NSubstitute; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/VehicleViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/VehicleViewModelTests.cs index 112a7f630..1f0fdd5ad 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/VehicleViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/ViewModels/VehicleViewModelTests.cs @@ -6,7 +6,7 @@ using BaseLib.Helper; using MVVM.ViewModel; using System.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; namespace MVVM_06_Converters_4.ViewModels.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxes/MVVM_09_DialogBoxes.csproj b/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxes/MVVM_09_DialogBoxes.csproj index 4d1226aa6..5c26a288a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxes/MVVM_09_DialogBoxes.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxes/MVVM_09_DialogBoxes.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/AppTests.cs index 36fa3218a..c0b2caa66 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using System; namespace MVVM_09_DialogBoxes.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/MVVM_09_DialogBoxesTest.csproj b/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/MVVM_09_DialogBoxesTest.csproj index 131cfa0f2..f21adc448 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/MVVM_09_DialogBoxesTest.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_09_DialogBoxesTest/MVVM_09_DialogBoxesTest.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxes/MVVM_09a_CTDialogBoxes.csproj b/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxes/MVVM_09a_CTDialogBoxes.csproj index 9307f5f9b..df499f041 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxes/MVVM_09a_CTDialogBoxes.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxes/MVVM_09a_CTDialogBoxes.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/AppTests.cs index 1835b4408..27a0bc843 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using System; namespace MVVM_09a_CTDialogBoxes.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/MVVM_09a_CTDialogBoxesTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/MVVM_09a_CTDialogBoxesTests.csproj index eef6a2f53..2cf48ad8b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/MVVM_09a_CTDialogBoxesTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_09a_CTDialogBoxesTests/MVVM_09a_CTDialogBoxesTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1Tests.csproj index c2b596c79..ebe0d7fb6 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1_netTests.csproj index 36a837fbf..5c783f89a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_16_UserControl1Tests/MVVM_16_UserControl1_netTests.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol1/MVVM_16_UserControl1.csproj b/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol1/MVVM_16_UserControl1.csproj index 84e766c77..57b573aa7 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol1/MVVM_16_UserControl1.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol1/MVVM_16_UserControl1.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol2/MVVM_16_UserControl2.csproj b/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol2/MVVM_16_UserControl2.csproj index 64f0fd8f9..fb8d11b5e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol2/MVVM_16_UserControl2.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_16_Usercontrol2/MVVM_16_UserControl2.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_17_1_CSV_Laden/MVVM_17_1_CSV_Laden.csproj b/CSharpBible/MVVM_Tutorial/MVVM_17_1_CSV_Laden/MVVM_17_1_CSV_Laden.csproj index ae72f3f7b..a2da5c313 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_17_1_CSV_Laden/MVVM_17_1_CSV_Laden.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_17_1_CSV_Laden/MVVM_17_1_CSV_Laden.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_18_MultiConverters/MVVM_18_MultiConverters.csproj b/CSharpBible/MVVM_Tutorial/MVVM_18_MultiConverters/MVVM_18_MultiConverters.csproj index a5ff79a78..aa6ac750a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_18_MultiConverters/MVVM_18_MultiConverters.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_18_MultiConverters/MVVM_18_MultiConverters.csproj @@ -3,7 +3,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_19_FilterLists/MVVM_19_FilterLists.csproj b/CSharpBible/MVVM_Tutorial/MVVM_19_FilterLists/MVVM_19_FilterLists.csproj index 734e0cd9a..a1906a07a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_19_FilterLists/MVVM_19_FilterLists.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_19_FilterLists/MVVM_19_FilterLists.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_19_FilterListsTests/MVVM_19_FilterListsTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_19_FilterListsTests/MVVM_19_FilterListsTests.csproj index c19d41779..1abe8e759 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_19_FilterListsTests/MVVM_19_FilterListsTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_19_FilterListsTests/MVVM_19_FilterListsTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_20_Sysdialogs/MVVM_20_Sysdialogs.csproj b/CSharpBible/MVVM_Tutorial/MVVM_20_Sysdialogs/MVVM_20_Sysdialogs.csproj index ad980f386..6a2ff3b43 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_20_Sysdialogs/MVVM_20_Sysdialogs.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_20_Sysdialogs/MVVM_20_Sysdialogs.csproj @@ -3,7 +3,7 @@ WinExe - net481-windows;net48-windows;net472-windows;net462-windows + net481;net48;net472;net462 enable true true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_SysdialogsTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_SysdialogsTests.csproj index 5e16773fa..c470ebc15 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_SysdialogsTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_SysdialogsTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net48-windows;net472-windows;net462-windows + net481;net48;net472;net462 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_Sysdialogs_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_Sysdialogs_netTests.csproj index 127c4bae8..f396afcd4 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_Sysdialogs_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_20_SysdialogsTests/MVVM_20_Sysdialogs_netTests.csproj @@ -23,6 +23,7 @@ + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogs/MVVM_20a_CTSysdialogs.csproj b/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogs/MVVM_20a_CTSysdialogs.csproj index 8a38eb982..db84932c4 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogs/MVVM_20a_CTSysdialogs.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogs/MVVM_20a_CTSysdialogs.csproj @@ -3,7 +3,7 @@ WinExe - net481-windows;net48-windows;net472-windows;net462-windows + net481;net48;net472;net462 enable true true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogsTests/MVVM_20a_CTSysdialogsTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogsTests/MVVM_20a_CTSysdialogsTests.csproj index 6798c5124..2ac00a654 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogsTests/MVVM_20a_CTSysdialogsTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_20a_CTSysdialogsTests/MVVM_20a_CTSysdialogsTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net48-windows;net472-windows;net462-windows + net481;net48;net472;net462 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_21_Buttons/MVVM_21_Buttons.csproj b/CSharpBible/MVVM_Tutorial/MVVM_21_Buttons/MVVM_21_Buttons.csproj index 8e5515a04..c2a20e6c5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_21_Buttons/MVVM_21_Buttons.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_21_Buttons/MVVM_21_Buttons.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/App.xaml.cs index 03c2d1462..e787091d5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/App.xaml.cs @@ -14,9 +14,11 @@ using System.Windows; using Microsoft.Extensions.DependencyInjection; using BaseLib.Interfaces; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_22_CTWpfCap.Model; using MVVM_22_CTWpfCap.ViewModels; +using BaseLib.Models; +using BaseLib.Models.Interfaces; namespace MVVM_22_CTWpfCap; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/MVVM_22_CTWpfCap.csproj b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/MVVM_22_CTWpfCap.csproj index 00d65c2d9..017a501da 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/MVVM_22_CTWpfCap.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/MVVM_22_CTWpfCap.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Model/CWpfCapModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Model/CWpfCapModel.cs index f79062b0a..6b4f5b347 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Model/CWpfCapModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Model/CWpfCapModel.cs @@ -1,4 +1,5 @@ using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using System; namespace MVVM_22_CTWpfCap.Model; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/ViewModels/WpfCapViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/ViewModels/WpfCapViewModel.cs index e35a23d38..01d3c927f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/ViewModels/WpfCapViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/ViewModels/WpfCapViewModel.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_22_CTWpfCap.Model; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Views/WpfCapView.xaml b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Views/WpfCapView.xaml index 2a6a3b042..70c8cb774 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Views/WpfCapView.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCap/Views/WpfCapView.xaml @@ -11,7 +11,7 @@ mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" Title="WpfCapView" - DataContext="{ioc:IoC Type=mvvm:WpfCapViewModel}"> + DataContext="{ioc:IoC2 Type=mvvm:WpfCapViewModel}"> diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/AppTests.cs index 26e8f772d..46aad9c4e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_22_CTWpfCap.Model; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/MVVM_22_CTWpfCapTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/MVVM_22_CTWpfCapTests.csproj index edbdf4167..9a8a2d23d 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/MVVM_22_CTWpfCapTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/MVVM_22_CTWpfCapTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Model/CWpfCapModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Model/CWpfCapModelTests.cs index 7aec6bc34..e30889332 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Model/CWpfCapModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Model/CWpfCapModelTests.cs @@ -1,4 +1,5 @@ using System; +using BaseLib.Models; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace MVVM_22_CTWpfCap.Model.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Views/WpfCapViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Views/WpfCapViewTests.cs index 1ca76dd42..59b01dbbe 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Views/WpfCapViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/Views/WpfCapViewTests.cs @@ -12,7 +12,7 @@ // // *********************************************************************** using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using System; using System.Threading; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml index 6fa89f447..b7c43be38 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml @@ -1,9 +1,8 @@ - - - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml.cs index 95fcfee98..098c6049e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/App.xaml.cs @@ -14,9 +14,11 @@ using System.Windows; using Microsoft.Extensions.DependencyInjection; using BaseLib.Interfaces; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_22_WpfCap.Model; using MVVM_22_WpfCap.ViewModels; +using BaseLib.Models; +using BaseLib.Models.Interfaces; namespace MVVM_22_WpfCap; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/MVVM_22_WpfCap.csproj b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/MVVM_22_WpfCap.csproj index 49bddfc7a..fe71d2429 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/MVVM_22_WpfCap.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/MVVM_22_WpfCap.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Model/CWpfCapModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Model/CWpfCapModel.cs index e0f2dc32e..eff025846 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Model/CWpfCapModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Model/CWpfCapModel.cs @@ -1,5 +1,6 @@ using System; using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; namespace MVVM_22_WpfCap.Model; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/ViewModels/WpfCapViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/ViewModels/WpfCapViewModel.cs index 4ba7956f3..218ac9f81 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/ViewModels/WpfCapViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/ViewModels/WpfCapViewModel.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_22_WpfCap.Model; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Views/WpfCapView.xaml b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Views/WpfCapView.xaml index dfc261c5e..f0cf23b79 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Views/WpfCapView.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCap/Views/WpfCapView.xaml @@ -11,7 +11,7 @@ mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" Title="WpfCapView" - DataContext="{ioc:IoC Type=mvvm:WpfCapViewModel}"> + DataContext="{ioc:IoC2 Type=mvvm:WpfCapViewModel}"> diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/AppTests.cs index 91f7b4338..f32798734 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_22_WpfCap.Model; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCapTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCapTests.csproj index 6bc323f94..815d7abf6 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCapTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCapTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Model/CWpfCapModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Model/CWpfCapModelTests.cs index 13646c741..4727faec8 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Model/CWpfCapModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Model/CWpfCapModelTests.cs @@ -1,4 +1,5 @@ using System; +using BaseLib.Models; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace MVVM_22_WpfCap.Model.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Views/WpfCapViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Views/WpfCapViewTests.cs index b59161321..7eac7e0b2 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Views/WpfCapViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/Views/WpfCapViewTests.cs @@ -12,7 +12,7 @@ // // *********************************************************************** using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using System; using System.Threading; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24_UserControl/MVVM_24_UserControl.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24_UserControl/MVVM_24_UserControl.csproj index 31948c90d..46d5514cc 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24_UserControl/MVVM_24_UserControl.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24_UserControl/MVVM_24_UserControl.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24_UserControlTests/MVVM_24_UserControlTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24_UserControlTests/MVVM_24_UserControlTests.csproj index ff46e0738..3fe235f86 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24_UserControlTests/MVVM_24_UserControlTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24_UserControlTests/MVVM_24_UserControlTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControl/MVVM_24a_CTUserControl.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControl/MVVM_24a_CTUserControl.csproj index eda834688..fbb493d4f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControl/MVVM_24a_CTUserControl.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControl/MVVM_24a_CTUserControl.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControlTests/MVVM_24a_CTUserControlTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControlTests/MVVM_24a_CTUserControlTests.csproj index d75642618..e7c12f959 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControlTests/MVVM_24a_CTUserControlTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24a_CTUserControlTests/MVVM_24a_CTUserControlTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControl/MVVM_24b_UserControl.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControl/MVVM_24b_UserControl.csproj index 01603577e..978a724bd 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControl/MVVM_24b_UserControl.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControl/MVVM_24b_UserControl.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControlTests/MVVM_24b_UserControlTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControlTests/MVVM_24b_UserControlTests.csproj index 88f6a4d48..bca022842 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControlTests/MVVM_24b_UserControlTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24b_UserControlTests/MVVM_24b_UserControlTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControl/MVVM_24c_CTUserControl.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControl/MVVM_24c_CTUserControl.csproj index 01603577e..978a724bd 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControl/MVVM_24c_CTUserControl.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControl/MVVM_24c_CTUserControl.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControlTests/MVVM_24c_CTUserControlTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControlTests/MVVM_24c_CTUserControlTests.csproj index 59c3761fe..511ee73bd 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControlTests/MVVM_24c_CTUserControlTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_24c_CTUserControlTests/MVVM_24c_CTUserControlTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/App.xaml.cs index 1e488ba83..48830662a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/App.xaml.cs @@ -13,9 +13,11 @@ // *********************************************************************** using BaseLib.Interfaces; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_25_RichTextEdit.Models; using System.Windows; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace MVVM_25_RichTextEdit { diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/MVVM_25_RichTextEdit.csproj b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/MVVM_25_RichTextEdit.csproj index 4f7572051..2cd6ddb6e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/MVVM_25_RichTextEdit.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/MVVM_25_RichTextEdit.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/RichTextEditModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/RichTextEditModel.cs index 77cfea1e6..09ecb2653 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/RichTextEditModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/RichTextEditModel.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Globalization; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/SimpleLog.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/SimpleLog.cs index 90c9c9b6f..2dd73dd39 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/SimpleLog.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/Models/SimpleLog.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using System; using System.Diagnostics; using System.Globalization; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/ViewModels/RichTextEditViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/ViewModels/RichTextEditViewModel.cs index ced7bc122..e2b8eb660 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/ViewModels/RichTextEditViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEdit/ViewModels/RichTextEditViewModel.cs @@ -16,7 +16,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Microsoft.Win32; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_25_RichTextEdit.Models; using System; @@ -24,6 +24,7 @@ using System.IO; using System.Reflection; using System.Windows.Documents; +using BaseLib.Helper; namespace MVVM_25_RichTextEdit.ViewModels; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/AppTests.cs index d4101eab7..368f4ac7d 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/AppTests.cs @@ -1,9 +1,10 @@ using BaseLib.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_25_RichTextEdit.Models; using NSubstitute; using System; +using BaseLib.Models.Interfaces; namespace MVVM_25_RichTextEdit.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/MVVM_25_RichTextEditTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/MVVM_25_RichTextEditTests.csproj index 5d15ba39f..076c59cb1 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/MVVM_25_RichTextEditTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/MVVM_25_RichTextEditTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/RichTextEditModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/RichTextEditModelTests.cs index 06f5285bd..8abfef836 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/RichTextEditModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/RichTextEditModelTests.cs @@ -17,6 +17,7 @@ using MVVM.ViewModel; using NSubstitute; using System.ComponentModel; +using BaseLib.Models.Interfaces; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/SimpleLogTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/SimpleLogTests.cs index be82a16c1..7ec853fa6 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/SimpleLogTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/Models/SimpleLogTests.cs @@ -1,4 +1,5 @@ using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; using NSubstitute; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/ViewModels/RichTextEditViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/ViewModels/RichTextEditViewModelTests.cs index 2e014420d..c3cb96800 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/ViewModels/RichTextEditViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_25_RichTextEditTests/ViewModels/RichTextEditViewModelTests.cs @@ -16,7 +16,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_25_RichTextEdit.Models; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_26_BindingGroupExp/MVVM_26_BindingGroupExp.csproj b/CSharpBible/MVVM_Tutorial/MVVM_26_BindingGroupExp/MVVM_26_BindingGroupExp.csproj index 3b3c23b8d..4e65ca5ef 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_26_BindingGroupExp/MVVM_26_BindingGroupExp.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_26_BindingGroupExp/MVVM_26_BindingGroupExp.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_26_CTBindingGroupExp/MVVM_26_CTBindingGroupExp.csproj b/CSharpBible/MVVM_Tutorial/MVVM_26_CTBindingGroupExp/MVVM_26_CTBindingGroupExp.csproj index ef956ada6..58c90551a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_26_CTBindingGroupExp/MVVM_26_CTBindingGroupExp.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_26_CTBindingGroupExp/MVVM_26_CTBindingGroupExp.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_27_DataGrid/MVVM_27_DataGrid.csproj b/CSharpBible/MVVM_Tutorial/MVVM_27_DataGrid/MVVM_27_DataGrid.csproj index 9b1707d5f..057635508 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_27_DataGrid/MVVM_27_DataGrid.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_27_DataGrid/MVVM_27_DataGrid.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_27_DataGridTests/MVVM_27_DataGridTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_27_DataGridTests/MVVM_27_DataGridTests.csproj index 35c80562a..cc6d4ac28 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_27_DataGridTests/MVVM_27_DataGridTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_27_DataGridTests/MVVM_27_DataGridTests.csproj @@ -2,7 +2,7 @@ - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/App.xaml.cs index fd3721904..55ebe3b0e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/App.xaml.cs @@ -14,8 +14,10 @@ using System.Windows; using Microsoft.Extensions.DependencyInjection; using BaseLib.Interfaces; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_28_1_CTDataGridExt.Services; +using BaseLib.Models; +using BaseLib.Models.Interfaces; namespace MVVM_28_1_CTDataGridExt; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/MVVM_28_1_CTDataGridExt.csproj b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/MVVM_28_1_CTDataGridExt.csproj index 6ae5380f9..34d579cd0 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/MVVM_28_1_CTDataGridExt.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/MVVM_28_1_CTDataGridExt.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/Services/PersonService.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/Services/PersonService.cs index b7bd12542..db0c51b2a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/Services/PersonService.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/Services/PersonService.cs @@ -1,5 +1,6 @@ using BaseLib.Interfaces; -using MVVM.View.Extension; +using BaseLib.Models.Interfaces; +using BaseLib.Helper; using MVVM_28_1_CTDataGridExt.Models; using System; using System.Collections.Generic; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/ViewModels/DatagridViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/ViewModels/DatagridViewModel.cs index c42a28a8d..7756834e5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/ViewModels/DatagridViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExt/ViewModels/DatagridViewModel.cs @@ -1,10 +1,11 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_28_1_CTDataGridExt.Models; using MVVM_28_1_CTDataGridExt.Services; using System.Collections.ObjectModel; +using BaseLib.Helper; namespace MVVM_28_1_CTDataGridExt.ViewModels; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/AppTests.cs index ce55386da..471b109fd 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_28_1_CTDataGridExt.Services; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/MVVM_28_1_CTDataGridExtTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/MVVM_28_1_CTDataGridExtTests.csproj index ef05fefb4..77b728cd5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/MVVM_28_1_CTDataGridExtTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/MVVM_28_1_CTDataGridExtTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Services/PersonServiceTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Services/PersonServiceTests.cs index 4cf0dd927..4f4b32d50 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Services/PersonServiceTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Services/PersonServiceTests.cs @@ -1,9 +1,11 @@ using BaseLib.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_28_1_CTDataGridExt.Models; using System.Collections.Generic; using System.Linq; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace MVVM_28_1_CTDataGridExt.Services.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/ViewModels/DataGridViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/ViewModels/DataGridViewModelTests.cs index f2dc07faf..71c26aefa 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/ViewModels/DataGridViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/ViewModels/DataGridViewModelTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_28_1_CTDataGridExt.Services; using MVVM_28_1_CTDataGridExt.Models; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Views/DataGridViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Views/DataGridViewTests.cs index 812c4dc55..718130315 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Views/DataGridViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_CTDataGridExtTests/Views/DataGridViewTests.cs @@ -1,7 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Threading; using NSubstitute; -using MVVM.View.Extension; +using BaseLib.Helper; namespace MVVM_28_1_CTDataGridExt.Views.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/MVVM_28_1_DataGridExt.csproj b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/MVVM_28_1_DataGridExt.csproj index 6d7db23c3..a57cc6556 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/MVVM_28_1_DataGridExt.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/MVVM_28_1_DataGridExt.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/Services/PersonService.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/Services/PersonService.cs index e5a55e006..ffec9fd0b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/Services/PersonService.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExt/Services/PersonService.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using BaseLib.Interfaces; -using MVVM.View.Extension; +using BaseLib.Models.Interfaces; +using BaseLib.Helper; using MVVM_28_1_DataGridExt.Models; namespace MVVM_28_1_DataGridExt.Services; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/MVVM_28_1_DataGridExtTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/MVVM_28_1_DataGridExtTests.csproj index 57b16494e..2c4b27d4a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/MVVM_28_1_DataGridExtTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/MVVM_28_1_DataGridExtTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/Services/PersonServiceTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/Services/PersonServiceTests.cs index 91482dca7..d392878e1 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/Services/PersonServiceTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_1_DataGridExtTests/Services/PersonServiceTests.cs @@ -2,8 +2,10 @@ using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; using BaseLib.Interfaces; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_28_1_DataGridExt.Models; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace MVVM_28_1_DataGridExt.Services.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_DataGrid/MVVM_28_DataGrid.csproj b/CSharpBible/MVVM_Tutorial/MVVM_28_DataGrid/MVVM_28_DataGrid.csproj index 241c1992c..529502e2a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_DataGrid/MVVM_28_DataGrid.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_DataGrid/MVVM_28_DataGrid.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_28_DataGridTests/MVVM_28_DataGridTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_28_DataGridTests/MVVM_28_DataGridTests.csproj index 4d4cbac25..7196888d5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_28_DataGridTests/MVVM_28_DataGridTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_28_DataGridTests/MVVM_28_DataGridTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1/MVVM_31_Validation1.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1/MVVM_31_Validation1.csproj index 735c8d16e..993eb44b0 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1/MVVM_31_Validation1.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1/MVVM_31_Validation1.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1Tests/MVVM_31_Validation1Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1Tests/MVVM_31_Validation1Tests.csproj index 2f4ba32a0..bc0d2fd6f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1Tests/MVVM_31_Validation1Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation1Tests/MVVM_31_Validation1Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2/MVVM_31_Validation2.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2/MVVM_31_Validation2.csproj index 06ac51623..7bb27abb9 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2/MVVM_31_Validation2.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2/MVVM_31_Validation2.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2Tests/MVVM_31_Validation2Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2Tests/MVVM_31_Validation2Tests.csproj index 1bac0d632..cfefc7dde 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2Tests/MVVM_31_Validation2Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31_Validation2Tests/MVVM_31_Validation2Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1/MVVM_31a_CTValidation1.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1/MVVM_31a_CTValidation1.csproj index 3116e2a36..32f2ed12b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1/MVVM_31a_CTValidation1.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1/MVVM_31a_CTValidation1.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1Tests/MVVM_31a_CTValidation1Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1Tests/MVVM_31a_CTValidation1Tests.csproj index 5f0a500dd..67d64f288 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1Tests/MVVM_31a_CTValidation1Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation1Tests/MVVM_31a_CTValidation1Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2/MVVM_31a_CTValidation2.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2/MVVM_31a_CTValidation2.csproj index f6616b918..82ac1939a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2/MVVM_31a_CTValidation2.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2/MVVM_31a_CTValidation2.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2Tests/MVVM_31a_CTValidation2Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2Tests/MVVM_31a_CTValidation2Tests.csproj index e0acfb6a8..1fe2fb3d2 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2Tests/MVVM_31a_CTValidation2Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation2Tests/MVVM_31a_CTValidation2Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3/MVVM_31a_CTValidation3.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3/MVVM_31a_CTValidation3.csproj index 3e0aacbfa..290ff1f76 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3/MVVM_31a_CTValidation3.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3/MVVM_31a_CTValidation3.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3Tests/MVVM_31a_CTValidation3Tests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3Tests/MVVM_31a_CTValidation3Tests.csproj index df930a925..3289a502b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3Tests/MVVM_31a_CTValidation3Tests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_31a_CTValidation3Tests/MVVM_31a_CTValidation3Tests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_Commands/MVVM_33_Events_to_Commands.csproj b/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_Commands/MVVM_33_Events_to_Commands.csproj index 3d4f9a4d1..f84af0634 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_Commands/MVVM_33_Events_to_Commands.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_Commands/MVVM_33_Events_to_Commands.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_CommandsTests/MVVM_33_Events_to_CommandsTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_CommandsTests/MVVM_33_Events_to_CommandsTests.csproj index 5d7dd4375..291d9796f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_CommandsTests/MVVM_33_Events_to_CommandsTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_33_Events_to_CommandsTests/MVVM_33_Events_to_CommandsTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_Commands/MVVM_33a_CTEvents_To_Commands.csproj b/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_Commands/MVVM_33a_CTEvents_To_Commands.csproj index 37d3f2acb..317baf10d 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_Commands/MVVM_33a_CTEvents_To_Commands.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_Commands/MVVM_33a_CTEvents_To_Commands.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_CommandsTests/MVVM_33a_CTEvents_To_CommandsTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_CommandsTests/MVVM_33a_CTEvents_To_CommandsTests.csproj index 296b096d3..b4c137eeb 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_CommandsTests/MVVM_33a_CTEvents_To_CommandsTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_33a_CTEvents_To_CommandsTests/MVVM_33a_CTEvents_To_CommandsTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgs/MVVM_34_BindingEventArgs.csproj b/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgs/MVVM_34_BindingEventArgs.csproj index 3d4f9a4d1..f84af0634 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgs/MVVM_34_BindingEventArgs.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgs/MVVM_34_BindingEventArgs.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgsTests/MVVM_34_BindingEventArgsTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgsTests/MVVM_34_BindingEventArgsTests.csproj index fc339ebeb..2bc1fac70 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgsTests/MVVM_34_BindingEventArgsTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_34_BindingEventArgsTests/MVVM_34_BindingEventArgsTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false True diff --git a/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgs/MVVM_34a_CTBindingEventArgs.csproj b/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgs/MVVM_34a_CTBindingEventArgs.csproj index 37d3f2acb..317baf10d 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgs/MVVM_34a_CTBindingEventArgs.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgs/MVVM_34a_CTBindingEventArgs.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgsTests/MVVM_34a_CTBindingEventArgsTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgsTests/MVVM_34a_CTBindingEventArgsTests.csproj index 8429ecfa2..4ef1923a2 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgsTests/MVVM_34a_CTBindingEventArgsTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_34a_CTBindingEventArgsTests/MVVM_34a_CTBindingEventArgsTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false True diff --git a/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkit/MVVM_35_CommunityToolkit.csproj b/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkit/MVVM_35_CommunityToolkit.csproj index b40b6ff14..b1c750397 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkit/MVVM_35_CommunityToolkit.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkit/MVVM_35_CommunityToolkit.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkitTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkitTests.csproj index 089433440..672763cbb 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkitTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkitTests.csproj @@ -1,7 +1,7 @@ - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkit_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkit_netTests.csproj index 22f4fead3..38e930f7f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkit_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_35_CommunityToolkitTests/MVVM_35_CommunityToolkit_netTests.csproj @@ -16,7 +16,7 @@ - - + + \ No newline at end of file diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml index 242de7bd0..3017eb2db 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml @@ -1,9 +1,8 @@ - - - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml.cs index 54d51bae5..8f84e1db0 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/App.xaml.cs @@ -13,7 +13,7 @@ // *********************************************************************** using CommunityToolkit.Mvvm.Messaging; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_36_ComToolKtSavesWork.Models; using MVVM_36_ComToolKtSavesWork.ViewModels; using System.Windows; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/MVVM_36_ComToolKtSavesWork.csproj b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/MVVM_36_ComToolKtSavesWork.csproj index e94cc6fec..052917789 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/MVVM_36_ComToolKtSavesWork.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/MVVM_36_ComToolKtSavesWork.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/CommunityToolkit2ViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/CommunityToolkit2ViewModel.cs index 341b1933c..33d371d77 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/CommunityToolkit2ViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/CommunityToolkit2ViewModel.cs @@ -14,7 +14,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_36_ComToolKtSavesWork.Models; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/LoginViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/LoginViewModel.cs index d29d888a1..7e66ec21b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/LoginViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/LoginViewModel.cs @@ -2,7 +2,7 @@ using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_36_ComToolKtSavesWork.Models; namespace MVVM_36_ComToolKtSavesWork.ViewModels; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/UserInfoViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/UserInfoViewModel.cs index 937afc1ad..df2fce7eb 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/UserInfoViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/ViewModels/UserInfoViewModel.cs @@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; using CommunityToolkit.Mvvm.Input; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_36_ComToolKtSavesWork.Models; namespace MVVM_36_ComToolKtSavesWork.ViewModels; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/CommunityToolkit2View.xaml b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/CommunityToolkit2View.xaml index 7d0640391..e55f96f5f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/CommunityToolkit2View.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/CommunityToolkit2View.xaml @@ -13,7 +13,7 @@ mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" Title="CommunityToolkit2View" - DataContext="{ioc:IoC Type=mvvm:CommunityToolkit2ViewModel}"> + DataContext="{ioc:IoC2 Type=mvvm:CommunityToolkit2ViewModel}"> diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/LoginControl.xaml b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/LoginControl.xaml index 8ffffdf4d..7f7d5e238 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/LoginControl.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/LoginControl.xaml @@ -9,7 +9,7 @@ xmlns:p="clr-namespace:MVVM_36_ComToolKtSavesWork.Properties" mc:Ignorable="d" d:DesignHeight="130" d:DesignWidth="400" - DataContext="{ioc:IoC Type=mvvm:LoginViewModel}"> + DataContext="{ioc:IoC2 Type=mvvm:LoginViewModel}"> diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/UserInfoControl.xaml b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/UserInfoControl.xaml index d6eee3578..0b4dceda5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/UserInfoControl.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWork/Views/UserControls/UserInfoControl.xaml @@ -10,7 +10,7 @@ xmlns:p="clr-namespace:MVVM_36_ComToolKtSavesWork.Properties" mc:Ignorable="d" d:DesignHeight="130" d:DesignWidth="400" - DataContext="{ioc:IoC Type=mvvm:UserInfoViewModel}"> + DataContext="{ioc:IoC2 Type=mvvm:UserInfoViewModel}"> diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/AppTests.cs index c07aba35a..0b6c62b57 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/AppTests.cs @@ -1,6 +1,6 @@ using CommunityToolkit.Mvvm.Messaging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_36_ComToolKtSavesWork.Models; using MVVM_36_ComToolKtSavesWork.ViewModels; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/MVVM_36_ComToolKtSavesWorkTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/MVVM_36_ComToolKtSavesWorkTests.csproj index c04c15079..91146eef3 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/MVVM_36_ComToolKtSavesWorkTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/MVVM_36_ComToolKtSavesWorkTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/CommunityToolkit2ViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/CommunityToolkit2ViewModelTests.cs index dd3346a6d..effe7e2fe 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/CommunityToolkit2ViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/CommunityToolkit2ViewModelTests.cs @@ -17,7 +17,7 @@ using Microsoft.Extensions.DependencyInjection; using MVVM_36_ComToolKtSavesWork.Models; using System; -using MVVM.View.Extension; +using BaseLib.Helper; using CommunityToolkit.Mvvm.Messaging; using BaseLib.Helper.MVVM; using MVVM.ViewModel.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/LoginViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/LoginViewModelTests.cs index ad9caa680..8d2825c26 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/LoginViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/LoginViewModelTests.cs @@ -17,7 +17,7 @@ using Microsoft.Extensions.DependencyInjection; using System; using CommunityToolkit.Mvvm.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel.Tests; using MVVM_36_ComToolKtSavesWork.Models; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/UserInfoViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/UserInfoViewModelTests.cs index ebcd56335..9b13c8a12 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/UserInfoViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/ViewModels/UserInfoViewModelTests.cs @@ -16,7 +16,7 @@ using System.ComponentModel; using Microsoft.Extensions.DependencyInjection; using CommunityToolkit.Mvvm.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM.ViewModel.Tests; using MVVM_36_ComToolKtSavesWork.Models; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/CommunityToolkit2ViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/CommunityToolkit2ViewTests.cs index 18d16ece4..3755e4b14 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/CommunityToolkit2ViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/CommunityToolkit2ViewTests.cs @@ -13,7 +13,7 @@ // *********************************************************************** using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_36_ComToolKtSavesWork.Models; using MVVM_36_ComToolKtSavesWork.ViewModels; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/MainWindowTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/MainWindowTests.cs index 10a19c8f9..61c5e7833 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/MainWindowTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_36_ComToolKtSavesWorkTests/Views/MainWindowTests.cs @@ -15,7 +15,7 @@ using System.Threading; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel.Tests; using MVVM_36_ComToolKtSavesWork.Models; using MVVM_36_ComToolKtSavesWork.ViewModels.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml index 9d5b4e3ad..c56a6c756 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml @@ -1,9 +1,8 @@ - - - - + + diff --git a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml.cs index 806fd4ac9..90f51aa82 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/App.xaml.cs @@ -15,7 +15,7 @@ using System.Windows; using Microsoft.Extensions.DependencyInjection; using MVVM_37_TreeView.ViewModels; -using MVVM.View.Extension; +using BaseLib.Helper; namespace MVVM_37_TreeView { diff --git a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/MVVM_37_TreeView.csproj b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/MVVM_37_TreeView.csproj index 4bea15ec3..f46cbba3c 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/MVVM_37_TreeView.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/MVVM_37_TreeView.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/Views/BooksTreeView.xaml b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/Views/BooksTreeView.xaml index b6448e7d9..f05b28f96 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/Views/BooksTreeView.xaml +++ b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeView/Views/BooksTreeView.xaml @@ -10,7 +10,7 @@ xmlns:ioc="clr-namespace:MVVM.View.Extension;assembly=MVVM_BaseLib" xmlns:model="clr-namespace:MVVM_37_TreeView.Models" mc:Ignorable="d" - DataContext="{ioc:IoC Type=mvvm:BooksTreeViewModel}" + DataContext="{ioc:IoC2 Type=mvvm:BooksTreeViewModel}" d:DesignHeight="450" d:DesignWidth="800" Title="Books TreeView"> diff --git a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/AppTests.cs index 74e4fe301..ba489a740 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_37_TreeView.Services; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/MVVM_37_TreeViewTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/MVVM_37_TreeViewTests.csproj index eab946f5d..3586b3e80 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/MVVM_37_TreeViewTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/MVVM_37_TreeViewTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/Views/BooksTreeViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/Views/BooksTreeViewTests.cs index 550fd8dd5..63cff38a2 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/Views/BooksTreeViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_37_TreeViewTests/Views/BooksTreeViewTests.cs @@ -13,7 +13,7 @@ // *********************************************************************** using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel.Tests; using MVVM_37_TreeView.Services; using MVVM_37_TreeView.ViewModels; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/App.xaml.cs index ed48d0da1..78a02df4f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/App.xaml.cs @@ -11,8 +11,9 @@ // // // *********************************************************************** +using BaseLib.Helper; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_38_CTDependencyInjection.Models; using MVVM_38_CTDependencyInjection.Models.Interfaces; using MVVM_38_CTDependencyInjection.ViewModels; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/MVVM_38_CTDependencyInjection.csproj b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/MVVM_38_CTDependencyInjection.csproj index d059b0b81..d690c8e5b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/MVVM_38_CTDependencyInjection.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/MVVM_38_CTDependencyInjection.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/Models/TemplateModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/Models/TemplateModel.cs index 7bc79a7ad..a2f254d35 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/Models/TemplateModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/Models/TemplateModel.cs @@ -13,9 +13,10 @@ // *********************************************************************** using System; using CommunityToolkit.Mvvm.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_38_CTDependencyInjection.Models.Interfaces; using System.Collections.Generic; +using BaseLib.Helper; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/ViewModels/DependencyInjectionViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/ViewModels/DependencyInjectionViewModel.cs index 3656cbef0..89cda230b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/ViewModels/DependencyInjectionViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjection/ViewModels/DependencyInjectionViewModel.cs @@ -12,7 +12,7 @@ // // *********************************************************************** using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_38_CTDependencyInjection.Models.Interfaces; using System; using System.ComponentModel; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/AppTests.cs index ad23e5405..33d86029b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_38_CTDependencyInjection.Models.Interfaces; using NSubstitute; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/MVVM_38_CTDependencyInjectionTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/MVVM_38_CTDependencyInjectionTests.csproj index 837642b75..113cbea16 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/MVVM_38_CTDependencyInjectionTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/MVVM_38_CTDependencyInjectionTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Models/TemplateModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Models/TemplateModelTests.cs index 63efd2d5c..a479f5a95 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Models/TemplateModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Models/TemplateModelTests.cs @@ -13,7 +13,7 @@ // *********************************************************************** using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_38_CTDependencyInjection.Models.Interfaces; using NSubstitute; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/ViewModels/TemplateViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/ViewModels/TemplateViewModelTests.cs index b31454b4e..3079eca03 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/ViewModels/TemplateViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/ViewModels/TemplateViewModelTests.cs @@ -18,7 +18,7 @@ using NSubstitute; using System.Collections.Generic; using System; -using MVVM.View.Extension; +using BaseLib.Helper; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Views/DependencyInjectionViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Views/DependencyInjectionViewTests.cs index 89eac2ea5..b149b27ad 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Views/DependencyInjectionViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_38_CTDependencyInjectionTests/Views/DependencyInjectionViewTests.cs @@ -15,7 +15,7 @@ using System.Threading; using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_38_CTDependencyInjection.Models.Interfaces; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/App.xaml.cs index 87ab6891a..4022db539 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/App.xaml.cs @@ -14,7 +14,7 @@ using System; using System.Windows; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; namespace MVVM_39_MultiModelTest { diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/MVVM_39_MultiModelTest.csproj b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/MVVM_39_MultiModelTest.csproj index a950df233..997d35790 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/MVVM_39_MultiModelTest.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/MVVM_39_MultiModelTest.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Models/SystemModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Models/SystemModel.cs index 9c2b58f28..94b37e8a0 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Models/SystemModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Models/SystemModel.cs @@ -13,7 +13,7 @@ // *********************************************************************** using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using System; using System.Collections.Generic; using System.Timers; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Properties/Resources.Designer.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Properties/Resources.Designer.cs index 65e379d55..2fecc2773 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Properties/Resources.Designer.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Properties/Resources.Designer.cs @@ -122,7 +122,7 @@ public static string ScopedModelView_xaml { ///using CommunityToolkit.Mvvm.ComponentModel; ///using CommunityToolkit.Mvvm.Input; ///using Microsoft.Extensions.DependencyInjection; - ///using MVVM.View.Extension; + ///using BaseLib.Helper; ///using MVVM.ViewModel; ///using MVVM_39_MultiModelTest.Models; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/DetailPageViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/DetailPageViewModel.cs index 28b2d2723..8086dd37e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/DetailPageViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/DetailPageViewModel.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using System; using MVVM_39_MultiModelTest.Models; //using NSubstitute; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/MultiModelMainViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/MultiModelMainViewModel.cs index 5af6511b0..e98794bdf 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/MultiModelMainViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/MultiModelMainViewModel.cs @@ -12,7 +12,7 @@ // // *********************************************************************** using CommunityToolkit.Mvvm.Input; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_39_MultiModelTest.Models; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/ScopedModelViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/ScopedModelViewModel.cs index bc1ff240d..a9e970f58 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/ScopedModelViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/ViewModels/ScopedModelViewModel.cs @@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_39_MultiModelTest.Models; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Views/MultiModelMainView.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Views/MultiModelMainView.xaml.cs index 8bbdbb04f..f9c73a564 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Views/MultiModelMainView.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTest/Views/MultiModelMainView.xaml.cs @@ -1,4 +1,4 @@ -using MVVM.View.Extension; +using BaseLib.Helper; using System.Windows.Controls; namespace MVVM_39_MultiModelTest.Views; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/AppTests.cs index d3599f061..c395346f7 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_39_MultiModelTest.Models; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/MVVM_39_MultiModelTestTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/MVVM_39_MultiModelTestTests.csproj index f7cfd2ba9..0ae2baed6 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/MVVM_39_MultiModelTestTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/MVVM_39_MultiModelTestTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/DetailPageViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/DetailPageViewModelTests.cs index 69277c42d..7e7849f0f 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/DetailPageViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/DetailPageViewModelTests.cs @@ -13,7 +13,7 @@ // *********************************************************************** using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_39_MultiModelTest.Models; using NSubstitute; using System.ComponentModel; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/MultiModelMainViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/MultiModelMainViewModelTests.cs index 04d6e6f40..43eb2f780 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/MultiModelMainViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/MultiModelMainViewModelTests.cs @@ -15,7 +15,7 @@ using System.ComponentModel; using MVVM.ViewModel; using MVVM_39_MultiModelTest.Models; -using MVVM.View.Extension; +using BaseLib.Helper; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/ScopedModelViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/ScopedModelViewModelTests.cs index d356f1c3e..30e069548 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/ScopedModelViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/ViewModels/ScopedModelViewModelTests.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using NSubstitute; using MVVM_39_MultiModelTest.Models; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/MultiModelMainViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/MultiModelMainViewTests.cs index 31b78a1ed..1769f2362 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/MultiModelMainViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/MultiModelMainViewTests.cs @@ -14,7 +14,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Threading; using NSubstitute; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_39_MultiModelTest.Models; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/ScopedModelViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/ScopedModelViewTests.cs index 2279221cf..76970fdc9 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/ScopedModelViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_39_MultiModelTestTests/Views/ScopedModelViewTests.cs @@ -13,7 +13,7 @@ // *********************************************************************** using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM_39_MultiModelTest.Models; -using MVVM.View.Extension; +using BaseLib.Helper; using NSubstitute; using System.Threading; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/App.xaml.cs index ac3b8dbb3..4d4d2b5cd 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/App.xaml.cs @@ -15,12 +15,15 @@ using MVVM_40_Wizzard.Models; using BaseLib.Interfaces; using System.Windows; -using MVVM.View.Extension; +using BaseLib.Helper; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; using System.Globalization; using System.Threading; using System; +using MVVM_40_Wizzard.Models.Interfaces; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace MVVM_40_Wizzard; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/MVVM_40_Wizzard.csproj b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/MVVM_40_Wizzard.csproj index 1ba534318..1173cd715 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/MVVM_40_Wizzard.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/MVVM_40_Wizzard.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/SimpleLog.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/SimpleLog.cs index 057b770e1..7fefb0561 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/SimpleLog.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/SimpleLog.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using System; using System.Diagnostics; using System.Globalization; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/WizzardModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/WizzardModel.cs index 76887b6d5..171bc892e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/WizzardModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/Models/WizzardModel.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using CommunityToolkit.Mvvm.ComponentModel; using MVVM_40_Wizzard.Models.Interfaces; using System; @@ -76,7 +77,7 @@ public DateTime Now /// Initializes a new instance of the class. /// /// - public WizzardModel(ISysTime sysTime,ILog log) + public WizzardModel(ISysTime sysTime, ILog log) { _sysTime = sysTime; _log = log; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page1ViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page1ViewModel.cs index 318f93d27..a7e31944a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page1ViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page1ViewModel.cs @@ -13,7 +13,7 @@ // *********************************************************************** using System.Collections.Generic; using System.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_40_Wizzard.Models; using BaseLib.Helper; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page2ViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page2ViewModel.cs index 19e816022..df615d54b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page2ViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page2ViewModel.cs @@ -13,7 +13,7 @@ // *********************************************************************** using System.Collections.Generic; using System.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_40_Wizzard.Models; using BaseLib.Helper; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page3ViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page3ViewModel.cs index 5e2846831..65dbcd802 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page3ViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page3ViewModel.cs @@ -13,7 +13,7 @@ // *********************************************************************** using System.Collections.Generic; using System.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_40_Wizzard.Models; using BaseLib.Helper; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page4ViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page4ViewModel.cs index 5e2dbc34f..5739a5f0c 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page4ViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/Page4ViewModel.cs @@ -12,7 +12,7 @@ // // *********************************************************************** using System.ComponentModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using BaseLib.Helper; using MVVM_40_Wizzard.Properties; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/WizzardViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/WizzardViewModel.cs index 521f2b525..ad03683d5 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/WizzardViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_Wizzard/ViewModels/WizzardViewModel.cs @@ -16,7 +16,7 @@ using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_40_Wizzard.Models.Interfaces; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/AppTests.cs index 2b062dd94..df948f456 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/AppTests.cs @@ -1,9 +1,11 @@ using BaseLib.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_40_Wizzard.Models; using NSubstitute; using System; +using BaseLib.Models.Interfaces; +using MVVM_40_Wizzard.Models.Interfaces; namespace MVVM_40_Wizzard.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/MVVM_40_WizzardTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/MVVM_40_WizzardTests.csproj index ca3fe9ae1..d0221bfcc 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/MVVM_40_WizzardTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/MVVM_40_WizzardTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/SimpleLogTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/SimpleLogTests.cs index 64cf797be..c1276e776 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/SimpleLogTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/SimpleLogTests.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; using NSubstitute; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/WizzardModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/WizzardModelTests.cs index 1d69af004..9b73e085a 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/WizzardModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Models/WizzardModelTests.cs @@ -13,6 +13,7 @@ // *********************************************************************** using BaseLib.Helper; using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page1ViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page1ViewModelTests.cs index 30df9df31..136f57d1e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page1ViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page1ViewModelTests.cs @@ -18,11 +18,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; using MVVM.ViewModel; -using MVVM.View.Extension; using BaseLib.Helper; -using static BaseLib.Helper.TestHelper; using MVVM_40_Wizzard.Models; using MVVM_40_Wizzard.Properties; +using MVVM_40_Wizzard.Models.Interfaces; +using static BaseLib.Helper.TestHelper; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page2ViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page2ViewModelTests.cs index fa10e2963..f371ec573 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page2ViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page2ViewModelTests.cs @@ -18,11 +18,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using BaseLib.Helper; using static BaseLib.Helper.TestHelper; using MVVM_40_Wizzard.Models; using MVVM_40_Wizzard.Properties; +using MVVM_40_Wizzard.Models.Interfaces; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page3ViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page3ViewModelTests.cs index 3561a5674..a511b9ee1 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page3ViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page3ViewModelTests.cs @@ -18,11 +18,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using BaseLib.Helper; using static BaseLib.Helper.TestHelper; using MVVM_40_Wizzard.Models; using MVVM_40_Wizzard.Properties; +using MVVM_40_Wizzard.Models.Interfaces; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page4ViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page4ViewModelTests.cs index f65f522b1..228830436 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page4ViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/Page4ViewModelTests.cs @@ -14,9 +14,10 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.ComponentModel; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using System; using NSubstitute; +using MVVM_40_Wizzard.Models.Interfaces; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/WizzardViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/WizzardViewModelTests.cs index 20caf468a..5f631ed91 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/WizzardViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/ViewModels/WizzardViewModelTests.cs @@ -14,9 +14,10 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.ComponentModel; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using System; using NSubstitute; +using MVVM_40_Wizzard.Models.Interfaces; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/Page4ViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/Page4ViewTests.cs index 87e3d4914..d0c685160 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/Page4ViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/Page4ViewTests.cs @@ -13,7 +13,7 @@ // *********************************************************************** using CommunityToolkit.Mvvm.Messaging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_40_Wizzard.Models.Interfaces; using NSubstitute; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/WizzardViewTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/WizzardViewTests.cs index 5182fddae..3af8d754e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/WizzardViewTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_40_WizzardTests/Views/WizzardViewTests.cs @@ -13,7 +13,7 @@ // *********************************************************************** using CommunityToolkit.Mvvm.Messaging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_40_Wizzard.Models.Interfaces; using NSubstitute; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/App.xaml.cs index 0d8c3b6e3..041e2afb7 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/App.xaml.cs @@ -13,10 +13,12 @@ // *********************************************************************** using BaseLib.Interfaces; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using Sudoku_Base.Models; using Sudoku_Base.Models.Interfaces; using System.Windows; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace MVVM_41_Sudoku diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/MVVM_41_Sudoku.csproj b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/MVVM_41_Sudoku.csproj index dcd56ce83..b0788d29e 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/MVVM_41_Sudoku.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/MVVM_41_Sudoku.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/Models/SimpleLog.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/Models/SimpleLog.cs index 738aa077c..454ab74d1 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/Models/SimpleLog.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/Models/SimpleLog.cs @@ -12,6 +12,7 @@ // // *********************************************************************** using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using System; using System.Diagnostics; using System.Globalization; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/ViewModels/SudokuViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/ViewModels/SudokuViewModel.cs index cec979572..b6385ec09 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/ViewModels/SudokuViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_Sudoku/ViewModels/SudokuViewModel.cs @@ -13,7 +13,7 @@ // *********************************************************************** using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_41_Sudoku.Models; using Sudoku_Base.Models.Interfaces; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/AppTests.cs index f7c85a8a4..d328b2257 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/AppTests.cs @@ -1,9 +1,10 @@ using BaseLib.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using Sudoku_Base.Models.Interfaces; using NSubstitute; using System; +using BaseLib.Models.Interfaces; namespace MVVM_41_Sudoku.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/MVVM_41_SudokuTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/MVVM_41_SudokuTests.csproj index f753d3384..8f1f8f3d6 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/MVVM_41_SudokuTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/MVVM_41_SudokuTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SimpleLogTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SimpleLogTests.cs index aa8bb4236..52dc72423 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SimpleLogTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SimpleLogTests.cs @@ -1,4 +1,5 @@ using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; using NSubstitute; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SudokuPrinterTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SudokuPrinterTests.cs index 2598ba6e4..d80114c72 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SudokuPrinterTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/Models/SudokuPrinterTests.cs @@ -11,6 +11,7 @@ using Sudoku_Base.Models; using NSubstitute; using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; namespace MVVM_41_Sudoku.Models.Tests; [TestClass] diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ViewModels/SudokuViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ViewModels/SudokuViewModelTests.cs index 506bc65f1..375692875 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ViewModels/SudokuViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ViewModels/SudokuViewModelTests.cs @@ -16,7 +16,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using Sudoku_Base.Models.Interfaces; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/App.xaml.cs index 5c01749b0..0862296fe 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/App.xaml.cs @@ -14,9 +14,11 @@ using BaseLib.Helper; using BaseLib.Interfaces; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_99_SomeIssue.Models; using System.Windows; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace MVVM_99_SomeIssue { diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/MVVM_99_SomeIssue.csproj b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/MVVM_99_SomeIssue.csproj index d059b0b81..d690c8e5b 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/MVVM_99_SomeIssue.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/MVVM_99_SomeIssue.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SimpleLog.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SimpleLog.cs index a227287ac..200c54f3d 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SimpleLog.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SimpleLog.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using System; using System.Diagnostics; using System.Globalization; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SomeIssueModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SomeIssueModel.cs index 49f81332a..a6286f7aa 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SomeIssueModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/Models/SomeIssueModel.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Timers; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/ViewModels/SomeIssueViewModel.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/ViewModels/SomeIssueViewModel.cs index 24f83d50a..ae007d670 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/ViewModels/SomeIssueViewModel.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssue/ViewModels/SomeIssueViewModel.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM.ViewModel; using MVVM_99_SomeIssue.Models; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/AppTests.cs index b5fb67a11..a32e5b4cd 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/AppTests.cs @@ -1,9 +1,10 @@ using BaseLib.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_99_SomeIssue.Models; using NSubstitute; using System; +using BaseLib.Models.Interfaces; namespace MVVM_99_SomeIssue.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssueTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssueTests.csproj index 808ff35b4..bd4b35fd2 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssueTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssueTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssue_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssue_netTests.csproj index d198b41c9..838c0eb31 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssue_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/MVVM_99_SomeIssue_netTests.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SimpleLogTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SimpleLogTests.cs index 7e7393948..e442f696c 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SimpleLogTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SimpleLogTests.cs @@ -1,4 +1,5 @@ using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; using Microsoft.VisualStudio.TestTools.UnitTesting; using MVVM.ViewModel; using MVVM.ViewModel.Tests; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SomeIssueModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SomeIssueModelTests.cs index e25ddb447..44b2593ed 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SomeIssueModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/Models/SomeIssueModelTests.cs @@ -17,6 +17,7 @@ using MVVM.ViewModel; using NSubstitute; using System.ComponentModel; +using BaseLib.Models.Interfaces; /// /// The Tests namespace. diff --git a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/ViewModels/SomeIssueViewModelTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/ViewModels/SomeIssueViewModelTests.cs index bfccd0cdb..265ede446 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/ViewModels/SomeIssueViewModelTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_99_SomeIssueTests/ViewModels/SomeIssueViewModelTests.cs @@ -16,7 +16,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; using MVVM.ViewModel; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_99_SomeIssue.Models; /// diff --git a/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/App.xaml.cs b/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/App.xaml.cs index 40c958c20..e17b6085d 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/App.xaml.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/App.xaml.cs @@ -13,9 +13,11 @@ // *********************************************************************** using CommunityToolkit.Mvvm.Messaging; using Microsoft.Extensions.DependencyInjection; -using MVVM.View.Extension; +using BaseLib.Helper; using System.Windows; using BaseLib.Interfaces; +using BaseLib.Models.Interfaces; +using BaseLib.Models; namespace MVVM_AllExamples { @@ -59,7 +61,7 @@ protected override void OnStartup(StartupEventArgs e) .AddSingleton() .AddScoped() - .AddSingleton() + .AddSingleton() .AddSingleton() ; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/MVVM_AllExamples.csproj b/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/MVVM_AllExamples.csproj index e031d3d52..997f50261 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/MVVM_AllExamples.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_AllExamples/MVVM_AllExamples.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/AppTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/AppTests.cs index 5bcafb794..8f7cb34cc 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/AppTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using MVVM_AllExamples.Models; using System; diff --git a/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/MVVM_AllExamplesTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/MVVM_AllExamplesTests.csproj index 998b51544..acf56ead1 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/MVVM_AllExamplesTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_AllExamplesTests/MVVM_AllExamplesTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/MVVM_Tutorial/SyncAsyncParallel/SyncAsyncParallel.csproj b/CSharpBible/MVVM_Tutorial/SyncAsyncParallel/SyncAsyncParallel.csproj index 225a43ab6..f70e73043 100644 --- a/CSharpBible/MVVM_Tutorial/SyncAsyncParallel/SyncAsyncParallel.csproj +++ b/CSharpBible/MVVM_Tutorial/SyncAsyncParallel/SyncAsyncParallel.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/WpfApp1/WpfApp.csproj b/CSharpBible/MVVM_Tutorial/WpfApp1/WpfApp.csproj index b9f13d3ba..c5388938b 100644 --- a/CSharpBible/MVVM_Tutorial/WpfApp1/WpfApp.csproj +++ b/CSharpBible/MVVM_Tutorial/WpfApp1/WpfApp.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfAppTests.csproj b/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfAppTests.csproj index 38519f356..3e7ebca7d 100644 --- a/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfAppTests.csproj +++ b/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfAppTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false diff --git a/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfApp_netTests.csproj b/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfApp_netTests.csproj index 1f65ea988..66aa9943e 100644 --- a/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfApp_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/WpfAppTests/WpfApp_netTests.csproj @@ -17,6 +17,5 @@ - diff --git a/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Pattern_00_Template.csproj b/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Pattern_00_Template.csproj index 610cab04b..f13df8e7f 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Pattern_00_Template.csproj +++ b/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Pattern_00_Template.csproj @@ -2,7 +2,7 @@ Exe - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 diff --git a/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Pattern_00_Template_net.csproj b/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Pattern_00_Template_net.csproj deleted file mode 100644 index 38382e3d3..000000000 --- a/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Pattern_00_Template_net.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - Exe - net6.0;net7.0;net8.0 - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - True - True - Settings.settings - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - PublicSettingsSingleFileGenerator - Settings.Designer.cs - - - diff --git a/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Views/MainView.cs b/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Views/MainView.cs index 5465bb6f3..4b07beb1f 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Views/MainView.cs +++ b/CSharpBible/Patterns_Tutorial/Pattern_00_Template/Views/MainView.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Input; +using BaseLib.Interfaces; using ConsoleDisplay.View; using Pattern_00_Template.ViewModels; diff --git a/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Pattern_00_TemplateTests.csproj b/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Pattern_00_TemplateTests.csproj index 70069691a..4ecf7532a 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Pattern_00_TemplateTests.csproj +++ b/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Pattern_00_TemplateTests.csproj @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Pattern_00_Template_netTests.csproj b/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Pattern_00_Template_netTests.csproj deleted file mode 100644 index 0437af149..000000000 --- a/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Pattern_00_Template_netTests.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - net6.0;net7.0;net8.0 - true - false - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - diff --git a/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Views/TestConsole.cs b/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Views/TestConsole.cs index d3f4b56c3..3c994055d 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Views/TestConsole.cs +++ b/CSharpBible/Patterns_Tutorial/Pattern_00_TemplateTests/Views/TestConsole.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using ConsoleDisplay.View; +using BaseLib.Interfaces; using System; namespace Pattern_00_Template.Views.Tests diff --git a/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Pattern_01_Singleton.csproj b/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Pattern_01_Singleton.csproj index 610cab04b..f13df8e7f 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Pattern_01_Singleton.csproj +++ b/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Pattern_01_Singleton.csproj @@ -2,7 +2,7 @@ Exe - net462;net472;net48;net481 + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 diff --git a/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Pattern_01_Singleton_net.csproj b/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Pattern_01_Singleton_net.csproj deleted file mode 100644 index 38382e3d3..000000000 --- a/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Pattern_01_Singleton_net.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - Exe - net6.0;net7.0;net8.0 - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - True - True - Settings.settings - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - PublicSettingsSingleFileGenerator - Settings.Designer.cs - - - diff --git a/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Views/MainView.cs b/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Views/MainView.cs index 2491ae52b..cbc8ccb83 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Views/MainView.cs +++ b/CSharpBible/Patterns_Tutorial/Pattern_01_Singleton/Views/MainView.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Input; +using BaseLib.Interfaces; using ConsoleDisplay.View; using Pattern_01_Singleton.Models; using Pattern_01_Singleton.ViewModels; diff --git a/CSharpBible/Patterns_Tutorial/Pattern_01_SingletonTests/Pattern_01_SingletonTests.csproj b/CSharpBible/Patterns_Tutorial/Pattern_01_SingletonTests/Pattern_01_SingletonTests.csproj index 0ec7fe26c..ec166c7e9 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_01_SingletonTests/Pattern_01_SingletonTests.csproj +++ b/CSharpBible/Patterns_Tutorial/Pattern_01_SingletonTests/Pattern_01_SingletonTests.csproj @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Patterns_Tutorial/Pattern_01_SingletonTests/Pattern_01_Singleton_netTests.csproj b/CSharpBible/Patterns_Tutorial/Pattern_01_SingletonTests/Pattern_01_Singleton_netTests.csproj deleted file mode 100644 index 0fc88ce42..000000000 --- a/CSharpBible/Patterns_Tutorial/Pattern_01_SingletonTests/Pattern_01_Singleton_netTests.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - net6.0;net7.0;net8.0 - true - false - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - diff --git a/CSharpBible/Patterns_Tutorial/Pattern_02_Observer/Pattern_02_Observer.csproj b/CSharpBible/Patterns_Tutorial/Pattern_02_Observer/Pattern_02_Observer.csproj index 610cab04b..82297b32f 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_02_Observer/Pattern_02_Observer.csproj +++ b/CSharpBible/Patterns_Tutorial/Pattern_02_Observer/Pattern_02_Observer.csproj @@ -2,8 +2,8 @@ Exe - net462;net472;net48;net481 - + net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0 + diff --git a/CSharpBible/Patterns_Tutorial/Pattern_02_Observer/Pattern_02_Observer_net.csproj b/CSharpBible/Patterns_Tutorial/Pattern_02_Observer/Pattern_02_Observer_net.csproj deleted file mode 100644 index 38382e3d3..000000000 --- a/CSharpBible/Patterns_Tutorial/Pattern_02_Observer/Pattern_02_Observer_net.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - Exe - net6.0;net7.0;net8.0 - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - True - True - Settings.settings - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - PublicSettingsSingleFileGenerator - Settings.Designer.cs - - - diff --git a/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Pattern_02_ObserverTests.csproj b/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Pattern_02_ObserverTests.csproj index 6b7f1541a..c4e44a2a0 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Pattern_02_ObserverTests.csproj +++ b/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Pattern_02_ObserverTests.csproj @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Pattern_02_Observer_netTests.csproj b/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Pattern_02_Observer_netTests.csproj deleted file mode 100644 index 6fb47ba92..000000000 --- a/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Pattern_02_Observer_netTests.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - net6.0;net7.0;net8.0 - true - false - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - diff --git a/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Views/TestConsole.cs b/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Views/TestConsole.cs index 388667387..85bd0236d 100644 --- a/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Views/TestConsole.cs +++ b/CSharpBible/Patterns_Tutorial/Pattern_02_ObserverTests/Views/TestConsole.cs @@ -11,7 +11,7 @@ // // // *********************************************************************** -using ConsoleDisplay.View; +using BaseLib.Interfaces; using System; namespace Pattern_02_Observer.Views.Tests diff --git a/CSharpBible/SomeThing/SomeThing/SomeThing.csproj b/CSharpBible/SomeThing/SomeThing/SomeThing.csproj index e5ebc6d4a..fa866edfa 100644 --- a/CSharpBible/SomeThing/SomeThing/SomeThing.csproj +++ b/CSharpBible/SomeThing/SomeThing/SomeThing.csproj @@ -12,7 +12,7 @@ - + diff --git a/CSharpBible/SomeThing/SomeThing2/SomeThing2.csproj b/CSharpBible/SomeThing/SomeThing2/SomeThing2.csproj index df2bc1ec4..f7cccfe48 100644 --- a/CSharpBible/SomeThing/SomeThing2/SomeThing2.csproj +++ b/CSharpBible/SomeThing/SomeThing2/SomeThing2.csproj @@ -12,7 +12,7 @@ - + diff --git a/CSharpBible/SomeThing/SomeThing2a/SomeThing2a.csproj b/CSharpBible/SomeThing/SomeThing2a/SomeThing2a.csproj index 4c994c36b..2b17fb17d 100644 --- a/CSharpBible/SomeThing/SomeThing2a/SomeThing2a.csproj +++ b/CSharpBible/SomeThing/SomeThing2a/SomeThing2a.csproj @@ -12,7 +12,7 @@ - + diff --git a/CSharpBible/TestConsole/TestConsole_net.csproj b/CSharpBible/TestConsole/TestConsole_net.csproj index 4bc67bd09..bfa7a0d8c 100644 --- a/CSharpBible/TestConsole/TestConsole_net.csproj +++ b/CSharpBible/TestConsole/TestConsole_net.csproj @@ -15,10 +15,7 @@ - - - + - diff --git a/CSharpBible/TestConsoleTests/TestConsoleTests.csproj b/CSharpBible/TestConsoleTests/TestConsoleTests.csproj index 945a1874d..0b05356f5 100644 --- a/CSharpBible/TestConsoleTests/TestConsoleTests.csproj +++ b/CSharpBible/TestConsoleTests/TestConsoleTests.csproj @@ -28,7 +28,6 @@ - diff --git a/CSharpBible/Tests/Test.csproj b/CSharpBible/Tests/Test.csproj index b4cb43436..3eee38967 100644 --- a/CSharpBible/Tests/Test.csproj +++ b/CSharpBible/Tests/Test.csproj @@ -1,7 +1,7 @@ - + - net6.0 + net462;net472;net48;net481;net6.0 false @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/CSharpBible/WPFSamples_2/WPF_AnimationTiming/WPF_AnimationTiming.csproj b/CSharpBible/WPFSamples_2/WPF_AnimationTiming/WPF_AnimationTiming.csproj index 47c8a892f..df7268ff1 100644 --- a/CSharpBible/WPFSamples_2/WPF_AnimationTiming/WPF_AnimationTiming.csproj +++ b/CSharpBible/WPFSamples_2/WPF_AnimationTiming/WPF_AnimationTiming.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/AppTests.cs index db7d8efc6..7f27acac3 100644 --- a/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using WPF_AnimationTiming.Models; using System; diff --git a/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/WPF_AnimationTimingTests.csproj b/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/WPF_AnimationTimingTests.csproj index 673cee7b6..b06cfe52e 100644 --- a/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/WPF_AnimationTimingTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_AnimationTimingTests/WPF_AnimationTimingTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_Complex_Layout/WPF_Complex_Layout.csproj b/CSharpBible/WPFSamples_2/WPF_Complex_Layout/WPF_Complex_Layout.csproj index a811f8ea4..a20e5851b 100644 --- a/CSharpBible/WPFSamples_2/WPF_Complex_Layout/WPF_Complex_Layout.csproj +++ b/CSharpBible/WPFSamples_2/WPF_Complex_Layout/WPF_Complex_Layout.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/AppTests.cs index 32c37fd2e..cbbdb4919 100644 --- a/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using System; namespace WPF_Complex_Layout.Tests diff --git a/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/WPF_Complex_LayoutTests.csproj b/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/WPF_Complex_LayoutTests.csproj index b41a44753..bd52d9243 100644 --- a/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/WPF_Complex_LayoutTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_Complex_LayoutTests/WPF_Complex_LayoutTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_ControlsAndLayout/WPF_ControlsAndLayout.csproj b/CSharpBible/WPFSamples_2/WPF_ControlsAndLayout/WPF_ControlsAndLayout.csproj index b0bfd64ab..f50d31674 100644 --- a/CSharpBible/WPFSamples_2/WPF_ControlsAndLayout/WPF_ControlsAndLayout.csproj +++ b/CSharpBible/WPFSamples_2/WPF_ControlsAndLayout/WPF_ControlsAndLayout.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/AppTests.cs index 38fc9f7b4..bc1709829 100644 --- a/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using WPF_ControlsAndLayout.Models; using System; using WPF_ControlsAndLayout.Models.Interfaces; diff --git a/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/WPF_ControlsAndLayoutTests.csproj b/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/WPF_ControlsAndLayoutTests.csproj index e116b1ba3..9f6c035be 100644 --- a/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/WPF_ControlsAndLayoutTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_ControlsAndLayoutTests/WPF_ControlsAndLayoutTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_CustomAnimation/WPF_CustomAnimation.csproj b/CSharpBible/WPFSamples_2/WPF_CustomAnimation/WPF_CustomAnimation.csproj index a811f8ea4..a20e5851b 100644 --- a/CSharpBible/WPFSamples_2/WPF_CustomAnimation/WPF_CustomAnimation.csproj +++ b/CSharpBible/WPFSamples_2/WPF_CustomAnimation/WPF_CustomAnimation.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/AppTests.cs index fc0826785..ce0812ae4 100644 --- a/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using WPF_CustomAnimation.Models; using System; diff --git a/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/WPF_CustomAnimationTests.csproj b/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/WPF_CustomAnimationTests.csproj index 043209761..39f02468d 100644 --- a/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/WPF_CustomAnimationTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_CustomAnimationTests/WPF_CustomAnimationTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_Hello_World/WPF_Hello_World.csproj b/CSharpBible/WPFSamples_2/WPF_Hello_World/WPF_Hello_World.csproj index ef49d0511..4a43d8a0a 100644 --- a/CSharpBible/WPFSamples_2/WPF_Hello_World/WPF_Hello_World.csproj +++ b/CSharpBible/WPFSamples_2/WPF_Hello_World/WPF_Hello_World.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/AppTests.cs index f0bdf17aa..5fb215b03 100644 --- a/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using System; namespace WPF_Hello_World.Tests diff --git a/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/WPF_Hello_WorldTests.csproj b/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/WPF_Hello_WorldTests.csproj index 78771db3a..4fa3dcbed 100644 --- a/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/WPF_Hello_WorldTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_Hello_WorldTests/WPF_Hello_WorldTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_MasterDetail/WPF_MasterDetail.csproj b/CSharpBible/WPFSamples_2/WPF_MasterDetail/WPF_MasterDetail.csproj index 136f64664..e557dfab8 100644 --- a/CSharpBible/WPFSamples_2/WPF_MasterDetail/WPF_MasterDetail.csproj +++ b/CSharpBible/WPFSamples_2/WPF_MasterDetail/WPF_MasterDetail.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/AppTests.cs index 493c23b99..ace398b65 100644 --- a/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using WPF_MasterDetail.Models; using System; diff --git a/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/WPF_MasterDetailTests.csproj b/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/WPF_MasterDetailTests.csproj index a621b8e09..91ef163c2 100644 --- a/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/WPF_MasterDetailTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_MasterDetailTests/WPF_MasterDetailTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_MoveWindow/WPF_MoveWindow.csproj b/CSharpBible/WPFSamples_2/WPF_MoveWindow/WPF_MoveWindow.csproj index a811f8ea4..a20e5851b 100644 --- a/CSharpBible/WPFSamples_2/WPF_MoveWindow/WPF_MoveWindow.csproj +++ b/CSharpBible/WPFSamples_2/WPF_MoveWindow/WPF_MoveWindow.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/AppTests.cs index 11d7a4d0b..459b8f121 100644 --- a/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using WPF_MoveWindow.Models; using System; diff --git a/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/WPF_MoveWindowTests.csproj b/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/WPF_MoveWindowTests.csproj index db648ca27..c321f4eb5 100644 --- a/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/WPF_MoveWindowTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_MoveWindowTests/WPF_MoveWindowTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_Sample_Template/WPF_Sample_Template.csproj b/CSharpBible/WPFSamples_2/WPF_Sample_Template/WPF_Sample_Template.csproj index ef49d0511..4a43d8a0a 100644 --- a/CSharpBible/WPFSamples_2/WPF_Sample_Template/WPF_Sample_Template.csproj +++ b/CSharpBible/WPFSamples_2/WPF_Sample_Template/WPF_Sample_Template.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true diff --git a/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/AppTests.cs index c023d0efb..49ad75e7b 100644 --- a/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using WPF_Sample_Template.Models; using System; diff --git a/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/WPF_Sample_TemplateTests.csproj b/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/WPF_Sample_TemplateTests.csproj index 7da0896a7..cff858aa6 100644 --- a/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/WPF_Sample_TemplateTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_Sample_TemplateTests/WPF_Sample_TemplateTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Properties/Resources.Designer.cs b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Properties/Resources.Designer.cs index 56ad9106c..b69cf2b12 100644 --- a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Properties/Resources.Designer.cs +++ b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Properties/Resources.Designer.cs @@ -70,15 +70,14 @@ public static string Description { } /// - /// Sucht eine lokalisierte Zeichenfolge, die <Page + /// Sucht eine lokalisierte Zeichenfolge, die <Page x:Class="WPF_StickyNotesDemo.Views.StickyNotesView" /// xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + /// xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" /// 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:local="clr-namespace:WPF_StickyNotesDemo.Views" - /// xmlns:p="clr-namespace:WPF_StickyNotesDemo.Properties" - /// xmlns:vc="clr-namespace:WPF_StickyNotesDemo.ValueConverter" - /// xmlns:mvvm="clr-namespace: [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt. + /// xmlns:p="clr-namespace:WPF_ [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt. /// public static string StickyNotesView { get { diff --git a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/MailSettingsDialog.cs b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/MailSettingsDialog.cs index 7cd9cc562..8b2deeab8 100644 --- a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/MailSettingsDialog.cs +++ b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/MailSettingsDialog.cs @@ -32,7 +32,7 @@ public MailSettingsDialog() var b = new Button { - Background = Window.ChangeBackgroundColor(Colors.SkyBlue), + Background = new SolidColorBrush(Colors.SkyBlue), Height = 245 }; diff --git a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/StickyNotesView.xaml b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/StickyNotesView.xaml index 67c5d9084..b48d2e8b3 100644 --- a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/StickyNotesView.xaml +++ b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/Views/StickyNotesView.xaml @@ -1,5 +1,6 @@  - + diff --git a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo.csproj b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo.csproj index 57d068517..59520d7b0 100644 --- a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo.csproj +++ b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo.csproj @@ -2,7 +2,7 @@ WinExe - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true @@ -12,6 +12,7 @@ + @@ -21,9 +22,9 @@ - True - True - Resources.resx + True + True + Resources.resx True @@ -32,10 +33,11 @@ - - PublicResXFileCodeGenerator - Resources.Designer.cs - + + PublicResXFileCodeGenerator + Resources.Designer.cs + Never + diff --git a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo_net.csproj b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo_net.csproj index 8702d7d73..fc8b2dcd6 100644 --- a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo_net.csproj +++ b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemo/WPF_StickyNotesDemo_net.csproj @@ -9,6 +9,7 @@ + diff --git a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/AppTests.cs b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/AppTests.cs index f2a068424..67f9b97e1 100644 --- a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/AppTests.cs +++ b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/AppTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; +using BaseLib.Helper; using WPF_StickyNotesDemo.Models; using System; diff --git a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/WPF_StickyNotesDemoTests.csproj b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/WPF_StickyNotesDemoTests.csproj index 960ad86ce..99c64c011 100644 --- a/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/WPF_StickyNotesDemoTests.csproj +++ b/CSharpBible/WPFSamples_2/WPF_StickyNotesDemoTests/WPF_StickyNotesDemoTests.csproj @@ -1,7 +1,7 @@  - net462-windows;net472-windows;net48-windows;net481-windows + net462;net472;net48;net481 true false true diff --git a/CSharpBible/Web/BlazorWasmDocker/BlazorWasmDocker.csproj b/CSharpBible/Web/BlazorWasmDocker/BlazorWasmDocker.csproj index 47d0fc2a6..65e923233 100644 --- a/CSharpBible/Web/BlazorWasmDocker/BlazorWasmDocker.csproj +++ b/CSharpBible/Web/BlazorWasmDocker/BlazorWasmDocker.csproj @@ -38,8 +38,8 @@ - - + + diff --git a/CSharpBible/Web/BlazorWasmDocker/Program.cs b/CSharpBible/Web/BlazorWasmDocker/Program.cs index 983b9b2ba..39e6e15d6 100644 --- a/CSharpBible/Web/BlazorWasmDocker/Program.cs +++ b/CSharpBible/Web/BlazorWasmDocker/Program.cs @@ -10,7 +10,7 @@ using BlazorWasmDocker.Models.Interfaces; using LocalStorage.Services; using BlazorWasmDocker.Services; -using ConsoleDisplay.View; +using BaseLib.Interfaces; var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add("#app"); diff --git a/CSharpBible/Web/BlazorWasmDocker/Views/Pages/Home.razor b/CSharpBible/Web/BlazorWasmDocker/Views/Pages/Home.razor index 52af015b8..85e7ec662 100644 --- a/CSharpBible/Web/BlazorWasmDocker/Views/Pages/Home.razor +++ b/CSharpBible/Web/BlazorWasmDocker/Views/Pages/Home.razor @@ -1,5 +1,5 @@ @page "/" -@using ConsoleDisplay.View; +@using BaseLib.Interfaces; @inject IConsole console; Home diff --git a/CSharpBible/Web/BlazorWasmDocker/Views/Shared/RConsole.razor b/CSharpBible/Web/BlazorWasmDocker/Views/Shared/RConsole.razor index d2f04d6df..3c85b91fa 100644 --- a/CSharpBible/Web/BlazorWasmDocker/Views/Shared/RConsole.razor +++ b/CSharpBible/Web/BlazorWasmDocker/Views/Shared/RConsole.razor @@ -1,41 +1,42 @@ @using BlazorWasmDocker.ViewModels.Interfaces; @using System.ComponentModel; @using BlazorWasmDocker.Models; +

RConsole

-
- +
+ +
- - - - - - + + + + + + @for (var row = 0; row<=25; row++) { - + @for (var col =0;col<=79;col++) { - } } - +
- - - - 
@Title
- 		- _ - - # - - X -
-@Title_#X
- 
@(Buffer[col + row*80] is ' ' or '\0' ?'\u00a0':Buffer[col + row*80])
+ 		+ @(Buffer[col + row*80] is ' ' or '\0' ?'\u00a0':Buffer[col + row*80])
+
@code { [Parameter] diff --git a/GenFreeWin/GenFreeBase/GenFreeBase.csproj b/GenFreeWin/GenFreeBase/GenFreeBase.csproj index 2e8fe5585..a7fe4f674 100644 --- a/GenFreeWin/GenFreeBase/GenFreeBase.csproj +++ b/GenFreeWin/GenFreeBase/GenFreeBase.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;net481-windows + net8.0;net7.0;net6.0;net481 disable Windows enable diff --git a/GenFreeWin/GenFreeBaseTests/GenFreeBaseTests.csproj b/GenFreeWin/GenFreeBaseTests/GenFreeBaseTests.csproj index 21adc3085..1742be407 100644 --- a/GenFreeWin/GenFreeBaseTests/GenFreeBaseTests.csproj +++ b/GenFreeWin/GenFreeBaseTests/GenFreeBaseTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 enable false diff --git a/GenFreeWin/GenFreeData/GenFreeData.csproj b/GenFreeWin/GenFreeData/GenFreeData.csproj index a83437a74..b3bc1c77c 100644 --- a/GenFreeWin/GenFreeData/GenFreeData.csproj +++ b/GenFreeWin/GenFreeData/GenFreeData.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;net481-windows + net8.0;net7.0;net6.0;net481 disable enable GenFree diff --git a/GenFreeWin/GenFreeDataTests/GenFreeDataTests.csproj b/GenFreeWin/GenFreeDataTests/GenFreeDataTests.csproj index 3d4f44780..d536a8057 100644 --- a/GenFreeWin/GenFreeDataTests/GenFreeDataTests.csproj +++ b/GenFreeWin/GenFreeDataTests/GenFreeDataTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 enable false diff --git a/GenFreeWin/GenFreeHelper/GenFreeHelper.csproj b/GenFreeWin/GenFreeHelper/GenFreeHelper.csproj index c532d9f5f..95a17d581 100644 --- a/GenFreeWin/GenFreeHelper/GenFreeHelper.csproj +++ b/GenFreeWin/GenFreeHelper/GenFreeHelper.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;net481-windows + net8.0;net7.0;net6.0;net481 disable enable GenFree diff --git a/GenFreeWin/GenFreeHelperTests/GenFreeHelperTests.csproj b/GenFreeWin/GenFreeHelperTests/GenFreeHelperTests.csproj index 6ac110bcc..810784c3e 100644 --- a/GenFreeWin/GenFreeHelperTests/GenFreeHelperTests.csproj +++ b/GenFreeWin/GenFreeHelperTests/GenFreeHelperTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 enable false diff --git a/GenFreeWin/Gen_FreeWin.sln b/GenFreeWin/Gen_FreeWin.sln index 60198bf25..17867957c 100644 --- a/GenFreeWin/Gen_FreeWin.sln +++ b/GenFreeWin/Gen_FreeWin.sln @@ -50,12 +50,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MdbBrowserTests", "MdbBrows EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLib", "..\CSharpBible\Libraries\MVVM_BaseLib\MVVM_BaseLib.csproj", "{9EA5AE42-4A78-4D73-A9A3-29EDD88A18F6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLib_net", "..\CSharpBible\Libraries\MVVM_BaseLib\MVVM_BaseLib_net.csproj", "{043D82CE-DE0D-4C15-A0B8-09809B28B543}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLibTests", "..\CSharpBible\Libraries\MVVM_BaseLibTests\MVVM_BaseLibTests.csproj", "{344EEF76-9D81-49D3-9EB5-1F629EDFBD14}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_BaseLibTests_net", "..\CSharpBible\Libraries\MVVM_BaseLibTests\MVVM_BaseLibTests_net.csproj", "{D0D60A2C-7329-46AE-9229-AF73D7CE1058}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonDialogs", "..\CSharpBible\Libraries\CommonDialogs\CommonDialogs.csproj", "{5ECC12F4-F228-478A-965A-3A93B045DF51}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonDialogs_net", "..\CSharpBible\Libraries\CommonDialogs\CommonDialogs_net.csproj", "{C49B0328-C78F-4BAE-862E-452C19E3A4BA}" @@ -92,6 +88,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinAhnenCls", "..\WinAhnenN EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinAhnenClsTests", "..\WinAhnenNew\WinAhnenClsTests\WinAhnenClsTests.csproj", "{B23BC158-49B5-4408-9C5E-C2BB24D4DEAC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseLib", "..\CSharpBible\Libraries\BaseLib\BaseLib.csproj", "{75D90630-07F7-46A4-86EC-C185C5473BA9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -202,14 +200,6 @@ Global {9EA5AE42-4A78-4D73-A9A3-29EDD88A18F6}.Release|Any CPU.Build.0 = Release|Any CPU {9EA5AE42-4A78-4D73-A9A3-29EDD88A18F6}.Release|x86.ActiveCfg = Release|x86 {9EA5AE42-4A78-4D73-A9A3-29EDD88A18F6}.Release|x86.Build.0 = Release|x86 - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Debug|Any CPU.Build.0 = Debug|Any CPU - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Debug|x86.ActiveCfg = Debug|Any CPU - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Debug|x86.Build.0 = Debug|Any CPU - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Release|Any CPU.ActiveCfg = Release|Any CPU - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Release|Any CPU.Build.0 = Release|Any CPU - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Release|x86.ActiveCfg = Release|Any CPU - {043D82CE-DE0D-4C15-A0B8-09809B28B543}.Release|x86.Build.0 = Release|Any CPU {344EEF76-9D81-49D3-9EB5-1F629EDFBD14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {344EEF76-9D81-49D3-9EB5-1F629EDFBD14}.Debug|Any CPU.Build.0 = Debug|Any CPU {344EEF76-9D81-49D3-9EB5-1F629EDFBD14}.Debug|x86.ActiveCfg = Debug|x86 @@ -218,14 +208,30 @@ Global {344EEF76-9D81-49D3-9EB5-1F629EDFBD14}.Release|Any CPU.Build.0 = Release|Any CPU {344EEF76-9D81-49D3-9EB5-1F629EDFBD14}.Release|x86.ActiveCfg = Release|x86 {344EEF76-9D81-49D3-9EB5-1F629EDFBD14}.Release|x86.Build.0 = Release|x86 - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Debug|x86.ActiveCfg = Debug|Any CPU - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Debug|x86.Build.0 = Debug|Any CPU - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Release|Any CPU.Build.0 = Release|Any CPU - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Release|x86.ActiveCfg = Release|Any CPU - {D0D60A2C-7329-46AE-9229-AF73D7CE1058}.Release|x86.Build.0 = Release|Any CPU + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|x86.ActiveCfg = Debug|x86 + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|x86.Build.0 = Debug|x86 + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|Any CPU.Build.0 = Release|Any CPU + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|x86.ActiveCfg = Release|x86 + {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|x86.Build.0 = Release|x86 + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|x86.ActiveCfg = Debug|x86 + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|x86.Build.0 = Debug|x86 + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|Any CPU.Build.0 = Release|Any CPU + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|x86.ActiveCfg = Release|x86 + {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|x86.Build.0 = Release|x86 + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|x86.ActiveCfg = Debug|Any CPU + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|x86.Build.0 = Debug|Any CPU + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|Any CPU.Build.0 = Release|Any CPU + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|x86.ActiveCfg = Release|Any CPU + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|x86.Build.0 = Release|Any CPU {FC6A0595-BB07-4987-8205-C2A57345199D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FC6A0595-BB07-4987-8205-C2A57345199D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC6A0595-BB07-4987-8205-C2A57345199D}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -282,22 +288,6 @@ Global {8B70734E-8065-42B3-9025-96EEF88D890A}.Release|Any CPU.Build.0 = Release|Any CPU {8B70734E-8065-42B3-9025-96EEF88D890A}.Release|x86.ActiveCfg = Release|Any CPU {8B70734E-8065-42B3-9025-96EEF88D890A}.Release|x86.Build.0 = Release|Any CPU - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|x86.ActiveCfg = Debug|x86 - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Debug|x86.Build.0 = Debug|x86 - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|Any CPU.Build.0 = Release|Any CPU - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|x86.ActiveCfg = Release|x86 - {5ECC12F4-F228-478A-965A-3A93B045DF51}.Release|x86.Build.0 = Release|x86 - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|x86.ActiveCfg = Debug|x86 - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Debug|x86.Build.0 = Debug|x86 - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|Any CPU.Build.0 = Release|Any CPU - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|x86.ActiveCfg = Release|x86 - {C49B0328-C78F-4BAE-862E-452C19E3A4BA}.Release|x86.Build.0 = Release|x86 {E382C6FC-53E0-41A7-8B39-C41F6C2E67CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E382C6FC-53E0-41A7-8B39-C41F6C2E67CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {E382C6FC-53E0-41A7-8B39-C41F6C2E67CC}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -346,14 +336,14 @@ Global {B23BC158-49B5-4408-9C5E-C2BB24D4DEAC}.Release|Any CPU.Build.0 = Release|Any CPU {B23BC158-49B5-4408-9C5E-C2BB24D4DEAC}.Release|x86.ActiveCfg = Release|Any CPU {B23BC158-49B5-4408-9C5E-C2BB24D4DEAC}.Release|x86.Build.0 = Release|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|x86.ActiveCfg = Debug|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Debug|x86.Build.0 = Debug|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|Any CPU.Build.0 = Release|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|x86.ActiveCfg = Release|Any CPU - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6}.Release|x86.Build.0 = Release|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Debug|x86.ActiveCfg = Debug|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Debug|x86.Build.0 = Debug|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Release|Any CPU.Build.0 = Release|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Release|x86.ActiveCfg = Release|Any CPU + {75D90630-07F7-46A4-86EC-C185C5473BA9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -369,9 +359,10 @@ Global {0C66B179-B65C-425E-B28E-36F03A1DA4C4} = {3BA154B1-5A96-474B-ABCF-8EBD41E2CD0A} {458F102A-7BFD-4DBB-B036-61AAE8A081E2} = {3BA154B1-5A96-474B-ABCF-8EBD41E2CD0A} {9EA5AE42-4A78-4D73-A9A3-29EDD88A18F6} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} - {043D82CE-DE0D-4C15-A0B8-09809B28B543} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} {344EEF76-9D81-49D3-9EB5-1F629EDFBD14} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} - {D0D60A2C-7329-46AE-9229-AF73D7CE1058} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} + {5ECC12F4-F228-478A-965A-3A93B045DF51} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} + {C49B0328-C78F-4BAE-862E-452C19E3A4BA} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} + {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} {FC6A0595-BB07-4987-8205-C2A57345199D} = {2365079F-BDCB-455D-BEB4-9C5D270B2E7A} {DEDE273F-5CF8-4954-B350-74C0D95BE2C3} = {2365079F-BDCB-455D-BEB4-9C5D270B2E7A} {2AA84762-09B1-4BC4-BB41-DCE0E7C45E53} = {2365079F-BDCB-455D-BEB4-9C5D270B2E7A} @@ -379,14 +370,12 @@ Global {8C4D8881-9960-4E92-BCBB-B4C1F0A56E5F} = {2365079F-BDCB-455D-BEB4-9C5D270B2E7A} {4DC761EE-6579-4030-97B9-0558A2A44A3F} = {2365079F-BDCB-455D-BEB4-9C5D270B2E7A} {8B70734E-8065-42B3-9025-96EEF88D890A} = {2365079F-BDCB-455D-BEB4-9C5D270B2E7A} - {5ECC12F4-F228-478A-965A-3A93B045DF51} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} - {C49B0328-C78F-4BAE-862E-452C19E3A4BA} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} {E382C6FC-53E0-41A7-8B39-C41F6C2E67CC} = {3BA154B1-5A96-474B-ABCF-8EBD41E2CD0A} {9F4C1A90-7D00-4E3E-A539-05A70DC7C2B3} = {3BA154B1-5A96-474B-ABCF-8EBD41E2CD0A} {AB31AF4A-B298-417C-AEC0-0E7E3D4EBCAA} = {2A2E129C-95B6-4192-BA94-D9C5A249AB43} {DC2A9691-41FE-47F9-A439-D76D2ED8E9B5} = {2A2E129C-95B6-4192-BA94-D9C5A249AB43} {B23BC158-49B5-4408-9C5E-C2BB24D4DEAC} = {2A2E129C-95B6-4192-BA94-D9C5A249AB43} - {259C4D8A-D667-4F41-BB7B-ABF0C29EE7A6} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} + {75D90630-07F7-46A4-86EC-C185C5473BA9} = {DDC1E0CB-8182-454A-8B2B-2F2CF9A2059B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3B766B89-B32C-4777-9290-8BF7CEC401B5} diff --git a/GenFreeWin/MSQBrowser/MSQBrowser.csproj b/GenFreeWin/MSQBrowser/MSQBrowser.csproj index 698d05671..1e070c033 100644 --- a/GenFreeWin/MSQBrowser/MSQBrowser.csproj +++ b/GenFreeWin/MSQBrowser/MSQBrowser.csproj @@ -2,7 +2,7 @@ WinExe - net481-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows enable true diff --git a/GenFreeWin/MSQBrowserTests/MSQBrowserTests.csproj b/GenFreeWin/MSQBrowserTests/MSQBrowserTests.csproj index f44e0d73f..2667b46b6 100644 --- a/GenFreeWin/MSQBrowserTests/MSQBrowserTests.csproj +++ b/GenFreeWin/MSQBrowserTests/MSQBrowserTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows disable enable diff --git a/GenFreeWin/MdbBrowser/MdbBrowser.csproj b/GenFreeWin/MdbBrowser/MdbBrowser.csproj index 0a012835d..f5a032d14 100644 --- a/GenFreeWin/MdbBrowser/MdbBrowser.csproj +++ b/GenFreeWin/MdbBrowser/MdbBrowser.csproj @@ -2,7 +2,7 @@ WinExe - net481-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows enable true diff --git a/GenFreeWin/MdbBrowserTests/MdbBrowserTests.csproj b/GenFreeWin/MdbBrowserTests/MdbBrowserTests.csproj index 0803dd2af..3d940f433 100644 --- a/GenFreeWin/MdbBrowserTests/MdbBrowserTests.csproj +++ b/GenFreeWin/MdbBrowserTests/MdbBrowserTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net472-windows;net462-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows disable enable diff --git a/GenFreeWin/VBUnObfusicator/VBUnObfusicator.csproj b/GenFreeWin/VBUnObfusicator/VBUnObfusicator.csproj index 1c9e68e7c..8cefd6ea4 100644 --- a/GenFreeWin/VBUnObfusicator/VBUnObfusicator.csproj +++ b/GenFreeWin/VBUnObfusicator/VBUnObfusicator.csproj @@ -2,7 +2,7 @@ WinExe - net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net6.0-windows;net7.0-windows;net8.0-windows enable true diff --git a/GenFreeWin/VBUnObfusicatorTests/VBUnObfusicatorTests.csproj b/GenFreeWin/VBUnObfusicatorTests/VBUnObfusicatorTests.csproj index 9a4842ff9..be3aa6971 100644 --- a/GenFreeWin/VBUnObfusicatorTests/VBUnObfusicatorTests.csproj +++ b/GenFreeWin/VBUnObfusicatorTests/VBUnObfusicatorTests.csproj @@ -1,7 +1,7 @@  - net481-windows;net6.0-windows;net7.0-windows;net8.0-windows + net481;net6.0-windows;net7.0-windows;net8.0-windows enable false diff --git a/JC-AMS/Core.Tests/Core.Tests.csproj b/JC-AMS/Core.Tests/Core.Tests.csproj index 37d09eef9..75fef86b2 100644 --- a/JC-AMS/Core.Tests/Core.Tests.csproj +++ b/JC-AMS/Core.Tests/Core.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/JC-AMS/Core.Tests/Core/Converter/CBoolClassConverterTests.cs b/JC-AMS/Core.Tests/Core/Converter/CBoolClassConverterTests.cs index 3f97c20c0..252decfa4 100644 --- a/JC-AMS/Core.Tests/Core/Converter/CBoolClassConverterTests.cs +++ b/JC-AMS/Core.Tests/Core/Converter/CBoolClassConverterTests.cs @@ -1,10 +1,4 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using JCAMS.Core.Converter; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace JCAMS.Core.Converter.Tests { diff --git a/JC-AMS/Core/Core.csproj b/JC-AMS/Core/Core.csproj index f9c2bd14a..467d960dc 100644 --- a/JC-AMS/Core/Core.csproj +++ b/JC-AMS/Core/Core.csproj @@ -9,12 +9,6 @@ True - - AnyCPU - - - x64 - @@ -33,13 +27,13 @@ - - - - - - - + + + + + + + diff --git a/TestStatements/AsyncExampleWPF/AsyncExampleWPF.csproj b/TestStatements/AsyncExampleWPF/AsyncExampleWPF.csproj index c45fcbb05..22750eb3b 100644 --- a/TestStatements/AsyncExampleWPF/AsyncExampleWPF.csproj +++ b/TestStatements/AsyncExampleWPF/AsyncExampleWPF.csproj @@ -4,7 +4,7 @@ WinExe - net462-windows;net472-windows;net481-windows + net462;net472;net48;net481 true diff --git a/TestStatements/SOq1/Program.cs b/TestStatements/SOq1/Program.cs new file mode 100644 index 000000000..93c07adf2 --- /dev/null +++ b/TestStatements/SOq1/Program.cs @@ -0,0 +1,156 @@ +using ILGPU; +using ILGPU.Runtime; +using System; +using System.Collections.Generic; + +public class RMatrixKernels +{ + public static void AdditionKernel(Index2D index, ArrayView2D matrixA, ArrayView2D matrixB, ArrayView2D result) + { + result[index] = matrixA[index] + matrixB[index]; + } + + public static void ScalarMultiplyKernel( + Index2D index, + ArrayView2D aView, int scalar, + ArrayView2D cView) + { + cView[index] = aView[index] * scalar; + } +} + +public static class RMatrixExtensions +{ + public static Action, ArrayView2D, ArrayView2D> BuildAdditionKernel(this Accelerator accelerator_) + { + return accelerator_.LoadAutoGroupedStreamKernel, ArrayView2D, ArrayView2D>(RMatrixKernels.AdditionKernel); + } + public static Action, int, ArrayView2D> BuildSkalarMultiplyKernel(this Accelerator accelerator_) + { + return accelerator_.LoadAutoGroupedStreamKernel, int, ArrayView2D>(RMatrixKernels.ScalarMultiplyKernel); + } +} + +public class RMatrix +{ + + private int[,] matrix_; + public int Rows { get; private set; } + public int Cols { get; private set; } + + private static Accelerator accelerator_; + + static RMatrix() + { + var context_ = Context.CreateDefault(); + accelerator_ = context_.GetPreferredDevice(preferCPU: true).CreateAccelerator(context_); + } + + public RMatrix(int rows, int cols) + { + Rows = rows; + Cols = cols; + matrix_ = new int[rows, cols]; + } + + public RMatrix(int[,] arr) + { + Rows = arr.GetLength(0); + Cols = arr.GetLength(1); + matrix_ = new int[Rows, Cols]; + Array.Copy(arr, matrix_, arr.Length); + } + + public static RMatrix operator +(RMatrix a, RMatrix b) + { + if (a.Rows != b.Rows || a.Cols != b.Cols) + throw new ArgumentException("Matrix dimensions must match for addition."); + + var deviceMatrixA = accelerator_.Allocate2DDenseX(new Index2D(a.Rows, a.Cols)); + var deviceMatrixB = accelerator_.Allocate2DDenseX(new Index2D(a.Rows, a.Cols)); + var deviceResult = accelerator_.Allocate2DDenseX(new Index2D(a.Rows, a.Cols)); + + deviceMatrixA.CopyFromCPU(a.matrix_); + deviceMatrixB.CopyFromCPU(b.matrix_); + + //TODO: + var kernel = accelerator_.BuildAdditionKernel(); + + kernel((a.Rows, a.Cols), deviceMatrixA.View, deviceMatrixB.View, deviceResult.View); + + accelerator_.Synchronize(); + + int[,] hostResult = new int[a.Rows, a.Cols]; + deviceResult.CopyToCPU(hostResult); + + deviceMatrixA.Dispose(); + deviceMatrixB.Dispose(); + deviceResult.Dispose(); + + return new RMatrix(hostResult); + } + + public static RMatrix operator *(RMatrix a, int scalar) + { + var deviceMatrixA = accelerator_.Allocate2DDenseX(new Index2D(a.Rows, a.Cols)); + var deviceResult = accelerator_.Allocate2DDenseX(new Index2D(a.Rows, a.Cols)); + + deviceMatrixA.CopyFromCPU(a.matrix_); + + //TODO: + var kernel = accelerator_.BuildSkalarMultiplyKernel(); + + kernel((a.Rows, a.Cols), deviceMatrixA.View, scalar, deviceResult.View); + + accelerator_.Synchronize(); + + int[,] hostResult = new int[a.Rows, a.Cols]; + deviceResult.CopyToCPU(hostResult); + + deviceMatrixA.Dispose(); + deviceResult.Dispose(); + + return new RMatrix(hostResult); + } + + + public void Show() + { + for (int i = 0; i < Rows; i++) + { + for (int j = 0; j < Cols; j++) + { + Console.Write(matrix_[i, j] + "\t"); + } + Console.WriteLine(); + } + } +} + +public static class Program +{ + static void Main(string[] arg) + { + int[,] hostMatrixA = { + { 1, 2, 3 }, + { 4, 5, 6 }, + { 7, 8, 9 } + }; + int[,] hostMatrixB = { + { 9, 8, 7 }, + { 6, 5, 4 }, + { 3, 2, 1 } + }; + + RMatrix a = new RMatrix(hostMatrixA); + RMatrix b = new RMatrix(hostMatrixB); + + RMatrix c = a + b; + RMatrix d = a * 10; + + Console.WriteLine("Matrix A + B:"); + c.Show(); + Console.WriteLine("\nMatrix A * 10:"); + d.Show(); + } +} \ No newline at end of file diff --git a/TestStatements/SOq1/SOq1.csproj b/TestStatements/SOq1/SOq1.csproj new file mode 100644 index 000000000..694d937eb --- /dev/null +++ b/TestStatements/SOq1/SOq1.csproj @@ -0,0 +1,14 @@ + + + + Exe + net8.0 + enable + enable + + + + + + + diff --git a/TestStatements/TestClockApp/TestClockApp.csproj b/TestStatements/TestClockApp/TestClockApp.csproj index 845fcf247..0e173f141 100644 --- a/TestStatements/TestClockApp/TestClockApp.csproj +++ b/TestStatements/TestClockApp/TestClockApp.csproj @@ -1,6 +1,7 @@  + - net9.0-windows + net481;net9.0-windows WinExe ..\..\obj\$(MSBuildProjectName)\ ..\..\bin\$(MSBuildProjectName)\ @@ -8,12 +9,6 @@ true true - - ..\..\bin\Debug\ - - - ..\..\bin\Release\ - diff --git a/TestStatements/TestProjDep.sln b/TestStatements/TestProjDep.sln new file mode 100644 index 000000000..cd5d25c85 --- /dev/null +++ b/TestStatements/TestProjDep.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35707.178 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProjDep", "TestProjDep\TestProjDep.csproj", "{106F8AFA-1B8E-43F0-AF06-8A3EB9AC1808}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProjLib", "TestProjLib\TestProjLib.csproj", "{63EFE13A-0117-4C09-9BC3-C167AE8D1764}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProjLib2", "TestProjLib2\TestProjLib2.csproj", "{990F13D3-1D98-4861-B302-50F1BEDD54CD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {106F8AFA-1B8E-43F0-AF06-8A3EB9AC1808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {106F8AFA-1B8E-43F0-AF06-8A3EB9AC1808}.Debug|Any CPU.Build.0 = Debug|Any CPU + {106F8AFA-1B8E-43F0-AF06-8A3EB9AC1808}.Release|Any CPU.ActiveCfg = Release|Any CPU + {106F8AFA-1B8E-43F0-AF06-8A3EB9AC1808}.Release|Any CPU.Build.0 = Release|Any CPU + {63EFE13A-0117-4C09-9BC3-C167AE8D1764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63EFE13A-0117-4C09-9BC3-C167AE8D1764}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63EFE13A-0117-4C09-9BC3-C167AE8D1764}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63EFE13A-0117-4C09-9BC3-C167AE8D1764}.Release|Any CPU.Build.0 = Release|Any CPU + {990F13D3-1D98-4861-B302-50F1BEDD54CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {990F13D3-1D98-4861-B302-50F1BEDD54CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {990F13D3-1D98-4861-B302-50F1BEDD54CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {990F13D3-1D98-4861-B302-50F1BEDD54CD}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/TestStatements/TestProjDep/Program.cs b/TestStatements/TestProjDep/Program.cs new file mode 100644 index 000000000..4d0856d88 --- /dev/null +++ b/TestStatements/TestProjDep/Program.cs @@ -0,0 +1,14 @@ +using System; +using System.Windows.Forms; +using TestProjDep.Views; + +public static class Program +{ + [STAThread] + public static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } +} diff --git a/TestStatements/TestProjDep/TestProjDep.csproj b/TestStatements/TestProjDep/TestProjDep.csproj new file mode 100644 index 000000000..84bbfafd8 --- /dev/null +++ b/TestStatements/TestProjDep/TestProjDep.csproj @@ -0,0 +1,12 @@ + + + WinExe + net481;net9.0-windows + true + latest + + + + + + diff --git a/TestStatements/TestProjDep/Views/Form1.Designer.cs b/TestStatements/TestProjDep/Views/Form1.Designer.cs new file mode 100644 index 000000000..125334fb6 --- /dev/null +++ b/TestStatements/TestProjDep/Views/Form1.Designer.cs @@ -0,0 +1,63 @@ +namespace TestProjDep.Views +{ + partial class Form1 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Dock = System.Windows.Forms.DockStyle.Fill; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(208, 55); + this.label1.TabIndex = 0; + this.label1.Text = ""; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.label1); + this.Name = "Form1"; + this.Text = "Form1"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/TestStatements/TestProjDep/Views/Form1.cs b/TestStatements/TestProjDep/Views/Form1.cs new file mode 100644 index 000000000..fd9dad929 --- /dev/null +++ b/TestStatements/TestProjDep/Views/Form1.cs @@ -0,0 +1,16 @@ +using System; +using System.Windows.Forms; +using TestProjLib; +using TestProjLib2; + +namespace TestProjDep.Views +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + label1.Text = $"{TestProLibClass.GetTestString()}{Environment.NewLine}{TestProLib2Class.GetTestString()}"; + } + } +} diff --git a/TestStatements/TestProjDep/Views/Form1.resx b/TestStatements/TestProjDep/Views/Form1.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/TestStatements/TestProjDep/Views/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TestStatements/TestProjLib/TestProLibClass.cs b/TestStatements/TestProjLib/TestProLibClass.cs new file mode 100644 index 000000000..d1b95eb33 --- /dev/null +++ b/TestStatements/TestProjLib/TestProLibClass.cs @@ -0,0 +1,5 @@ +namespace TestProjLib; +public static class TestProLibClass +{ + public static string GetTestString() => "New test string from TestProjLib"; +} diff --git a/TestStatements/TestProjLib/TestProjLib.csproj b/TestStatements/TestProjLib/TestProjLib.csproj new file mode 100644 index 000000000..c0b900136 --- /dev/null +++ b/TestStatements/TestProjLib/TestProjLib.csproj @@ -0,0 +1,7 @@ + + + Library + net481;net9.0 + latest + + diff --git a/TestStatements/TestProjLib2/TestProLib2Class.cs b/TestStatements/TestProjLib2/TestProLib2Class.cs new file mode 100644 index 000000000..59d23c0cb --- /dev/null +++ b/TestStatements/TestProjLib2/TestProLib2Class.cs @@ -0,0 +1,5 @@ +namespace TestProjLib2; +public static class TestProLib2Class +{ + public static string GetTestString() => "New test string from TestProjLib2"; +} \ No newline at end of file diff --git a/TestStatements/TestProjLib2/TestProjLib2.csproj b/TestStatements/TestProjLib2/TestProjLib2.csproj new file mode 100644 index 000000000..da812bec9 --- /dev/null +++ b/TestStatements/TestProjLib2/TestProjLib2.csproj @@ -0,0 +1,7 @@ + + + Library + netstandard2.0 + latest + + diff --git a/TestStatements/TestStatements.sln b/TestStatements/TestStatements.sln index 8aa43c972..36e3b89ea 100644 --- a/TestStatements/TestStatements.sln +++ b/TestStatements/TestStatements.sln @@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppWithPluginTest", "AppWit EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloPluginTest", "HelloPluginTest\HelloPluginTest.csproj", "{6E5705C1-234F-4EB7-9D92-D110C410DCB1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SOq1", "SOq1\SOq1.csproj", "{DB4BA4F2-743F-4105-BAF0-D22E94436ECC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -135,6 +137,10 @@ Global {6E5705C1-234F-4EB7-9D92-D110C410DCB1}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E5705C1-234F-4EB7-9D92-D110C410DCB1}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E5705C1-234F-4EB7-9D92-D110C410DCB1}.Release|Any CPU.Build.0 = Release|Any CPU + {DB4BA4F2-743F-4105-BAF0-D22E94436ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB4BA4F2-743F-4105-BAF0-D22E94436ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB4BA4F2-743F-4105-BAF0-D22E94436ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB4BA4F2-743F-4105-BAF0-D22E94436ECC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TestStatements/ctlClockLib/ctlClockLib.csproj b/TestStatements/ctlClockLib/ctlClockLib.csproj index 3904fe14d..ddf8b8f20 100644 --- a/TestStatements/ctlClockLib/ctlClockLib.csproj +++ b/TestStatements/ctlClockLib/ctlClockLib.csproj @@ -1,6 +1,7 @@  + - net9.0-windows + net481;net9.0-windows Library ..\..\obj\$(MSBuildProjectName)\ ..\..\bin\$(MSBuildProjectName)\ diff --git a/WinAhnenNew/Gen_BaseItf/Gen_BaseItf.csproj b/WinAhnenNew/Gen_BaseItf/Gen_BaseItf.csproj index beb71f518..3eb6f773e 100644 --- a/WinAhnenNew/Gen_BaseItf/Gen_BaseItf.csproj +++ b/WinAhnenNew/Gen_BaseItf/Gen_BaseItf.csproj @@ -1,7 +1,7 @@  - net481-windows;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 enable diff --git a/WinAhnenNew/WinAhnenCls/WinAhnenCls.csproj b/WinAhnenNew/WinAhnenCls/WinAhnenCls.csproj index 6f8cc3195..909b9d76c 100644 --- a/WinAhnenNew/WinAhnenCls/WinAhnenCls.csproj +++ b/WinAhnenNew/WinAhnenCls/WinAhnenCls.csproj @@ -2,7 +2,7 @@ - net481-windows;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 disable enable diff --git a/WinAhnenNew/WinAhnenClsTests/Helper/StringHelperTests.cs b/WinAhnenNew/WinAhnenClsTests/Helper/StringHelperTests.cs index 2549b7552..7c2f6ff5b 100644 --- a/WinAhnenNew/WinAhnenClsTests/Helper/StringHelperTests.cs +++ b/WinAhnenNew/WinAhnenClsTests/Helper/StringHelperTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -/* Nicht gemergte Änderung aus Projekt "WinAhnenClsTests (net481-windows)" +/* Nicht gemergte Änderung aus Projekt "WinAhnenClsTests (net481)" Vor: using WinAhnenCls.Helper; using System; @@ -15,7 +15,7 @@ using System; */ -/* Nicht gemergte Änderung aus Projekt "WinAhnenClsTests (net481-windows)" +/* Nicht gemergte Änderung aus Projekt "WinAhnenClsTests (net481)" Vor: using System.Threading.Tasks; Nach: diff --git a/WinAhnenNew/WinAhnenClsTests/WinAhnenClsTests.csproj b/WinAhnenNew/WinAhnenClsTests/WinAhnenClsTests.csproj index 720a28410..c6c710e29 100644 --- a/WinAhnenNew/WinAhnenClsTests/WinAhnenClsTests.csproj +++ b/WinAhnenNew/WinAhnenClsTests/WinAhnenClsTests.csproj @@ -2,7 +2,7 @@ - net481-windows;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 disable enable false