From ca3e6ca25c8953cc976dedea0bb7ab2b96babb13 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:56:27 +0200 Subject: [PATCH 1/9] TraceCsv2realCsvTests_Dependencies --- .../TraceCsv2realCsvTests - Backup.csproj | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests - Backup.csproj diff --git a/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests - Backup.csproj b/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests - Backup.csproj deleted file mode 100644 index 0f6a8f4c5..000000000 --- a/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests - Backup.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - net462-windows;net472-windows;net48-windows;net481-windows;net6.0;net7.0 - true - C:\Projekte\CSharp\bin\TraceCsv2realCsvTests\Debug\net7.0\fine-code-coverage\coverage-tool-output\TraceCsv2realCsvTests %28net7.0%29-fcc-mscodecoverage-generated.runsettings - - - - - - - - - - - - - - - From 19a070c37553ee4d628623e6cdd2760e998e0f3f Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:56:55 +0200 Subject: [PATCH 2/9] MVVM_ImageHandlingTests_Dependencies --- .../Graphics/MVVM_ImageHandlingTests/AppTests.cs | 11 +++++------ .../MVVM_ImageHandlingTests.csproj | 11 ++++++----- .../MVVM_ImageHandling_netTests.csproj | 13 +++++++------ .../ViewModels/TemplateViewModelTests.cs | 4 ++-- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs b/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs index 1d8e7c04c..ac52e81e0 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs +++ b/CSharpBible/Graphics/MVVM_ImageHandlingTests/AppTests.cs @@ -1,13 +1,12 @@ -using CommunityToolkit.Mvvm.DependencyInjection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using MVVM.View.Extension; -using MVVM_ImageHandling.Models; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using MVVM.View.Extension; +using MVVM_ImageHandling.Models; namespace MVVM_ImageHandling.Tests { @@ -53,7 +52,7 @@ public void AppTest() public void AppTest2() { app.DoStartUp(); - Assert.IsNotNull(IoC.GetReqSrv(typeof(IUserRepository))); + Assert.IsNotNull(IoC.GetReqSrv(typeof(ITemplateModel))); Assert.IsNull(IoC.GetSrv(typeof(App))); } } diff --git a/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj b/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj index 360fb2351..effa78abe 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj +++ b/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandlingTests.csproj @@ -1,17 +1,18 @@  - + net462-windows;net472-windows;net48-windows;net481-windows true false + true - - - - + + + + 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 5ac49e7d6..ff7155292 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandling_netTests.csproj +++ b/CSharpBible/Graphics/MVVM_ImageHandlingTests/MVVM_ImageHandling_netTests.csproj @@ -1,17 +1,18 @@  - + - net6.0-windows;net7.0-windows + net6.0-windows;net7.0-windows;net8.0-windows true false - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CSharpBible/Graphics/MVVM_ImageHandlingTests/ViewModels/TemplateViewModelTests.cs b/CSharpBible/Graphics/MVVM_ImageHandlingTests/ViewModels/TemplateViewModelTests.cs index 9e8104106..acacce71d 100644 --- a/CSharpBible/Graphics/MVVM_ImageHandlingTests/ViewModels/TemplateViewModelTests.cs +++ b/CSharpBible/Graphics/MVVM_ImageHandlingTests/ViewModels/TemplateViewModelTests.cs @@ -33,7 +33,7 @@ public class TemplateViewModelTests:BaseTestViewModel /// The test model /// /// - TemplateViewModel testModel; + ImageViewModel testModel; #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. /// @@ -58,7 +58,7 @@ public void Init() public void SetupTest() { Assert.IsNotNull(testModel); - Assert.IsInstanceOfType(testModel, typeof(TemplateViewModel)); + Assert.IsInstanceOfType(testModel, typeof(ImageViewModel)); Assert.IsInstanceOfType(testModel, typeof(BaseViewModelCT)); Assert.IsInstanceOfType(testModel, typeof(INotifyPropertyChanged)); } From 40df9fdfb781a48b9f57b0aa95c2534db48d6766 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:56:58 +0200 Subject: [PATCH 3/9] Polyline_Dependencies --- CSharpBible/Graphics/Polyline/Polyline2.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CSharpBible/Graphics/Polyline/Polyline2.csproj b/CSharpBible/Graphics/Polyline/Polyline2.csproj index 17cea2f4d..a6fbd86b8 100644 --- a/CSharpBible/Graphics/Polyline/Polyline2.csproj +++ b/CSharpBible/Graphics/Polyline/Polyline2.csproj @@ -99,7 +99,6 @@ ResXFileCodeGenerator Resources.Designer.cs - SettingsSingleFileGenerator Settings.Designer.cs @@ -111,8 +110,5 @@ MVVM_BaseLib - - - \ No newline at end of file From 3b96ad4920e2581c86978a2995a28010e6adbf54 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:57:36 +0200 Subject: [PATCH 4/9] MVVM_06_Converters_3Tests_Dependencies --- .../MVVM_06_Converters_3_netTests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3_netTests.csproj index 5772fbf36..c1a181993 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_3Tests/MVVM_06_Converters_3_netTests.csproj @@ -9,13 +9,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + From de8ef77789ee0f6f8eae38b77a5902439e34bc5f Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:57:37 +0200 Subject: [PATCH 5/9] MVVM_06_Converters_4Tests_Dependencies --- .../MVVM_06_Converters_4_netTests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4_netTests.csproj index fb8da5723..8b186d422 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_06_Converters_4Tests/MVVM_06_Converters_4_netTests.csproj @@ -9,13 +9,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + From afd4b5d849e6457d3e039c3601cd8dd022446645 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:57:52 +0200 Subject: [PATCH 6/9] MVVM_22_CTWpfCapTests_Dependencies --- .../MVVM_22_CTWpfCapTests/MVVM_22_CTWpfCapTests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e6298fef6..9df46b062 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/MVVM_22_CTWpfCapTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_CTWpfCapTests/MVVM_22_CTWpfCapTests.csproj @@ -21,8 +21,8 @@ - - + + From 0f40d40e39cb14bf4c2cb05f3809f1e633d47cae Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:57:54 +0200 Subject: [PATCH 7/9] MVVM_22_WpfCapTests_Dependencies --- .../MVVM_22_WpfCapTests/MVVM_22_WpfCap_netTests.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCap_netTests.csproj b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCap_netTests.csproj index 97ba72cff..a296206ef 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCap_netTests.csproj +++ b/CSharpBible/MVVM_Tutorial/MVVM_22_WpfCapTests/MVVM_22_WpfCap_netTests.csproj @@ -21,11 +21,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 6022c5edf70fc1286492301f86e06f7650e2b129 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:58:38 +0200 Subject: [PATCH 8/9] MVVM_41_SudokuTests_Dependencies --- .../ValueConverters/DateTimeValueConverterTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ValueConverters/DateTimeValueConverterTests.cs b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ValueConverters/DateTimeValueConverterTests.cs index 72cd8679d..a5e57eca0 100644 --- a/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ValueConverters/DateTimeValueConverterTests.cs +++ b/CSharpBible/MVVM_Tutorial/MVVM_41_SudokuTests/ValueConverters/DateTimeValueConverterTests.cs @@ -19,7 +19,7 @@ /// The Tests namespace. /// /// -namespace MVVM_41_Sudoku.ValueConverter.Tests +namespace MVVM_41_Sudoku.ValueConverters.Tests { /// From aedf715541fec9562d04d35c1e59f103d02be804 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Tue, 2 Jul 2024 18:59:21 +0200 Subject: [PATCH 9/9] CSharpBible_Dependencies --- CSharpBible/Graphics/Graphics.sln | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CSharpBible/Graphics/Graphics.sln b/CSharpBible/Graphics/Graphics.sln index 3d63a3173..d6465df19 100644 --- a/CSharpBible/Graphics/Graphics.sln +++ b/CSharpBible/Graphics/Graphics.sln @@ -95,6 +95,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolySpline", "PolySpline\Po EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolySpline_net", "PolySpline\PolySpline_net.csproj", "{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_ImageHandling_netTests", "MVVM_ImageHandlingTests\MVVM_ImageHandling_netTests.csproj", "{74702CB8-336B-4AE0-990C-4E1914F720E2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_ImageHandlingTests", "MVVM_ImageHandlingTests\MVVM_ImageHandlingTests.csproj", "{B1FCD6F4-2DBF-4AC7-AD62-64E830E83764}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -249,6 +253,14 @@ Global {EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Release|Any CPU.Build.0 = Release|Any CPU + {74702CB8-336B-4AE0-990C-4E1914F720E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74702CB8-336B-4AE0-990C-4E1914F720E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74702CB8-336B-4AE0-990C-4E1914F720E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74702CB8-336B-4AE0-990C-4E1914F720E2}.Release|Any CPU.Build.0 = Release|Any CPU + {B1FCD6F4-2DBF-4AC7-AD62-64E830E83764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1FCD6F4-2DBF-4AC7-AD62-64E830E83764}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1FCD6F4-2DBF-4AC7-AD62-64E830E83764}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1FCD6F4-2DBF-4AC7-AD62-64E830E83764}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE