From: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Date: Tue, 23 Nov 2021 01:30:04 +0000 (-0800)
Subject: Merge branch 'main' into release/stable
X-Git-Tag: submit/tizen/20220302.040122~18^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3918aaaf3d2bf733fc6acbbb73539dad09ee9664;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git

Merge branch 'main' into release/stable
---

3918aaaf3d2bf733fc6acbbb73539dad09ee9664
diff --cc eng/Versions.props
index 3df481b90,f0a0919a1..6d9cad33d
--- a/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 -->