Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-04-30 15:39:32 -07:00
commit 4a177d6b35
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
1 changed files with 2 additions and 2 deletions

View File

@ -3,8 +3,8 @@
<VersionPrefix>2.2.0</VersionPrefix>
<VersionSuffix>preview1</VersionSuffix>
<ExperimentalVersionPrefix>0.5.0</ExperimentalVersionPrefix>
<ExperimentalVersionSuffix>preview3</ExperimentalVersionSuffix>
<ExperimentalVersionPrefix>0.6.0</ExperimentalVersionPrefix>
<ExperimentalVersionSuffix>preview1</ExperimentalVersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>