Resolving merge conflicts

koszeggy · Oct 14, 2022 · a030e39 · a030e39
2 parents d52914f + 5c174f6
commit a030e39
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,16 +5,27 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": ".NET Core Launch (console)",
+            "name": "Performance Test .NET 6.0 Launch (console)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/KGySoft.CoreLibraries.PerformanceTest/bin/Debug/netcoreapp3.0/KGySoft.CoreLibraries.PerformanceTest.dll",
+            "program": "${workspaceFolder}/KGySoft.CoreLibraries.PerformanceTest/bin/Debug/net6.0/KGySoft.CoreLibraries.PerformanceTest.dll",
             "args": [],
             "cwd": "${workspaceFolder}/KGySoft.CoreLibraries.PerformanceTest",
             "console": "internalConsole",
             "stopAtEntry": false
         },
+        {
+            "name": "UnitTest .NET 6.0 Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/KGySoft.CoreLibraries.UnitTest/bin/Debug/net6.0/KGySoft.CoreLibraries.UnitTest.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/KGySoft.CoreLibraries.UnitTest",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

diff --git a/KGySoft.CoreLibraries.PerformanceTest/KGySoft.CoreLibraries.PerformanceTest.csproj b/KGySoft.CoreLibraries.PerformanceTest/KGySoft.CoreLibraries.PerformanceTest.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net472;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
-    <!--<TargetFrameworks>net6.0</TargetFrameworks>-->
+    <!-- <TargetFrameworks>net35;net40;net45;net472;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks> -->
+    <TargetFrameworks>net6.0</TargetFrameworks>
 
     <!--For UnitTesting the .NET Standard versions-->
     <!--<TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>-->

diff --git a/KGySoft.CoreLibraries.UnitTest/UnitTests/Threading/ParallelHelperTest.cs b/KGySoft.CoreLibraries.UnitTest/UnitTests/Threading/ParallelHelperTest.cs
@@ -94,7 +94,6 @@ public void BeginForBlockingWaitTest()
         {
             var bools = new bool[1000];
             IAsyncResult ar = ParallelHelper.BeginFor(0, bools.Length, i => bools[i] = true);
-            Assert.IsFalse(ar.IsCompleted);
             bool result = ParallelHelper.EndFor(ar);
             Assert.IsTrue(ar.IsCompleted);
             Assert.IsFalse(ar.CompletedSynchronously);
@@ -162,7 +161,6 @@ public void ForAsyncBlockingWaitTest()
         {
             var bools = new bool[1000];
             Task task = ParallelHelper.ForAsync(0, bools.Length, i => bools[i] = true);
-            Assert.IsFalse(task.IsCompleted);
             task.Wait();
             Assert.IsTrue(task.IsCompleted);
             Assert.IsTrue(bools.All(b => b));