[automated] Merge branch 'release/8.0.2xx' => 'main' (#17806)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com> Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com> Co-authored-by: William Godbe <wigodbe@microsoft.com> Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: Noah Gilson <noahgilson@microsoft.com> Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Thalman <mthalman@microsoft.com>
This commit is contained in:
parent
a15e825e3a
commit
5037ea286a
1 changed files with 3 additions and 1 deletions
|
@ -146,8 +146,10 @@
|
|||
Therefore we stay at last month's version.
|
||||
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
|
||||
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
|
||||
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.
|
||||
-->
|
||||
<SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions>
|
||||
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
|
||||
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
|
||||
<AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
|
||||
|
|
Loading…
Reference in a new issue