Update to net6.0

jerviscui · May 31, 2024 · 004b39c · 004b39c
1 parent 884e6dc
commit 004b39c
Show file tree

Hide file tree

Showing 64 changed files with 295 additions and 192 deletions.
diff --git a/src/7/FixedTest/FixedTest.csproj b/src/7/FixedTest/FixedTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/src/7/RefTest/RefTest.csproj b/src/7/RefTest/RefTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/src/7/SpanTest/SpanTest.csproj b/src/7/SpanTest/SpanTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/src/7/StackallocTest/StackallocTest.csproj b/src/7/StackallocTest/StackallocTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/src/7/ValueTaskTest/ValueTaskTest.csproj b/src/7/ValueTaskTest/ValueTaskTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/7/ValueTupleTest/ValueTupleTest.csproj b/src/7/ValueTupleTest/ValueTupleTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/8/AsyncEnumerableTest/AsyncEnumerableTest.csproj b/src/8/AsyncEnumerableTest/AsyncEnumerableTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/8/GenericStructTest/GenericStructTest.csproj b/src/8/GenericStructTest/GenericStructTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/8/MemoryTest/MemoryTest.csproj b/src/8/MemoryTest/MemoryTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/8/RangeIndexTest/RangeIndexTest.csproj b/src/8/RangeIndexTest/RangeIndexTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/src/8/SwitchExpressionTest/SwitchExpressionTest.csproj b/src/8/SwitchExpressionTest/SwitchExpressionTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/9/LocalFunctionTest/LocalFunctionTest.csproj b/src/9/LocalFunctionTest/LocalFunctionTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/9/LocalFunctionTest/LocalFunctionWithTask.cs b/src/9/LocalFunctionTest/LocalFunctionWithTask.cs
@@ -10,14 +10,14 @@ public class LocalFunctionWithTask
     {
         public static async Task Test()
         {
-            Console.WriteLine($"#{Thread.CurrentThread.ManagedThreadId.ToString()} Test");
+            Console.WriteLine($"#{Environment.CurrentManagedThreadId.ToString()} Test");
             var t = NoLocalFunc(6);
             //var t = LocalFunc(6); //LocalFunc() 在这里抛出异常
             Console.WriteLine("Got the task");
 
-            Console.WriteLine($"#{Thread.CurrentThread.ManagedThreadId.ToString()} Test");
+            Console.WriteLine($"#{Environment.CurrentManagedThreadId.ToString()} Test");
             var result = await t; //NoLocalFunc() 在这里抛出异常
-            Console.WriteLine($"#{Thread.CurrentThread.ManagedThreadId.ToString()} The returned value is {result:N0}");
+            Console.WriteLine($"#{Environment.CurrentManagedThreadId.ToString()} The returned value is {result:N0}");
         }
 
         private static async Task<int> NoLocalFunc(int delayInSeconds)

diff --git a/src/9/NullableEnableTest/DictionaryTest.cs b/src/9/NullableEnableTest/DictionaryTest.cs
@@ -6,7 +6,9 @@ namespace NullableEnableTest
 {
     public class Item
     {
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public string Name { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     }
 
     public class DictionaryTest

diff --git a/src/9/NullableEnableTest/NullableEnableTest.csproj b/src/9/NullableEnableTest/NullableEnableTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/9/NullableEnableTest/Program.cs b/src/9/NullableEnableTest/Program.cs
@@ -6,10 +6,14 @@ private static void Main(string[] args)
         {
             //在全局开启了 <Nullable>enable</Nullable>
 
+#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
             A a = A.GetOrDefault(false); //CS8600	将 null 文本或可能的 null 值转换为不可为 null 类型。
+#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
             A? a1 = A.GetOrDefault(false);
 
+#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
             A a2 = A.GetOrDefault(true);
+#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
             A a3 = A.GetOrDefault(true)!; //明确不会返回 null 时，可以在结尾加 ！ 阻止 CS8600 警告
 
             //Console.WriteLine("Hello World!");
@@ -19,7 +23,9 @@ public class A
         {
             //CS8618	在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。
             //请考虑将 属性 声明为可以为 null。
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
             private A()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
             {
                 //Name = string.Empty;
             }

diff --git a/src/9/RecordTest/RecordTest.csproj b/src/9/RecordTest/RecordTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>10</LangVersion>
   </PropertyGroup>
 

diff --git a/src/9/SystemTextJson/SystemTextJsonTest.csproj b/src/9/SystemTextJson/SystemTextJsonTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>SystemTextJsonTest</AssemblyName>
   </PropertyGroup>
 

diff --git a/src/9/TaskGuidanceTest/ChildTaskTest.cs b/src/9/TaskGuidanceTest/ChildTaskTest.cs
@@ -18,11 +18,11 @@ public static void Test()
             public static async Task AttachedChildTask()
             {
                 //1
-                Console.WriteLine($"AttachedChildTask {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"AttachedChildTask {Environment.CurrentManagedThreadId.ToString()}");
 
                 await Task.Factory.StartNew(() =>
                 {
-                    Console.WriteLine($"task {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    Console.WriteLine($"task {Environment.CurrentManagedThreadId.ToString()}");
 
                     for (int ctr = 0; ctr < 10; ctr++)
                     {
@@ -31,23 +31,23 @@ await Task.Factory.StartNew(() =>
                         {
                             Thread.Sleep(1000);
                             Console.WriteLine(
-                                $"Attached child #{x} completed. {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                                $"Attached child #{x} completed. {Environment.CurrentManagedThreadId.ToString()}");
                         }, taskNo, TaskCreationOptions.AttachedToParent);
                     }
                 });
 
                 //wait for all Attached Children
-                Console.WriteLine($"Completed {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"Completed {Environment.CurrentManagedThreadId.ToString()}");
             }
 
             public static async Task DetachedChildTask()
             {
                 //1
-                Console.WriteLine($"DetachedChildTask {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"DetachedChildTask {Environment.CurrentManagedThreadId.ToString()}");
 
                 await Task.Factory.StartNew(() =>
                 {
-                    Console.WriteLine($"task {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    Console.WriteLine($"task {Environment.CurrentManagedThreadId.ToString()}");
 
                     for (int ctr = 0; ctr < 10; ctr++)
                     {
@@ -56,12 +56,12 @@ await Task.Factory.StartNew(() =>
                         {
                             Thread.Sleep(1000);
                             Console.WriteLine(
-                                $"Detached child #{x} completed. {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                                $"Detached child #{x} completed. {Environment.CurrentManagedThreadId.ToString()}");
                         }, taskNo);
                     }
                 });
 
-                Console.WriteLine($"Completed {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"Completed {Environment.CurrentManagedThreadId.ToString()}");
 
                 //wait for all Detached Children
                 await Task.Delay(1000 * 5);
@@ -71,28 +71,28 @@ public static async Task AttachedChildTaskAndContinueTest()
             {
                 //1
                 Console.WriteLine(
-                    $"DirectReturnAndContinue_GetContextTest {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    $"DirectReturnAndContinue_GetContextTest {Environment.CurrentManagedThreadId.ToString()}");
 
                 await Task.Factory.StartNew(() =>
                 {
                     //4
-                    Console.WriteLine($"parent task {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    Console.WriteLine($"parent task {Environment.CurrentManagedThreadId.ToString()}");
 
                     Task.Factory.StartNew(() =>
                     {
                         //5
-                        Console.WriteLine($"attached child {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                        Console.WriteLine($"attached child {Environment.CurrentManagedThreadId.ToString()}");
                     }, TaskCreationOptions.AttachedToParent);
                 }).ContinueWith(_ =>
                 {
                     //5
-                    Console.WriteLine($"continue task {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    Console.WriteLine($"continue task {Environment.CurrentManagedThreadId.ToString()}");
                     Console.WriteLine(SynchronizationContext.Current?.GetType().Name ?? "null");
                 }).ConfigureAwait(false);
 
                 //5
                 Console.WriteLine(SynchronizationContext.Current?.GetType().Name ?? "null");
-                Console.WriteLine($"Completed {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"Completed {Environment.CurrentManagedThreadId.ToString()}");
             }
         }
     }

diff --git a/src/9/TaskGuidanceTest/Program.cs b/src/9/TaskGuidanceTest/Program.cs
@@ -39,12 +39,12 @@ public static async Task SimpleTask()
             public static async Task SimpleTask2()
             {
                 //1
-                Console.WriteLine($"SimpleTask2 {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"SimpleTask2 {Environment.CurrentManagedThreadId.ToString()}");
                 await Task.Factory.StartNew(() =>
                 {
                     Thread.Sleep(1000 * 10);
                     //5
-                    Console.WriteLine($"task {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    Console.WriteLine($"task {Environment.CurrentManagedThreadId.ToString()}");
                 }, TaskCreationOptions.LongRunning);
                 var s = new StackTrace().GetFrames();
                 foreach (var stackFrame in s)
@@ -53,7 +53,7 @@ await Task.Factory.StartNew(() =>
                     Console.WriteLine($"{m.Module,-28} {m.DeclaringType,-103} {m.Name}");
                 }
                 //5
-                Console.WriteLine($"Completed {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"Completed {Environment.CurrentManagedThreadId.ToString()}");
                 //调用堆栈输出
                 //TaskGuidanceTest.dll         TaskGuidanceTest.Program+TaskTest+<SimpleTask2>d__2                                                     MoveNext
                 //System.Private.CoreLib.dll   System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[TResult,TStateMachine]  ExecutionContextCallback
@@ -77,17 +77,17 @@ await Task.Factory.StartNew(() =>
             public static async Task ContinuationTask()
             {
                 //1
-                Console.WriteLine($"ChildTask {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"ChildTask {Environment.CurrentManagedThreadId.ToString()}");
                 await Task.Factory.StartNew(() =>
                 {
                     Thread.Sleep(1000 * 1);
                     //4
-                    Console.WriteLine($"task {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    Console.WriteLine($"task {Environment.CurrentManagedThreadId.ToString()}");
                 }).ContinueWith(task =>
                 {
                     //child task
                     //5
-                    Console.WriteLine($"child {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                    Console.WriteLine($"child {Environment.CurrentManagedThreadId.ToString()}");
 
                     var s = new StackTrace().GetFrames();
                     foreach (var stackFrame in s)
@@ -98,7 +98,7 @@ await Task.Factory.StartNew(() =>
                 }, TaskContinuationOptions.AttachedToParent);
 
                 //5
-                Console.WriteLine($"Completed {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                Console.WriteLine($"Completed {Environment.CurrentManagedThreadId.ToString()}");
 
                 //TaskGuidanceTest.dll         TaskGuidanceTest.Program+ChildTaskTest+<>c         <ChildTask>b__1_1
                 //System.Private.CoreLib.dll   System.Threading.Tasks.ContinuationTaskFromTask    InnerInvoke