Switch .NET Core 3.1 TFM in tests to .NET 7

Sergio0694 · Sergio0694 · commit ffb818aa153a · 2022-11-16T01:48:01.000+01:00
diff --git a/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj b/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj b/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Buffers/Test_StringPool.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Buffers/Test_StringPool.cs
@@ -217,7 +217,7 @@ public void Test_StringPool_GetOrAdd_ReadOnlySpan_Misc()
         Assert.AreEqual(nameof(helloworld), helloworld);
         Assert.AreEqual(nameof(dotnetCommunityToolkit), dotnetCommunityToolkit);
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
 
         // .NET Framework reuses strings in a way that makes these tests fail.
         // The actual underlying APIs are still working as expected though.
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj b/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
     <EnablePreviewFeatures>true</EnablePreviewFeatures>
     <NoWarn>$(NoWarn);CA2252</NoWarn>
   </PropertyGroup>
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
 
 using System;
 using System.Runtime.CompilerServices;
@@ -81,7 +81,7 @@ public void Test_ReadOnlyRefEnumerable_Indexer_ThrowsIndexOutOfRange()
         _ = Assert.ThrowsException<IndexOutOfRangeException>(() => ReadOnlyRefEnumerable<int>.DangerousCreate(in array[0], array.Length, 1)[array.Length]);
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     [DataRow(1, new[] { 1 })]
     [DataRow(1, new[] { 1, 2, 3, 4 })]
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Enumerables/Test_RefEnumerable{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Enumerables/Test_RefEnumerable{T}.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
 
 using System;
 using System.Runtime.CompilerServices;
@@ -81,7 +81,7 @@ public void Test_RefEnumerable_Indexer_ThrowsIndexOutOfRange()
         _ = Assert.ThrowsException<IndexOutOfRangeException>(() => RefEnumerable<int>.DangerousCreate(ref array[0], array.Length, 1)[array.Length]);
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     [DataRow(1, new[] { 1 })]
     [DataRow(1, new[] { 1, 2, 3, 4 })]
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayExtensions.2D.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayExtensions.2D.cs
@@ -419,7 +419,7 @@ public void Test_ArrayExtensions_2D_GetColumn_Empty()
         _ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetColumn(0).ToArray());
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_ArrayExtensions_2D_AsSpan_Empty()
     {
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_IBufferWriterExtensions.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_IBufferWriterExtensions.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
 using System.Buffers;
 #endif
 using System.IO;
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Internals/Test_RuntimeHelpers.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Internals/Test_RuntimeHelpers.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if !NETCOREAPP3_1_OR_GREATER
+#if !NET6_0_OR_GREATER
 
 using System;
 using CommunityToolkit.HighPerformance.Helpers.Internals;
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Test_HashCode{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Test_HashCode{T}.cs
@@ -55,7 +55,7 @@ public void Test_HashCodeOfT_VectorUnsupportedTypes_TestRepeat()
         TestForType<char>();
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_HashCodeOfT_ManagedType_TestRepeat()
     {
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Test_ParallelHelper.For.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Test_ParallelHelper.For.cs
@@ -38,7 +38,7 @@ public unsafe void Test_ParallelHelper_ForWithIndices()
         }
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     [ExpectedException(typeof(ArgumentException))]
     public void Test_ParallelHelper_ForInvalidRange_FromEnd()
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Test_ParallelHelper.For2D.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Helpers/Test_ParallelHelper.For2D.cs
@@ -50,7 +50,7 @@ public unsafe void Test_ParallelHelper_For2DWithIndices()
         }
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     [ExpectedException(typeof(ArgumentException))]
     public void Test_ParallelHelper_For2DInvalidRange_FromEnd()
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_Memory2D{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_Memory2D{T}.cs
@@ -194,7 +194,7 @@ public void Test_Memory2DT_Array3DConstructor_2()
         _ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, 0, 0, 3, 3));
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_Memory2DT_MemoryConstructor()
     {
@@ -352,7 +352,7 @@ public void Test_Memory2DT_TryGetMemory_2()
         Assert.AreEqual(memory.Span[2], 3);
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_Memory2DT_TryGetMemory_3()
     {
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlyMemory2D{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlyMemory2D{T}.cs
@@ -174,7 +174,7 @@ public void Test_ReadOnlyMemory2DT_Array3DConstructor_2()
         _ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, 0, 0, 3, 3));
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_ReadOnlyMemory2DT_ReadOnlyMemoryConstructor()
     {
@@ -316,7 +316,7 @@ public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_2()
         Assert.AreEqual(memory.Span[2], 3);
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_3()
     {
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlySpan2D{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlySpan2D{T}.cs
@@ -35,7 +35,7 @@ public void Test_ReadOnlySpan2DT_Empty()
         Assert.AreEqual(empty2.Height, 0);
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public unsafe void Test_ReadOnlySpan2DT_RefConstructor()
     {
@@ -386,7 +386,7 @@ ref Unsafe.AsRef<int>(null),
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     public unsafe void Test_ReadOnlySpan2DT_Index_Indexer_1()
     {
@@ -535,7 +535,7 @@ public void Test_ReadOnlySpan2DT_Slice_2()
         Assert.AreEqual(slice3[0, 0], 5);
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_ReadOnlySpan2DT_GetRowReadOnlySpan()
     {
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_Span2D{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_Span2D{T}.cs
@@ -46,7 +46,7 @@ public void Test_Span2DT_Empty()
         Assert.AreEqual(empty4.Height, 0);
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public unsafe void Test_Span2DT_RefConstructor()
     {
@@ -546,7 +546,7 @@ ref Unsafe.AsRef<int>(null),
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     [TestMethod]
     public unsafe void Test_Span2DT_Index_Indexer_1()
     {
@@ -700,7 +700,7 @@ public void Test_Span2DT_Slice_2()
         Assert.AreEqual(slice3[0, 0], 5);
     }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     [TestMethod]
     public void Test_Span2DT_GetRowSpan()
     {
diff --git a/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Mvvm.Internals.UnitTests/Test_Messenger.cs b/tests/CommunityToolkit.Mvvm.Internals.UnitTests/Test_Messenger.cs
@@ -14,7 +14,7 @@ namespace CommunityToolkit.Mvvm.Internals.UnitTests;
 [TestClass]
 public partial class Test_Messenger
 {
-#if NETCOREAPP // Auto-trimming is disabled on .NET Framework
+#if NET6_0_OR_GREATER // Auto-trimming is disabled on .NET Framework
     [TestMethod]
     public void Test_WeakReferenceMessenger_AutoCleanup()
     {
diff --git a/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
diff --git a/tests/CommunityToolkit.Mvvm.Roslyn431.UnitTests/CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.Roslyn431.UnitTests/CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn431.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn431.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn431.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn431.UnitTests.csproj
@@ -1,7 +1,7 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Helpers/CSharpAnalyzerWithLanguageVersionTest{TAnalyzer}.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Helpers/CSharpAnalyzerWithLanguageVersionTest{TAnalyzer}.cs
@@ -50,10 +50,8 @@ public static Task VerifyAnalyzerAsync(string source, LanguageVersion languageVe
     {
         CSharpAnalyzerWithLanguageVersionTest<TAnalyzer> test = new(languageVersion) { TestCode = source };
 
-#if NET6_0
+#if NET6_0_OR_GREATER
         test.TestState.ReferenceAssemblies = ReferenceAssemblies.Net.Net60;
-#elif NETCOREAPP3_1
-        test.TestState.ReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp31;
 #else
         test.TestState.ReferenceAssemblies = ReferenceAssemblies.NetFramework.Net472.Default;
         test.TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(RequiredAttribute).Assembly.Location));

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ public void Test_ArrayExtensions_2D_GetColumn_Empty()`
`419`	`419`	`_ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetColumn(0).ToArray());`
`420`	`420`	`}`
`421`	`421`
`422`		`-#if NETCOREAPP3_1_OR_GREATER`
	`422`	`+#if NET6_0_OR_GREATER`
`423`	`423`	`[TestMethod]`
`424`	`424`	`public void Test_ArrayExtensions_2D_AsSpan_Empty()`
`425`	`425`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void Test_HashCodeOfT_VectorUnsupportedTypes_TestRepeat()`
`55`	`55`	`TestForType<char>();`
`56`	`56`	`}`
`57`	`57`
`58`		`-#if NETCOREAPP3_1_OR_GREATER`
	`58`	`+#if NET6_0_OR_GREATER`
`59`	`59`	`[TestMethod]`
`60`	`60`	`public void Test_HashCodeOfT_ManagedType_TestRepeat()`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public unsafe void Test_ParallelHelper_ForWithIndices()`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`-#if NETCOREAPP3_1_OR_GREATER`
	`41`	`+#if NET6_0_OR_GREATER`
`42`	`42`	`[TestMethod]`
`43`	`43`	`[ExpectedException(typeof(ArgumentException))]`
`44`	`44`	`public void Test_ParallelHelper_ForInvalidRange_FromEnd()`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public unsafe void Test_ParallelHelper_For2DWithIndices()`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`-#if NETCOREAPP3_1_OR_GREATER`
	`53`	`+#if NET6_0_OR_GREATER`
`54`	`54`	`[TestMethod]`
`55`	`55`	`[ExpectedException(typeof(ArgumentException))]`
`56`	`56`	`public void Test_ParallelHelper_For2DInvalidRange_FromEnd()`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public void Test_Memory2DT_Array3DConstructor_2()`
`194`	`194`	`_ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, 0, 0, 3, 3));`
`195`	`195`	`}`
`196`	`196`
`197`		`-#if NETCOREAPP`
	`197`	`+#if NET6_0_OR_GREATER`
`198`	`198`	`[TestMethod]`
`199`	`199`	`public void Test_Memory2DT_MemoryConstructor()`
`200`	`200`	`{`
`@@ -352,7 +352,7 @@ public void Test_Memory2DT_TryGetMemory_2()`
`352`	`352`	`Assert.AreEqual(memory.Span[2], 3);`
`353`	`353`	`}`
`354`	`354`
`355`		`-#if NETCOREAPP`
	`355`	`+#if NET6_0_OR_GREATER`
`356`	`356`	`[TestMethod]`
`357`	`357`	`public void Test_Memory2DT_TryGetMemory_3()`
`358`	`358`	`{`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public void Test_ReadOnlyMemory2DT_Array3DConstructor_2()`
`174`	`174`	`_ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, 0, 0, 3, 3));`
`175`	`175`	`}`
`176`	`176`
`177`		`-#if NETCOREAPP`
	`177`	`+#if NET6_0_OR_GREATER`
`178`	`178`	`[TestMethod]`
`179`	`179`	`public void Test_ReadOnlyMemory2DT_ReadOnlyMemoryConstructor()`
`180`	`180`	`{`
`@@ -316,7 +316,7 @@ public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_2()`
`316`	`316`	`Assert.AreEqual(memory.Span[2], 3);`
`317`	`317`	`}`
`318`	`318`
`319`		`-#if NETCOREAPP`
	`319`	`+#if NET6_0_OR_GREATER`
`320`	`320`	`[TestMethod]`
`321`	`321`	`public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_3()`
`322`	`322`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void Test_ReadOnlySpan2DT_Empty()`
`35`	`35`	`Assert.AreEqual(empty2.Height, 0);`
`36`	`36`	`}`
`37`	`37`
`38`		`-#if NETCOREAPP`
	`38`	`+#if NET6_0_OR_GREATER`
`39`	`39`	`[TestMethod]`
`40`	`40`	`public unsafe void Test_ReadOnlySpan2DT_RefConstructor()`
`41`	`41`	`{`
`@@ -386,7 +386,7 @@ ref Unsafe.AsRef<int>(null),`
`386`	`386`	`Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));`
`387`	`387`	`}`
`388`	`388`
`389`		`-#if NETCOREAPP3_1_OR_GREATER`
	`389`	`+#if NET6_0_OR_GREATER`
`390`	`390`	`[TestMethod]`
`391`	`391`	`public unsafe void Test_ReadOnlySpan2DT_Index_Indexer_1()`
`392`	`392`	`{`
`@@ -535,7 +535,7 @@ public void Test_ReadOnlySpan2DT_Slice_2()`
`535`	`535`	`Assert.AreEqual(slice3[0, 0], 5);`
`536`	`536`	`}`
`537`	`537`
`538`		`-#if NETCOREAPP`
	`538`	`+#if NET6_0_OR_GREATER`
`539`	`539`	`[TestMethod]`
`540`	`540`	`public void Test_ReadOnlySpan2DT_GetRowReadOnlySpan()`
`541`	`541`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void Test_Span2DT_Empty()`
`46`	`46`	`Assert.AreEqual(empty4.Height, 0);`
`47`	`47`	`}`
`48`	`48`
`49`		`-#if NETCOREAPP`
	`49`	`+#if NET6_0_OR_GREATER`
`50`	`50`	`[TestMethod]`
`51`	`51`	`public unsafe void Test_Span2DT_RefConstructor()`
`52`	`52`	`{`
`@@ -546,7 +546,7 @@ ref Unsafe.AsRef<int>(null),`
`546`	`546`	`Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));`
`547`	`547`	`}`
`548`	`548`
`549`		`-#if NETCOREAPP3_1_OR_GREATER`
	`549`	`+#if NET6_0_OR_GREATER`
`550`	`550`	`[TestMethod]`
`551`	`551`	`public unsafe void Test_Span2DT_Index_Indexer_1()`
`552`	`552`	`{`
`@@ -700,7 +700,7 @@ public void Test_Span2DT_Slice_2()`
`700`	`700`	`Assert.AreEqual(slice3[0, 0], 5);`
`701`	`701`	`}`
`702`	`702`
`703`		`-#if NETCOREAPP`
	`703`	`+#if NET6_0_OR_GREATER`
`704`	`704`	`[TestMethod]`
`705`	`705`	`public void Test_Span2DT_GetRowSpan()`
`706`	`706`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace CommunityToolkit.Mvvm.Internals.UnitTests;`
`14`	`14`	`[TestClass]`
`15`	`15`	`public partial class Test_Messenger`
`16`	`16`	`{`
`17`		`-#if NETCOREAPP // Auto-trimming is disabled on .NET Framework`
	`17`	`+#if NET6_0_OR_GREATER // Auto-trimming is disabled on .NET Framework`
`18`	`18`	`[TestMethod]`
`19`	`19`	`public void Test_WeakReferenceMessenger_AutoCleanup()`
`20`	`20`	`{`