Merge branch 'main' into relay-command-sg_field-keywords

Avid29 · web-flow · commit 7bb8a816e78a · 2026-03-30T09:12:21.000+03:00
diff --git a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.SourceGenerators.targets b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.SourceGenerators.targets
@@ -86,8 +86,8 @@
       removes and removes all analyzers except the highest version that is supported. The fallback is just Roslyn 4.0.
     -->
     <PropertyGroup>
-      <MVVMToolkitSelectedRoslynAnalyzerDirectoryName Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MVVMToolkitCurrentCompilerVersion), 4.12))">roslyn4.12</MVVMToolkitSelectedRoslynAnalyzerDirectoryName>
       <MVVMToolkitSelectedRoslynAnalyzerDirectoryName Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MVVMToolkitCurrentCompilerVersion), 4.3))">roslyn4.3</MVVMToolkitSelectedRoslynAnalyzerDirectoryName>
+      <MVVMToolkitSelectedRoslynAnalyzerDirectoryName Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MVVMToolkitCurrentCompilerVersion), 4.12))">roslyn4.12</MVVMToolkitSelectedRoslynAnalyzerDirectoryName>
       <MVVMToolkitSelectedRoslynAnalyzerDirectoryName Condition="'$(MVVMToolkitSelectedRoslynAnalyzerDirectoryName)' == ''">roslyn4.0</MVVMToolkitSelectedRoslynAnalyzerDirectoryName>
     </PropertyGroup>
     <ItemGroup>
diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "8.4.1-build.{height}",
+  "version": "8.4.2-build.{height}",
   "publicReleaseRefSpec": [
     "^refs/heads/main$", // we release out of main
     "^refs/heads/dev$", // we release out of dev

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "8.4.1-build.{height}",`
	`2`	`+ "version": "8.4.2-build.{height}",`
`3`	`3`	`"publicReleaseRefSpec": [`
`4`	`4`	`"^refs/heads/main$", // we release out of main`
`5`	`5`	`"^refs/heads/dev$", // we release out of dev`