Merged PR 40090: Revert '[ internal/release/8.0.1xx] always subtract one from template versions.'

Updated Versions.props - always subtract one from template versions.

Reverts !39887
This commit is contained in:
Marc Paine 2024-06-12 02:59:23 +00:00 committed by Sean Reeser
parent e82ec8b471
commit 70cfd60f8c

View file

@ -145,9 +145,6 @@
Preview releases already use -1 versionining so don't subtract one for that version. Preview releases already use -1 versionining so don't subtract one for that version.
In public builds, we always use the 2 month old version. In public builds, we always use the 2 month old version.
--> -->
<!-- Subtract one for OOB release, remove this -->
<SubtractOneFromTemplateVersions>true</SubtractOneFromTemplateVersions>
<!-- end remove this-->
<SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions> <SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions> <SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions> <SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>