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

Merge branch release/2.1 to release/2.2 (#6754) 

* Put Razor.Design.Test and Razor.Language.Test in a different test group (#6725)

* Move dotnet watch to a seperate test group (#6730)

* Reuse root `version.props` in Templating
- do not let Templating get behind branding changes

* Revert "Put Razor.Design.Test and Razor.Language.Test in a different test group (#6725)" (#6753)

This reverts commit 563ff7c639.

* Revert file watch test changes
This commit is contained in:
Ajay Bhargav Baaskaran 2019-01-16 14:40:45 -08:00 committed by GitHub
parent 5b56de94fd
commit 18425ed192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Templating/version.props
View File

@ -1,12 +1,3 @@
<Project>
<PropertyGroup>
<VersionPrefix>2.2.2</VersionPrefix>
<VersionSuffix>servicing</VersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND ('$(VersionSuffix)' == 'servicing' OR '$(VersionSuffix)' == 'rtm') ">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'servicing' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
<FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
<Import Project="..\..\version.props" />
</Project>