Merge in 'release/7.0.2xx' changes
This commit is contained in:
commit
b9926d6812
2 changed files with 3 additions and 3 deletions
|
@ -8,9 +8,9 @@
|
|||
<VersionMajor>7</VersionMajor>
|
||||
<VersionMinor>0</VersionMinor>
|
||||
<VersionSDKMinor>2</VersionSDKMinor>
|
||||
<VersionFeature>01</VersionFeature>
|
||||
<VersionFeature>02</VersionFeature>
|
||||
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
|
||||
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionIteration>
|
||||
</PreReleaseVersionIteration>
|
||||
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
<VersionFeature21>30</VersionFeature21>
|
||||
<VersionFeature31>32</VersionFeature31>
|
||||
<VersionFeature50>17</VersionFeature50>
|
||||
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature60>
|
||||
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 13))</VersionFeature60>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">
|
||||
|
|
Loading…
Reference in a new issue