Skip to content

Commit c0a2024

Browse files
authored
Merge pull request #30856 from dotnet-maestro-bot/merge/release/5.0-to-main
[automated] Merge branch 'release/5.0' => 'main'
2 parents 2380c73 + 8ba7656 commit c0a2024

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
1212
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
13+
<ValidateBaseline>true</ValidateBaseline>
1314
<!--
1415
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1516
-->

eng/targets/Packaging.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project>
22

33
<Target Name="EnsureBaselineIsUpdated"
4-
Condition=" '$(IsServicingBuild)' == 'true' AND
4+
Condition=" '$(ValidateBaseline)' == 'true' AND
5+
'$(IsServicingBuild)' == 'true' AND
56
'$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
67
'$(MSBuildProjectName)' != 'BaselineGenerator' AND
78
'$(MSBuildProjectName)' != 'RepoTasks' "

0 commit comments

Comments
 (0)