huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/5.0' changes

This commit is contained in:
dotnet-bot 2021-02-25 21:40:40 +00:00
parent e882394a7b 2922f539aa
commit 9addc6b6b6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eng/Versions.props
View File

@ -8,7 +8,8 @@
<PropertyGroup Label="Version settings"> <PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion> <AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion> <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>4</AspNetCorePatchVersion> <AspNetCorePatchVersion>5</AspNetCorePatchVersion>
<ValidateBasline>false</ValidateBasline>
<!-- <!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
--> -->

3
eng/targets/Packaging.targets
View File

@ -1,7 +1,8 @@
<Project> <Project>
<Target Name="EnsureBaselineIsUpdated" <Target Name="EnsureBaselineIsUpdated"
Condition=" '$(IsServicingBuild)' == 'true' AND Condition=" '$(ValidateBasline)' == 'true' AND
'$(IsServicingBuild)' == 'true' AND
'$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
'$(MSBuildProjectName)' != 'BaselineGenerator' AND '$(MSBuildProjectName)' != 'BaselineGenerator' AND
'$(MSBuildProjectName)' != 'RepoTasks' " '$(MSBuildProjectName)' != 'RepoTasks' "