Merge pull request #11053 from dotnet/marcpopMSFT-stabilizebranding

Stabilize final branding before release
This commit is contained in:
Marc Paine 2021-07-14 17:12:08 -07:00 committed by GitHub
commit b243fd4b95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -10,11 +10,11 @@
<VersionSDKMinor>4</VersionSDKMinor>
<VersionFeature>00</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
<PropertyGroup>

View file

@ -24,8 +24,8 @@
</Target>
<PropertyGroup>
<VersionFeature21>$([MSBuild]::Add($(VersionFeature), 26))</VersionFeature21>
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature31>
<VersionFeature21>$([MSBuild]::Add($(VersionFeature), 29))</VersionFeature21>
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 18))</VersionFeature31>
</PropertyGroup>
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">