diff --git a/src/GUI/Directory.Build.Props b/src/GUI/Directory.Build.Props index 11a57e2b5..6a3c135c9 100644 --- a/src/GUI/Directory.Build.Props +++ b/src/GUI/Directory.Build.Props @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/GUI/NUnitTestCore/NUnitTestCore.csproj b/src/GUI/NUnitTestCore/NUnitTestCore.csproj index e6c1e34d7..bbb0e2b25 100644 --- a/src/GUI/NUnitTestCore/NUnitTestCore.csproj +++ b/src/GUI/NUnitTestCore/NUnitTestCore.csproj @@ -89,7 +89,7 @@ - + diff --git a/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs b/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs index 7ab48681e..6bbba37d3 100644 --- a/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs +++ b/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs @@ -232,13 +232,12 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti var sqliteProvider = new SqliteDesignTimeServices(); sqliteProvider.ConfigureDesignTimeServices(serviceCollection); -#if !CORE80 if (options.UseNodaTime) { var nodaTime = new SqliteNodaTimeDesignTimeServices(); nodaTime.ConfigureDesignTimeServices(serviceCollection); } -#endif + break; default: diff --git a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj index ac9943b87..f94f14174 100644 --- a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj +++ b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs b/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs index 9511417e3..6dc7eae58 100644 --- a/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs +++ b/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs @@ -330,14 +330,14 @@ public void GetSelectedObjects_WithObjects_PartialSelection() } // Act - var result = vm.GetSelectedObjects().ToArray(); + var result = vm.GetSelectedObjects().ToList(); // Assert Assert.IsNotNull(result); - Assert.AreEqual(6, result.Length); + Assert.AreEqual(6, result.Count); foreach (var item in vm.Types.SelectMany(c => c.Schemas).OrderBy(c => c.Name)) { - Assert.IsTrue(result.Any(c => c.Name == item.Objects[0].ModelDisplayName)); + Assert.IsTrue(result.Exists(c => c.Name == item.Objects[0].ModelDisplayName)); } } diff --git a/src/GUI/efcpt.6/efcpt.6.csproj b/src/GUI/efcpt.6/efcpt.6.csproj index adcff2ed5..2e9751e28 100644 --- a/src/GUI/efcpt.6/efcpt.6.csproj +++ b/src/GUI/efcpt.6/efcpt.6.csproj @@ -54,9 +54,9 @@ - - - + + + diff --git a/src/GUI/efcpt.7/efcpt.7.csproj b/src/GUI/efcpt.7/efcpt.7.csproj index 736333a89..e455fa6d2 100644 --- a/src/GUI/efcpt.7/efcpt.7.csproj +++ b/src/GUI/efcpt.7/efcpt.7.csproj @@ -40,9 +40,9 @@ - - - + + + diff --git a/src/GUI/efcpt.8/efcpt.8.csproj b/src/GUI/efcpt.8/efcpt.8.csproj index 9bdc950f8..99152fde4 100644 --- a/src/GUI/efcpt.8/efcpt.8.csproj +++ b/src/GUI/efcpt.8/efcpt.8.csproj @@ -53,10 +53,10 @@ - - - - + + + +