Merge branch 'main' into winui

# Conflicts:
#	UITests/UITests.App/UITests.App.csproj
#	UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
#	UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj

Author: azchohfi

UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.SourceGenerators;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -249,6 +250,7 @@ public partial class SampleViewModel
         private void VerifyGeneratedDiagnostics<TGenerator>(string source, params string[] diagnosticsIds)
             where TGenerator : class, ISourceGenerator, new()
         {
+            Type observableObjectType = typeof(ObservableObject);
             Type validationAttributeType = typeof(ValidationAttribute);
 
             SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(source);
@@ -271,6 +273,7 @@ from assembly in AppDomain.CurrentDomain.GetAssemblies()
 
             Assert.IsTrue(resultingIds.SetEquals(diagnosticsIds));
 
+            GC.KeepAlive(observableObjectType);
             GC.KeepAlive(validationAttributeType);
         }
     }

UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\CommunityToolkit.Mvvm.SourceGenerators\CommunityToolkit.Mvvm.SourceGenerators.csproj" />
+    <ProjectReference Include="..\..\CommunityToolkit.Mvvm\CommunityToolkit.Mvvm.csproj" />
   </ItemGroup>
 
 </Project>

build/build.cake

@@ -291,6 +291,18 @@ Task("Test")
         ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings /p:Platform=AnyCPU"),
     };
     DotNetCoreTest(file.FullPath, testSettings);
+}).DoesForEach(GetFiles(baseDir + "/**/UnitTests.SourceGenerators.csproj"), (file) =>
+{
+    Information("\nRunning NetCore Source Generator Unit Tests");
+    var testSettings = new DotNetCoreTestSettings
+    {
+        Configuration = configuration,
+        NoBuild = true,
+        Loggers = new[] { "trx;LogFilePrefix=VsTestResults" },
+        Verbosity = DotNetCoreVerbosity.Normal,
+        ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings /p:Platform=AnyCPU"),
+    };
+    DotNetCoreTest(file.FullPath, testSettings);
 }).DeferOnError();
 
 Task("UITest")