Merge branch 'main' into juhoyosa/merge-main-release

diff --cc diagnostics.yml
Simple merge

diff --cc eng/Versions.props
Simple merge

diff --cc src/SOS/SOS.UnitTests/SOS.cs
index b9bb0c8ff503c625f6428b888ef1cca07cd89e84,ea11b0e7152643e751638f0ae6e6405cc2215e80..663c803d98fd515c576c0cf921a3d577b0520de9
--- 1/src/SOS/SOS.UnitTests/SOS.cs
--- 2/src/SOS/SOS.UnitTests/SOS.cs
+++ b/src/SOS/SOS.UnitTests/SOS.cs
@@@ -441,4 -451,4 +451,4 @@@ public class SO
              outputHelper?.Dispose();
          }
      }
--}
++}

diff --cc src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
index 806ce4b655c657b6bff8417005d9dc4f8ba05310,a53777ed3728c4dc45e0f9ad7becbaed7b9c0a7c..86e441c4b116c3efe38aecf73484eec217399b33
--- 1/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
--- 2/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
+++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
@@@ -70,7 -70,7 +70,6 @@@ namespace Microsoft.Diagnostics.Monitor
              {
                  throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
              }
-             
 -
              using Stream outputStream = await GetLogsAsync(settings =>
              {
                  settings.UseAppFilters = false;