Merge branch 'release/2.1' into release/2.2

This commit is contained in:
Nate McMaster 2018-07-24 11:52:20 -07:00
commit edce1234ee
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
<Project>
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

View File

@ -1,4 +1,4 @@
<Project>
<Project>
<PropertyGroup>
<VersionPrefix>2.2.0</VersionPrefix>
<VersionSuffix>preview1</VersionSuffix>