From 18425ed192836b6e043b38520c9383d48cb8d3ac Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 16 Jan 2019 14:40:45 -0800
Subject: [PATCH] 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 563ff7c63941ff44d0754de1d0cef46811217bfa.

* Revert file watch test changes
---
 src/Templating/version.props | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Templating/version.props b/src/Templating/version.props
index 4531e641d0..39e69414a0 100644
--- a/src/Templating/version.props
+++ b/src/Templating/version.props
@@ -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>