Merge branch 'release/2.1' and bump to 0.2.0

This commit is contained in:
Nate McMaster 2018-04-30 15:24:09 -07:00
commit 346e9b4f91
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> <VersionPrefix>2.2.0</VersionPrefix>
<VersionSuffix>preview1</VersionSuffix> <VersionSuffix>preview1</VersionSuffix>
<ExperimentalVersionPrefix>0.1.0</ExperimentalVersionPrefix> <ExperimentalVersionPrefix>0.2.0</ExperimentalVersionPrefix>
<ExperimentalVersionSuffix>alpha3</ExperimentalVersionSuffix> <ExperimentalVersionSuffix>preview1</ExperimentalVersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion> <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion> <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>