Merge branch 'main' into release/stable

diff --cc diagnostics.yml
Simple merge

diff --cc eng/Versions.props
index 3df481b90ce40f8d83ce131a1b6c6a9821921e44,f0a0919a15ede6f8dbc6653294b8698ed17c9eb2..6d9cad33d407c843a0730b8378da428ad0f4a9a3
--- 1/eng/Versions.props
--- 2/eng/Versions.props
+++ b/eng/Versions.props
@@@ -1,10 -1,18 +1,18 @@@
  <Project>
    <PropertyGroup>
      <RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
-     <PreReleaseVersionLabel></PreReleaseVersionLabel>
-     <VersionPrefix>5.0.0</VersionPrefix>
 -    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
++    <PreReleaseVersionLabel />
+     <VersionPrefix>6.0.0</VersionPrefix>
      <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
      <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
+     <!--
+       Our nightly tools are stable versioned but go to a non-stable feed.
+       Arcade usually disallows this, but we use such a versioning scheme by design.
+       The nightly bits are versioned in a stable manner to allow `dotnet tool` to perform
+       easy updates. If we have issues, we just respin builds as we are a leaf build node
+       and we don't participate in prodcon.
+     -->
+     <SkipPackagePublishingVersionChecks>true</SkipPackagePublishingVersionChecks>
    </PropertyGroup>
    <PropertyGroup>
      <!-- Latest symstore version updated by darc -->

diff --cc eng/build.yml
Simple merge

diff --cc src/SOS/SOS.UnitTests/SOS.cs
Simple merge