Merge in 'release/6.0.2xx' changes

This commit is contained in:
dotnet-bot 2022-02-05 00:26:06 +00:00
commit 0db1cf8a64

View file

@ -26,8 +26,8 @@
<PropertyGroup> <PropertyGroup>
<VersionFeature21>30</VersionFeature21> <VersionFeature21>30</VersionFeature21>
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 21))</VersionFeature31> <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 22))</VersionFeature31>
<VersionFeature50>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature50> <VersionFeature50>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature50>
</PropertyGroup> </PropertyGroup>
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents"> <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">