From af5089801d00eeab255f4670bd6f1360f2c65b88 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jan 2024 16:57:15 +0100
Subject: [PATCH 1/8] Add .NET 8 TFM to all projects

---
 azure-pipelines.yml                                           | 4 ++++
 src/CommunityToolkit.Common/CommunityToolkit.Common.csproj    | 2 +-
 .../CommunityToolkit.Diagnostics.csproj                       | 2 +-
 .../CommunityToolkit.HighPerformance.csproj                   | 2 +-
 src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj        | 4 ++--
 .../CommunityToolkit.Common.UnitTests.csproj                  | 2 +-
 .../CommunityToolkit.Diagnostics.UnitTests.csproj             | 2 +-
 .../CommunityToolkit.HighPerformance.UnitTests.csproj         | 2 +-
 ...olkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj | 2 +-
 .../CommunityToolkit.Mvvm.Internals.UnitTests.csproj          | 2 +-
 .../CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj          | 2 +-
 .../CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj          | 2 +-
 ...tyToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests.csproj | 2 +-
 ...tyToolkit.Mvvm.SourceGenerators.Roslyn431.UnitTests.csproj | 2 +-
 14 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 713592b83..81b40fd16 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,6 +34,10 @@ jobs:
 
   # Test solution #
 
+    # Run .NET 8 unit tests
+  - script: dotnet test --no-build -c $(Build.Configuration) -f net8.0 -l "trx;LogFileName=VSTestResults_net8.0.trx"
+    displayName: Run .NET 8 unit tests
+
   # Run .NET 7 unit tests
   - script: dotnet test --no-build -c $(Build.Configuration) -f net7.0 -l "trx;LogFileName=VSTestResults_net7.0.trx"
     displayName: Run .NET 7 unit tests
diff --git a/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj b/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj
index f2d7cb70b..ddf81b30c 100644
--- a/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj
+++ b/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj b/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj
index 6cd510f16..fec859625 100644
--- a/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj
+++ b/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj b/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj
index bfc0e6bbe..2cf7770af 100644
--- a/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj
+++ b/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
index 272f56c7f..f1921fd93 100644
--- a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
+++ b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -65,7 +65,7 @@
 
   <ItemGroup Label="Package">
 
-    <!-- Include the custom .targets file to check the source generator (.NET 6 is not needed as it guarantees Roslyn 4.x) -->
+    <!-- Include the custom .targets file to check the source generator (.NET 6 and 8 are not needed as they guarantee Roslyn 4.x) -->
     <None Include="CommunityToolkit.Mvvm.targets" PackagePath="buildTransitive\netstandard2.0" Pack="true" />
     <None Include="CommunityToolkit.Mvvm.targets" PackagePath="buildTransitive\netstandard2.1" Pack="true" />
     <None Include="CommunityToolkit.Mvvm.targets" PackagePath="build\netstandard2.0" Pack="true" />
diff --git a/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj b/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj
index 3f08c0b80..9a3cf3cc4 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj b/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj
index 37e5235f3..c2b5fd519 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj b/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj
index 1aefaa8f0..0de5158c4 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
     <EnablePreviewFeatures>true</EnablePreviewFeatures>
     <NoWarn>$(NoWarn);CA2252</NoWarn>
   </PropertyGroup>
diff --git a/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj
index 27b99da67..bc5de6ad9 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.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
index 4e576b0c2..bcc68a1df 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj
index 237103970..af6d32401 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.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
index 4047cd225..4a1b7042a 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.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
index 7f3373c5e..3f2191544 100644
--- 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;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.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
index 391078d31..60c10c68a 100644
--- 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">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);ROSLYN_4_3_1_OR_GREATER</DefineConstants>
   </PropertyGroup>
 

From 6a0e0e9d5fa1e3f5bd199fba0ab4344da63da859 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jan 2024 17:02:45 +0100
Subject: [PATCH 2/8] Fix build for .NET 8, enable C# 12

---
 build/Community.Toolkit.Common.props   | 2 +-
 build/Community.Toolkit.Common.targets | 1 -
 src/Directory.Build.props              | 2 +-
 src/Directory.Build.targets            | 9 +++++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build/Community.Toolkit.Common.props b/build/Community.Toolkit.Common.props
index a43ae645d..4d0ec4379 100644
--- a/build/Community.Toolkit.Common.props
+++ b/build/Community.Toolkit.Common.props
@@ -20,7 +20,7 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
 
     <!--
diff --git a/build/Community.Toolkit.Common.targets b/build/Community.Toolkit.Common.targets
index f34ab2ab5..e04f18d08 100644
--- a/build/Community.Toolkit.Common.targets
+++ b/build/Community.Toolkit.Common.targets
@@ -1,7 +1,6 @@
 <Project>
 
   <PropertyGroup>
-    <!-- TODO: Dynamically generate Title if one wasn't set -->
     <Title Condition="'$(Title)' == ''">$(Product) Asset</Title>
   </PropertyGroup>
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 882db66f3..486e75379 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
 
   <!-- Include PolySharp to generate polyfills for all projects (on their .NET Standard 2.x targets) -->
   <ItemGroup>
-    <PackageReference Include="PolySharp" Version="1.13.1">
+    <PackageReference Include="PolySharp" Version="1.14.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>build; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index b070ed1b8..23f65c476 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -3,18 +3,23 @@
   <Import Project="..\Directory.Build.targets" />
 
   <!-- Define NETSTANDARD2_1_OR_GREATER for .NET Standard 2.1 targets and above -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))">
     <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
   </PropertyGroup>
 
   <!-- Configure trimming for projects on .NET 6 and above -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <IsTrimmable>true</IsTrimmable>
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <EnableAotAnalyzer>true</EnableAotAnalyzer>
     <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
   </PropertyGroup>
 
+  <!-- Set the AOT property directly on .NET 8 and above -->
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <IsAotCompatible>true</IsAotCompatible>
+  </PropertyGroup>
+
   <!--
     The following target has been ported from TerraFX.Interop.Windows.
     See: https://github.com/terrafx/terrafx.interop.windows.

From 98c5b3caa6da61a27586726786607d6295884f9a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jan 2024 17:07:12 +0100
Subject: [PATCH 3/8] Add missing in modifiers

---
 .../Extensions/NullableExtensions.cs                 |  2 +-
 .../Extensions/ReadOnlySpanExtensions.cs             |  2 +-
 .../Extensions/StreamExtensions.cs                   |  2 +-
 .../Extensions/StringExtensions.cs                   |  4 ++--
 .../Helpers/ParallelHelper.For.IAction.cs            |  4 ++--
 .../Helpers/ParallelHelper.For.IAction2D.cs          |  4 ++--
 .../Helpers/ParallelHelper.ForEach.IInAction.cs      |  4 ++--
 .../Helpers/ParallelHelper.ForEach.IInAction2D.cs    |  2 +-
 .../Helpers/ParallelHelper.ForEach.IRefAction.cs     |  4 ++--
 .../Helpers/ParallelHelper.ForEach.IRefAction2D.cs   |  2 +-
 .../Extensions/Test_ArrayExtensions.1D.cs            | 12 ++++++------
 .../Extensions/Test_ReadOnlySpanExtensions.cs        | 10 +++++-----
 .../Extensions/Test_SpanExtensions.cs                | 12 ++++++------
 .../Extensions/Test_StringExtensions.cs              |  4 ++--
 .../Memory/Test_ReadOnlyMemory2D{T}.cs               |  2 +-
 .../Memory/Test_ReadOnlySpan2D{T}.cs                 | 12 ++++++------
 .../Test_NullableReadOnlyRef{T}.cs                   |  8 ++++----
 .../Test_ReadOnlyRef{T}.cs                           |  2 +-
 18 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/CommunityToolkit.HighPerformance/Extensions/NullableExtensions.cs b/src/CommunityToolkit.HighPerformance/Extensions/NullableExtensions.cs
index 98fe1f38b..f4a6cac3a 100644
--- a/src/CommunityToolkit.HighPerformance/Extensions/NullableExtensions.cs
+++ b/src/CommunityToolkit.HighPerformance/Extensions/NullableExtensions.cs
@@ -48,7 +48,7 @@ public static ref T DangerousGetValueOrDefaultReference<T>(this ref T? value)
     /// <typeparam name="T">The type of the underlying value.</typeparam>
     /// <param name="value">The <see cref="Nullable{T}"/>.</param>
     /// <returns>A reference to the value of the input <see cref="Nullable{T}"/> instance, or a <see langword="null"/> <typeparamref name="T"/> reference.</returns>
-    /// <remarks>The returned reference can be tested for <see langword="null"/> using <see cref="Unsafe.IsNullRef{T}(ref T)"/>.</remarks>
+    /// <remarks>The returned reference can be tested for <see langword="null"/> using <see cref="Unsafe.IsNullRef"/>.</remarks>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static unsafe ref T DangerousGetValueOrNullReference<T>(ref this T? value)
         where T : struct
diff --git a/src/CommunityToolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/src/CommunityToolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index 0e78fc341..dfae52a13 100644
--- a/src/CommunityToolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/src/CommunityToolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -213,7 +213,7 @@ public static ReadOnlySpan2D<T> AsSpan2D<T>(this ReadOnlySpan<T> span, int offse
     public static unsafe int IndexOf<T>(this ReadOnlySpan<T> span, in T value)
     {
         ref T r0 = ref MemoryMarshal.GetReference(span);
-        ref T r1 = ref Unsafe.AsRef(value);
+        ref T r1 = ref Unsafe.AsRef(in value);
         IntPtr byteOffset = Unsafe.ByteOffset(ref r0, ref r1);
 
         nint elementOffset = byteOffset / (nint)(uint)sizeof(T);
diff --git a/src/CommunityToolkit.HighPerformance/Extensions/StreamExtensions.cs b/src/CommunityToolkit.HighPerformance/Extensions/StreamExtensions.cs
index a4808e15b..500c65001 100644
--- a/src/CommunityToolkit.HighPerformance/Extensions/StreamExtensions.cs
+++ b/src/CommunityToolkit.HighPerformance/Extensions/StreamExtensions.cs
@@ -275,7 +275,7 @@ public static unsafe void Write<T>(this Stream stream, in T value)
         where T : unmanaged
     {
 #if NETSTANDARD2_1_OR_GREATER
-        ref T r0 = ref Unsafe.AsRef(value);
+        ref T r0 = ref Unsafe.AsRef(in value);
         ref byte r1 = ref Unsafe.As<T, byte>(ref r0);
         int length = sizeof(T);
 
diff --git a/src/CommunityToolkit.HighPerformance/Extensions/StringExtensions.cs b/src/CommunityToolkit.HighPerformance/Extensions/StringExtensions.cs
index a3260c5bd..b2875637c 100644
--- a/src/CommunityToolkit.HighPerformance/Extensions/StringExtensions.cs
+++ b/src/CommunityToolkit.HighPerformance/Extensions/StringExtensions.cs
@@ -27,7 +27,7 @@ public static class StringExtensions
     public static ref char DangerousGetReference(this string text)
     {
 #if NET6_0_OR_GREATER
-        return ref Unsafe.AsRef(text.GetPinnableReference());
+        return ref Unsafe.AsRef(in text.GetPinnableReference());
 #else
         return ref MemoryMarshal.GetReference(text.AsSpan());
 #endif
@@ -44,7 +44,7 @@ public static ref char DangerousGetReference(this string text)
     public static ref char DangerousGetReferenceAt(this string text, int i)
     {
 #if NET6_0_OR_GREATER
-        ref char r0 = ref Unsafe.AsRef(text.GetPinnableReference());
+        ref char r0 = ref Unsafe.AsRef(in text.GetPinnableReference());
 #else
         ref char r0 = ref MemoryMarshal.GetReference(text.AsSpan());
 #endif
diff --git a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction.cs b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction.cs
index 5a8fe49d5..4ea95a236 100644
--- a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction.cs
+++ b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction.cs
@@ -172,7 +172,7 @@ public static void For<TAction>(int start, int end, in TAction action, int minim
         {
             for (int i = start; i < end; i++)
             {
-                Unsafe.AsRef(action).Invoke(i);
+                Unsafe.AsRef(in action).Invoke(i);
             }
 
             return;
@@ -225,7 +225,7 @@ public void Invoke(int i)
 
             for (int j = low; j < stop; j++)
             {
-                Unsafe.AsRef(this.action).Invoke(j);
+                Unsafe.AsRef(in this.action).Invoke(j);
             }
         }
     }
diff --git a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction2D.cs b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction2D.cs
index 6a16c8ca1..66009ea7b 100644
--- a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction2D.cs
+++ b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.For.IAction2D.cs
@@ -257,7 +257,7 @@ public static void For2D<TAction>(int top, int bottom, int left, int right, in T
             {
                 for (int x = left; x < right; x++)
                 {
-                    Unsafe.AsRef(action).Invoke(y, x);
+                    Unsafe.AsRef(in action).Invoke(y, x);
                 }
             }
 
@@ -319,7 +319,7 @@ public void Invoke(int i)
             {
                 for (int x = this.startX; x < this.endX; x++)
                 {
-                    Unsafe.AsRef(this.action).Invoke(y, x);
+                    Unsafe.AsRef(in this.action).Invoke(y, x);
                 }
             }
         }
diff --git a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
index 7d4ae7a7c..f0e4790af 100644
--- a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
+++ b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
@@ -91,7 +91,7 @@ public static void ForEach<TItem, TAction>(ReadOnlyMemory<TItem> memory, in TAct
         {
             foreach (TItem? item in memory.Span)
             {
-                Unsafe.AsRef(action).Invoke(item);
+                Unsafe.AsRef(in action).Invoke(item);
             }
 
             return;
@@ -144,7 +144,7 @@ public void Invoke(int i)
 
             while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
             {
-                Unsafe.AsRef(this.action).Invoke(in rStart);
+                Unsafe.AsRef(in this.action).Invoke(in rStart);
 
                 rStart = ref Unsafe.Add(ref rStart, 1);
             }
diff --git a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs
index e10361c16..a600c529c 100644
--- a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs
+++ b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs
@@ -144,7 +144,7 @@ public void Invoke(int i)
 
                 while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
                 {
-                    Unsafe.AsRef(this.action).Invoke(in rStart);
+                    Unsafe.AsRef(in this.action).Invoke(in rStart);
 
                     rStart = ref Unsafe.Add(ref rStart, 1);
                 }
diff --git a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
index ca990f4fc..86ed6290f 100644
--- a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
+++ b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
@@ -91,7 +91,7 @@ public static void ForEach<TItem, TAction>(Memory<TItem> memory, in TAction acti
         {
             foreach (ref TItem item in memory.Span)
             {
-                Unsafe.AsRef(action).Invoke(ref item);
+                Unsafe.AsRef(in action).Invoke(ref item);
             }
 
             return;
@@ -144,7 +144,7 @@ public void Invoke(int i)
 
             while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
             {
-                Unsafe.AsRef(this.action).Invoke(ref rStart);
+                Unsafe.AsRef(in this.action).Invoke(ref rStart);
 
                 rStart = ref Unsafe.Add(ref rStart, 1);
             }
diff --git a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs
index 4a6bfc28c..799f26d69 100644
--- a/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs
+++ b/src/CommunityToolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs
@@ -151,7 +151,7 @@ public void Invoke(int i)
 
                 while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
                 {
-                    Unsafe.AsRef(this.action).Invoke(ref rStart);
+                    Unsafe.AsRef(in this.action).Invoke(ref rStart);
 
                     rStart = ref Unsafe.Add(ref rStart, 1);
                 }
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayExtensions.1D.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayExtensions.1D.cs
index c54014627..704607f4f 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayExtensions.1D.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayExtensions.1D.cs
@@ -23,8 +23,8 @@ public void Test_ArrayExtensions_DangerousGetReference()
         // item if we use "DangerousGetReferenceAt". So all these tests just invoke the API and then
         // compare the returned reference against an existing baseline (like the built-in array indexer)
         // to ensure that the two are the same. These are all managed references, so no need for pinning.
-        ref string r0 = ref Unsafe.AsRef(tokens.DangerousGetReference());
-        ref string r1 = ref Unsafe.AsRef(tokens[0]);
+        ref string r0 = ref Unsafe.AsRef(in tokens.DangerousGetReference());
+        ref string r1 = ref Unsafe.AsRef(in tokens[0]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
@@ -34,8 +34,8 @@ public void Test_ArrayExtensions_DangerousGetReferenceAt_Zero()
     {
         string[] tokens = "aa,bb,cc,dd,ee,ff,gg,hh,ii".Split(',');
 
-        ref string r0 = ref Unsafe.AsRef(tokens.DangerousGetReference());
-        ref string r1 = ref Unsafe.AsRef(tokens.DangerousGetReferenceAt(0));
+        ref string r0 = ref Unsafe.AsRef(in tokens.DangerousGetReference());
+        ref string r1 = ref Unsafe.AsRef(in tokens.DangerousGetReferenceAt(0));
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
@@ -45,8 +45,8 @@ public void Test_ArrayExtensions_DangerousGetReferenceAt_Index()
     {
         string[] tokens = "aa,bb,cc,dd,ee,ff,gg,hh,ii".Split(',');
 
-        ref string r0 = ref Unsafe.AsRef(tokens.DangerousGetReferenceAt(5));
-        ref string r1 = ref Unsafe.AsRef(tokens[5]);
+        ref string r0 = ref Unsafe.AsRef(in tokens.DangerousGetReferenceAt(5));
+        ref string r1 = ref Unsafe.AsRef(in tokens[5]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ReadOnlySpanExtensions.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ReadOnlySpanExtensions.cs
index 2ee9962b8..c7db7c108 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ReadOnlySpanExtensions.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ReadOnlySpanExtensions.cs
@@ -25,7 +25,7 @@ public void Test_ReadOnlySpanExtensions_DangerousGetReference()
         ReadOnlySpan<int> data = owner.GetSpan();
 
         ref int r0 = ref data.DangerousGetReference();
-        ref int r1 = ref Unsafe.AsRef(data[0]);
+        ref int r1 = ref Unsafe.AsRef(in data[0]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
@@ -51,7 +51,7 @@ public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Index()
         ReadOnlySpan<int> data = owner.GetSpan();
 
         ref int r0 = ref data.DangerousGetReferenceAt(5);
-        ref int r1 = ref Unsafe.AsRef(data[5]);
+        ref int r1 = ref Unsafe.AsRef(in data[5]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
@@ -79,13 +79,13 @@ public void Test_ReadOnlySpanExtensions_DangerousGetLookupReferenceAt(int i)
             0, 0, 0, 0, 0, 0, 1, 0, 1
         };
 
-        ref byte ri = ref Unsafe.AsRef(table.DangerousGetLookupReferenceAt(i));
+        ref byte ri = ref Unsafe.AsRef(in table.DangerousGetLookupReferenceAt(i));
 
         bool isInRange = (uint)i < (uint)table.Length;
 
         if (isInRange)
         {
-            Assert.IsTrue(Unsafe.AreSame(ref ri, ref Unsafe.AsRef(table[i])));
+            Assert.IsTrue(Unsafe.AreSame(ref ri, ref Unsafe.AsRef(in table[i])));
         }
         else
         {
@@ -186,7 +186,7 @@ public void Test_ReadOnlySpanExtensions_Enumerate()
 
         foreach (HighPerformance.Enumerables.ReadOnlySpanEnumerable<int>.Item item in data.Enumerate())
         {
-            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(data[i]), ref Unsafe.AsRef(item.Value)));
+            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(in data[i]), ref Unsafe.AsRef(in item.Value)));
             Assert.AreEqual(i, item.Index);
 
             i++;
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_SpanExtensions.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_SpanExtensions.cs
index 8baa1f295..4fa090c02 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_SpanExtensions.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_SpanExtensions.cs
@@ -18,8 +18,8 @@ public void Test_SpanExtensions_DangerousGetReference()
     {
         Span<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
 
-        ref int r0 = ref Unsafe.AsRef(data.DangerousGetReference());
-        ref int r1 = ref Unsafe.AsRef(data[0]);
+        ref int r0 = ref Unsafe.AsRef(in data.DangerousGetReference());
+        ref int r1 = ref Unsafe.AsRef(in data[0]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
@@ -29,8 +29,8 @@ public void Test_SpanExtensions_DangerousGetReferenceAt_Zero()
     {
         Span<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
 
-        ref int r0 = ref Unsafe.AsRef(data.DangerousGetReference());
-        ref int r1 = ref Unsafe.AsRef(data.DangerousGetReferenceAt(0));
+        ref int r0 = ref Unsafe.AsRef(in data.DangerousGetReference());
+        ref int r1 = ref Unsafe.AsRef(in data.DangerousGetReferenceAt(0));
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
@@ -40,8 +40,8 @@ public void Test_SpanExtensions_DangerousGetReferenceAt_Index()
     {
         Span<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
 
-        ref int r0 = ref Unsafe.AsRef(data.DangerousGetReferenceAt(5));
-        ref int r1 = ref Unsafe.AsRef(data[5]);
+        ref int r0 = ref Unsafe.AsRef(in data.DangerousGetReferenceAt(5));
+        ref int r1 = ref Unsafe.AsRef(in data[5]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_StringExtensions.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_StringExtensions.cs
index 50ecd44f8..802e90f74 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_StringExtensions.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_StringExtensions.cs
@@ -18,7 +18,7 @@ public void Test_StringExtensions_DangerousGetReference()
         string text = "Hello, world!";
 
         ref char r0 = ref text.DangerousGetReference();
-        ref char r1 = ref Unsafe.AsRef(text.AsSpan()[0]);
+        ref char r1 = ref Unsafe.AsRef(in text.AsSpan()[0]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
@@ -40,7 +40,7 @@ public void Test_StringExtensions_DangerousGetReferenceAt_Index()
         string text = "Hello, world!";
 
         ref char r0 = ref text.DangerousGetReferenceAt(5);
-        ref char r1 = ref Unsafe.AsRef(text.AsSpan()[5]);
+        ref char r1 = ref Unsafe.AsRef(in text.AsSpan()[5]);
 
         Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
     }
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlyMemory2D{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlyMemory2D{T}.cs
index 7baa91e41..dc8673771 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlyMemory2D{T}.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlyMemory2D{T}.cs
@@ -298,7 +298,7 @@ public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_1()
 #else
         Assert.IsTrue(success);
         Assert.AreEqual(memory.Length, array.Length);
-        Assert.IsTrue(Unsafe.AreSame(ref array[0, 0], ref Unsafe.AsRef(memory.Span[0])));
+        Assert.IsTrue(Unsafe.AreSame(ref array[0, 0], ref Unsafe.AsRef(in memory.Span[0])));
 #endif
     }
 
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlySpan2D{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlySpan2D{T}.cs
index 4089b74f5..c7c4db13c 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlySpan2D{T}.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Memory/Test_ReadOnlySpan2D{T}.cs
@@ -550,10 +550,10 @@ public void Test_ReadOnlySpan2DT_GetRowReadOnlySpan()
         ReadOnlySpan<int> span = span2d.GetRowSpan(1);
 
         Assert.IsTrue(Unsafe.AreSame(
-            ref Unsafe.AsRef(span[0]),
+            ref Unsafe.AsRef(in span[0]),
             ref array[1, 0]));
         Assert.IsTrue(Unsafe.AreSame(
-            ref Unsafe.AsRef(span[2]),
+            ref Unsafe.AsRef(in span[2]),
             ref array[1, 2]));
 
         _ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetRowSpan(-1));
@@ -783,7 +783,7 @@ public void Test_ReadOnlySpan2DT_GetRow()
         int i = 0;
         foreach (ref readonly int value in new ReadOnlySpan2D<int>(array).GetRow(1))
         {
-            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[1, i++]));
+            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(in value), ref array[1, i++]));
         }
 
         ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array).GetRow(1);
@@ -815,7 +815,7 @@ public unsafe void Test_ReadOnlySpan2DT_Pointer_GetRow()
         int i = 0;
         foreach (ref readonly int value in new ReadOnlySpan2D<int>(array, 2, 3, 0).GetRow(1))
         {
-            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[3 + i++]));
+            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(in value), ref array[3 + i++]));
         }
 
         ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array, 2, 3, 0).GetRow(1);
@@ -841,7 +841,7 @@ public void Test_ReadOnlySpan2DT_GetColumn()
         int i = 0;
         foreach (ref readonly int value in new ReadOnlySpan2D<int>(array).GetColumn(1))
         {
-            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[i++, 1]));
+            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(in value), ref array[i++, 1]));
         }
 
         ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array).GetColumn(2);
@@ -871,7 +871,7 @@ public unsafe void Test_ReadOnlySpan2DT_Pointer_GetColumn()
         int i = 0;
         foreach (ref readonly int value in new ReadOnlySpan2D<int>(array, 2, 3, 0).GetColumn(1))
         {
-            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[(i++ * 3) + 1]));
+            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(in value), ref array[(i++ * 3) + 1]));
         }
 
         ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array, 2, 3, 0).GetColumn(2);
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Test_NullableReadOnlyRef{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Test_NullableReadOnlyRef{T}.cs
index 7ddffd849..114d6d53c 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Test_NullableReadOnlyRef{T}.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Test_NullableReadOnlyRef{T}.cs
@@ -20,7 +20,7 @@ public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_Ok()
         NullableReadOnlyRef<int> reference = new(value);
 
         Assert.IsTrue(reference.HasValue);
-        Assert.IsTrue(Unsafe.AreSame(ref value, ref Unsafe.AsRef(reference.Value)));
+        Assert.IsTrue(Unsafe.AreSame(ref value, ref Unsafe.AsRef(in reference.Value)));
     }
 
     [TestMethod]
@@ -50,7 +50,7 @@ public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ImplicitRef
         NullableReadOnlyRef<int> nullableRef = reference;
 
         Assert.IsTrue(nullableRef.HasValue);
-        Assert.IsTrue(Unsafe.AreSame(ref reference.Value, ref Unsafe.AsRef(nullableRef.Value)));
+        Assert.IsTrue(Unsafe.AreSame(ref reference.Value, ref Unsafe.AsRef(in nullableRef.Value)));
     }
 
     [TestMethod]
@@ -61,7 +61,7 @@ public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ImplicitRea
         NullableReadOnlyRef<int> nullableRef = reference;
 
         Assert.IsTrue(nullableRef.HasValue);
-        Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(reference.Value), ref Unsafe.AsRef(nullableRef.Value)));
+        Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(in reference.Value), ref Unsafe.AsRef(in nullableRef.Value)));
     }
 
     [TestMethod]
@@ -72,7 +72,7 @@ public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ImplicitNul
         NullableReadOnlyRef<int> nullableRef = reference;
 
         Assert.IsTrue(nullableRef.HasValue);
-        Assert.IsTrue(Unsafe.AreSame(ref reference.Value, ref Unsafe.AsRef(nullableRef.Value)));
+        Assert.IsTrue(Unsafe.AreSame(ref reference.Value, ref Unsafe.AsRef(in nullableRef.Value)));
     }
 
     [TestMethod]
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/Test_ReadOnlyRef{T}.cs b/tests/CommunityToolkit.HighPerformance.UnitTests/Test_ReadOnlyRef{T}.cs
index f5c8fece8..ac2640bb8 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/Test_ReadOnlyRef{T}.cs
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/Test_ReadOnlyRef{T}.cs
@@ -18,7 +18,7 @@ public void Test_RefOfT_CreateRefOfT()
         int value = 1;
         ReadOnlyRef<int> reference = new(value);
 
-        Assert.IsTrue(Unsafe.AreSame(ref value, ref Unsafe.AsRef(reference.Value)));
+        Assert.IsTrue(Unsafe.AreSame(ref value, ref Unsafe.AsRef(in reference.Value)));
     }
 }
 

From a181f0cef7eaf47a889d10a6e8515d7300b35512 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jan 2024 17:15:55 +0100
Subject: [PATCH 4/8] Add AOT annotations to the MVVM Toolkit

---
 .../CommunityToolkit.Mvvm.csproj                      |  1 +
 .../ComponentModel/ObservableRecipient.cs             | 11 +++++++++++
 .../Messaging/IMessengerExtensions.cs                 | 11 +++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
index f1921fd93..5cda87616 100644
--- a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
+++ b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
@@ -55,6 +55,7 @@
       System.Diagnostics.CodeAnalysis.NotNullAttribute;
       System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute;
       System.Diagnostics.CodeAnalysis.NotNullWhenAttribute;
+      System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute;
       System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute;
       System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute;
       System.Runtime.CompilerServices.CallerArgumentExpressionAttribute;
diff --git a/src/CommunityToolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/src/CommunityToolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index 63b28441b..5cd9433e6 100644
--- a/src/CommunityToolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/src/CommunityToolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -64,6 +64,12 @@ public bool IsActive
             "If this type is removed by the linker, or if the target recipient was created dynamically and was missed by the source generator, a slower fallback " +
             "path using a compiled LINQ expression will be used. This will have more overhead in the first invocation of this method for any given recipient type. " +
             "Alternatively, OnActivated() can be manually overwritten, and registration can be done individually for each required message for this recipient.")]
+        [RequiresDynamicCode(
+            "When this property is set to true, the OnActivated() method will be invoked, which will register all necessary message handlers for this recipient. " +
+            "This method requires the generated CommunityToolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions type not to be removed to use the fast path. " +
+            "If that is present, the method is AOT safe, as the only methods being invoked to register the messages will be the ones produced by the source generator. " +
+            "If it isn't, this method will need to dynamically create the generic methods to register messages, which might not be available at runtime. " +
+            "Alternatively, OnActivated() can be manually overwritten, and registration can be done individually for each required message for this recipient.")]
         set
         {
             if (SetProperty(ref this.isActive, value, true))
@@ -96,6 +102,11 @@ public bool IsActive
         "If this type is removed by the linker, or if the target recipient was created dynamically and was missed by the source generator, a slower fallback " +
         "path using a compiled LINQ expression will be used. This will have more overhead in the first invocation of this method for any given recipient type. " +
         "Alternatively, OnActivated() can be manually overwritten, and registration can be done individually for each required message for this recipient.")]
+    [RequiresDynamicCode(
+        "This method requires the generated CommunityToolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions type not to be removed to use the fast path. " +
+        "If that is present, the method is AOT safe, as the only methods being invoked to register the messages will be the ones produced by the source generator. " +
+        "If it isn't, this method will need to dynamically create the generic methods to register messages, which might not be available at runtime. " +
+        "Alternatively, OnActivated() can be manually overwritten, and registration can be done individually for each required message for this recipient.")]
     protected virtual void OnActivated()
     {
         Messenger.RegisterAll(this);
diff --git a/src/CommunityToolkit.Mvvm/Messaging/IMessengerExtensions.cs b/src/CommunityToolkit.Mvvm/Messaging/IMessengerExtensions.cs
index f6f038166..6febfb2e1 100644
--- a/src/CommunityToolkit.Mvvm/Messaging/IMessengerExtensions.cs
+++ b/src/CommunityToolkit.Mvvm/Messaging/IMessengerExtensions.cs
@@ -90,6 +90,10 @@ public static bool IsRegistered<TMessage>(this IMessenger messenger, object reci
         "This method requires the generated CommunityToolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions type not to be removed to use the fast path. " +
         "If this type is removed by the linker, or if the target recipient was created dynamically and was missed by the source generator, a slower fallback " +
         "path using a compiled LINQ expression will be used. This will have more overhead in the first invocation of this method for any given recipient type.")]
+    [RequiresDynamicCode(
+        "This method requires the generated CommunityToolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions type not to be removed to use the fast path. " +
+        "If that is present, the method is AOT safe, as the only methods being invoked to register the messages will be the ones produced by the source generator. " +
+        "If it isn't, this method will need to dynamically create the generic methods to register messages, which might not be available at runtime.")]
     public static void RegisterAll(this IMessenger messenger, object recipient)
     {
         ArgumentNullException.ThrowIfNull(messenger);
@@ -113,7 +117,7 @@ public static void RegisterAll(this IMessenger messenger, object recipient)
         // Try to get the cached delegate, if the generator has run correctly
         Action<IMessenger, object>? registrationAction = DiscoveredRecipients.RegistrationMethods.GetValue(
             recipient.GetType(),
-            [RequiresUnreferencedCode("The type of the current instance cannot be statically discovered.")] static (t) => LoadRegistrationMethodsForType(t));
+            LoadRegistrationMethodsForType);
 
         if (registrationAction is not null)
         {
@@ -144,6 +148,7 @@ public static void RegisterAll(this IMessenger messenger, object recipient)
         "This method requires the generated CommunityToolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions type not to be removed to use the fast path. " +
         "If this type is removed by the linker, or if the target recipient was created dynamically and was missed by the source generator, a slower fallback " +
         "path using a compiled LINQ expression will be used. This will have more overhead in the first invocation of this method for any given recipient type.")]
+    [RequiresDynamicCode("The generic methods to register messages might not be available at runtime.")]
     public static void RegisterAll<TToken>(this IMessenger messenger, object recipient, TToken token)
         where TToken : IEquatable<TToken>
     {
@@ -156,6 +161,7 @@ public static void RegisterAll<TToken>(this IMessenger messenger, object recipie
         // target recipient type, and just invoke it to get the delegate to cache and use later.
         // In this case we also need to create a generic instantiation of the target method first.
         [RequiresUnreferencedCode("The type of the current instance cannot be statically discovered.")]
+        [RequiresDynamicCode("The generic methods to register messages might not be available at runtime.")]
         static Action<IMessenger, object, TToken> LoadRegistrationMethodsForType(Type recipientType)
         {
             if (recipientType.Assembly.GetType("CommunityToolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions") is Type extensionsType &&
@@ -173,6 +179,7 @@ static Action<IMessenger, object, TToken> LoadRegistrationMethodsForType(Type re
         // This method is only invoked once per recipient type and token type, so we're not
         // worried about making it super efficient, and we can use the LINQ code for clarity.
         // The LINQ codegen bloat is not really important for the same reason.
+        [RequiresDynamicCode("The generic methods to register messages might not be available at runtime.")]
         static Action<IMessenger, object, TToken> LoadRegistrationMethodsForTypeFallback(Type recipientType)
         {
             // Get the collection of validation methods
@@ -231,7 +238,7 @@ from registrationMethod in registrationMethods
         // For more info on this, see the related issue at https://github.com/dotnet/roslyn/issues/5835.
         Action<IMessenger, object, TToken> registrationAction = DiscoveredRecipients<TToken>.RegistrationMethods.GetValue(
             recipient.GetType(),
-            [RequiresUnreferencedCode("The type of the current instance cannot be statically discovered.")] static (t) => LoadRegistrationMethodsForType(t));
+            LoadRegistrationMethodsForType);
 
         // Invoke the cached delegate to actually execute the message registration
         registrationAction(messenger, recipient, token);

From eda07b39e4dbc55f69984a09a0f5c320167f60b4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jan 2024 19:06:26 +0100
Subject: [PATCH 5/8] Fix some nullability warnings

---
 .../Test_ObservablePropertyAttribute.cs                     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/CommunityToolkit.Mvvm.UnitTests/Test_ObservablePropertyAttribute.cs b/tests/CommunityToolkit.Mvvm.UnitTests/Test_ObservablePropertyAttribute.cs
index aac13f796..495a9cd59 100644
--- a/tests/CommunityToolkit.Mvvm.UnitTests/Test_ObservablePropertyAttribute.cs
+++ b/tests/CommunityToolkit.Mvvm.UnitTests/Test_ObservablePropertyAttribute.cs
@@ -1046,8 +1046,8 @@ public void Test_ObservableProperty_ModelWithDependentPropertyAndPropertyChangin
     {
         ModelWithDependentPropertyAndPropertyChanging model = new();
 
-        List<string> changingArgs = new();
-        List<string> changedArgs = new();
+        List<string?> changingArgs = new();
+        List<string?> changedArgs = new();
 
         model.PropertyChanging += (s, e) => changingArgs.Add(e.PropertyName);
         model.PropertyChanged += (s, e) => changedArgs.Add(e.PropertyName);
@@ -1064,7 +1064,7 @@ public void Test_ObservableProperty_ModelWithDependentPropertyAndNoPropertyChang
     {
         ModelWithDependentPropertyAndNoPropertyChanging model = new();
 
-        List<string> changedArgs = new();
+        List<string?> changedArgs = new();
 
         model.PropertyChanged += (s, e) => changedArgs.Add(e.PropertyName);
 

From e26602c22637760d35ac566dced77960df05bec0 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jan 2024 19:06:43 +0100
Subject: [PATCH 6/8] Fix source generator unit tests on .NET 8

---
 ...it.Mvvm.SourceGenerators.Roslyn401.UnitTests.csproj | 10 +++++++---
 ...it.Mvvm.SourceGenerators.Roslyn431.UnitTests.csproj |  6 +++++-
 ...CSharpAnalyzerWithLanguageVersionTest{TAnalyzer}.cs |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

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
index 3f2191544..99237d50c 100644
--- 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
@@ -2,12 +2,16 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
+    <RestoreSources>
+      https://api.nuget.org/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json;
+    </RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.2-beta1.23509.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2-beta1.23509.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.2-beta1.23509.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
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
index 60c10c68a..3da6c42ae 100644
--- 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
@@ -3,10 +3,14 @@
   <PropertyGroup>
     <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);ROSLYN_4_3_1_OR_GREATER</DefineConstants>
+    <RestoreSources>
+      https://api.nuget.org/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json;
+    </RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.2-beta1.23509.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Helpers/CSharpAnalyzerWithLanguageVersionTest{TAnalyzer}.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Helpers/CSharpAnalyzerWithLanguageVersionTest{TAnalyzer}.cs
index a2610aad7..eb33e32c0 100644
--- a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Helpers/CSharpAnalyzerWithLanguageVersionTest{TAnalyzer}.cs
+++ b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Helpers/CSharpAnalyzerWithLanguageVersionTest{TAnalyzer}.cs
@@ -50,7 +50,9 @@ public static Task VerifyAnalyzerAsync(string source, LanguageVersion languageVe
     {
         CSharpAnalyzerWithLanguageVersionTest<TAnalyzer> test = new(languageVersion) { TestCode = source };
 
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
+        test.TestState.ReferenceAssemblies = ReferenceAssemblies.Net.Net80;
+#elif NET6_0_OR_GREATER
         test.TestState.ReferenceAssemblies = ReferenceAssemblies.Net.Net60;
 #else
         test.TestState.ReferenceAssemblies = ReferenceAssemblies.NetFramework.Net472.Default;

From b4cf03ca9ad912fe30f01e092ed10953ae4dc611 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jan 2024 19:13:42 +0100
Subject: [PATCH 7/8] Bump NuGet packages to latest stable

---
 Directory.Build.props                                  |  4 ++--
 src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj |  2 +-
 .../CommunityToolkit.Common.UnitTests.csproj           |  6 +++---
 .../CommunityToolkit.Diagnostics.UnitTests.csproj      |  6 +++---
 .../CommunityToolkit.HighPerformance.UnitTests.csproj  |  6 +++---
 ...vvm.DisableINotifyPropertyChanging.UnitTests.csproj |  6 +++---
 .../CommunityToolkit.Mvvm.Internals.UnitTests.csproj   |  6 +++---
 .../CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj   | 10 +++++-----
 .../CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj   | 10 +++++-----
 ...it.Mvvm.SourceGenerators.Roslyn401.UnitTests.csproj |  6 +++---
 ...it.Mvvm.SourceGenerators.Roslyn431.UnitTests.csproj |  6 +++---
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 48a18c427..2fb1f6a36 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -25,7 +25,7 @@
   </Choose>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.128" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="All" />
   </ItemGroup>
 
   <Choose>
@@ -39,7 +39,7 @@
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
       </ItemGroup>
     </When>
   </Choose>
diff --git a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
index 5cda87616..e6c7d8be2 100644
--- a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
+++ b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
@@ -22,7 +22,7 @@
 
   <!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
diff --git a/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj b/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj
index 9a3cf3cc4..3e687c399 100644
--- a/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj
+++ b/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj b/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj
index c2b5fd519..35243d518 100644
--- a/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj
+++ b/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj b/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj
index 0de5158c4..a14f74068 100644
--- a/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj
+++ b/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj
index bc5de6ad9..433a0741e 100644
--- a/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj
+++ b/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
   <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
index bcc68a1df..34765766c 100644
--- a/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj
+++ b/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj
index af6d32401..7bf764d58 100644
--- a/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj
+++ b/tests/CommunityToolkit.Mvvm.Roslyn401.UnitTests/CommunityToolkit.Mvvm.Roslyn401.UnitTests.csproj
@@ -7,11 +7,11 @@
 
   <ItemGroup>
     <PackageReference Include="Dbs.Signed3.Nito.AsyncEx.Context" Version="5.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/CommunityToolkit.Mvvm.Roslyn431.UnitTests/CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.Roslyn431.UnitTests/CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj
index 4a1b7042a..44eb2705f 100644
--- a/tests/CommunityToolkit.Mvvm.Roslyn431.UnitTests/CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj
+++ b/tests/CommunityToolkit.Mvvm.Roslyn431.UnitTests/CommunityToolkit.Mvvm.Roslyn431.UnitTests.csproj
@@ -7,11 +7,11 @@
 
   <ItemGroup>
     <PackageReference Include="Dbs.Signed3.Nito.AsyncEx.Context" Version="5.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
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
index 99237d50c..963ee0c63 100644
--- 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
@@ -13,9 +13,9 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2-beta1.23509.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.2-beta1.23509.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
 
   <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
index 3da6c42ae..0c9526e65 100644
--- 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
@@ -12,9 +12,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.2-beta1.23509.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

From 32dbaed11c426da15f6012517872e9f0f5e0e3d9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 7 Aug 2024 20:18:31 -0700
Subject: [PATCH 8/8] Fix source generator unit tests

---
 ..._AsyncVoidReturningRelayCommandMethodCodeFixer.cs |  4 ++--
 ...assUsingAttributeInsteadOfInheritanceCodeFixer.cs | 12 ++++++------
 ...ldReferenceForObservablePropertyFieldCodeFixer.cs |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_AsyncVoidReturningRelayCommandMethodCodeFixer.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_AsyncVoidReturningRelayCommandMethodCodeFixer.cs
index e3c69458e..a74c975a1 100644
--- a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_AsyncVoidReturningRelayCommandMethodCodeFixer.cs
+++ b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_AsyncVoidReturningRelayCommandMethodCodeFixer.cs
@@ -53,7 +53,7 @@ private async Task Foo()
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(RelayCommand).Assembly);
@@ -98,7 +98,7 @@ private async Task Foo()
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(RelayCommand).Assembly);
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_ClassUsingAttributeInsteadOfInheritanceCodeFixer.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_ClassUsingAttributeInsteadOfInheritanceCodeFixer.cs
index 17a4a2c09..d90d9a5bb 100644
--- a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_ClassUsingAttributeInsteadOfInheritanceCodeFixer.cs
+++ b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_ClassUsingAttributeInsteadOfInheritanceCodeFixer.cs
@@ -48,7 +48,7 @@ class C : ObservableObject
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -97,7 +97,7 @@ public void Dispose()
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -150,7 +150,7 @@ class TestAttribute : Attribute
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -203,7 +203,7 @@ class TestAttribute : Attribute
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -260,7 +260,7 @@ class TestAttribute : Attribute
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -312,7 +312,7 @@ class TestAttribute : Attribute
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_FieldReferenceForObservablePropertyFieldCodeFixer.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_FieldReferenceForObservablePropertyFieldCodeFixer.cs
index dec18e08a..1ee684019 100644
--- a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_FieldReferenceForObservablePropertyFieldCodeFixer.cs
+++ b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn401.UnitTests/Test_FieldReferenceForObservablePropertyFieldCodeFixer.cs
@@ -59,7 +59,7 @@ void M()
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -123,7 +123,7 @@ void M()
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -195,7 +195,7 @@ void M()
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);
@@ -265,7 +265,7 @@ void M()
         {
             TestCode = original,
             FixedCode = @fixed,
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net60
+            ReferenceAssemblies = ReferenceAssemblies.Net.Net80
         };
 
         test.TestState.AdditionalReferences.Add(typeof(ObservableObject).Assembly);