Merge in 'release/6.0.4xx' changes

This commit is contained in:
dotnet-bot 2023-06-19 20:30:16 +00:00
commit 2ecee02977

View file

@ -8,7 +8,7 @@
<VersionMajor>6</VersionMajor> <VersionMajor>6</VersionMajor>
<VersionMinor>0</VersionMinor> <VersionMinor>0</VersionMinor>
<VersionSDKMinor>4</VersionSDKMinor> <VersionSDKMinor>4</VersionSDKMinor>
<VersionFeature>11</VersionFeature> <VersionFeature>12</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix> <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel> <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion> <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>