Merge in 'release/7.0.3xx' changes

This commit is contained in:
dotnet-bot 2023-05-15 21:27:10 +00:00
commit 48499aef7e

View file

@ -8,7 +8,7 @@
<VersionMajor>7</VersionMajor> <VersionMajor>7</VersionMajor>
<VersionMinor>0</VersionMinor> <VersionMinor>0</VersionMinor>
<VersionSDKMinor>3</VersionSDKMinor> <VersionSDKMinor>3</VersionSDKMinor>
<VersionFeature>03</VersionFeature> <VersionFeature>04</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix> <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel> <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration> <PreReleaseVersionIteration>
@ -23,7 +23,7 @@
<VersionFeature21>30</VersionFeature21> <VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31> <VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50> <VersionFeature50>17</VersionFeature50>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature60> <VersionFeature60>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature60>
</PropertyGroup> </PropertyGroup>
<!-- Restore feeds --> <!-- Restore feeds -->
<PropertyGroup Label="Restore feeds"> <PropertyGroup Label="Restore feeds">