Simplify versioning

Author: natemcmaster

Directory.Build.props

@@ -20,16 +20,16 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 
     <VersionPrefix>2.0.0</VersionPrefix>
-    <BranchName Condition=" '$(BranchName)' == '' ">$(APPVEYOR_REPO_BRANCH)</BranchName>
-    <VersionSuffix Condition="'$(BranchName)' != 'master'">alpha</VersionSuffix>
-    <VersionSuffix Condition="'$(BranchName)' == 'master'">beta</VersionSuffix>
-    <VersionSuffix Condition="'$(APPVEYOR_REPO_TAG)' == 'true'">rtm</VersionSuffix>
+    <VersionSuffix>beta</VersionSuffix>
+    <PackageVersion Condition="'$(APPVEYOR_REPO_TAG)' == 'true'">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
+
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
     <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
+
+    <BranchName Condition=" '$(BranchName)' == '' ">$(APPVEYOR_REPO_BRANCH)</BranchName>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BranchName)' != '' ">$(VersionSuffix)+$(BranchName)</VersionSuffix>
-    <PackageVersion Condition="'$(APPVEYOR_REPO_TAG)' == 'true'">$(VersionPrefix)</PackageVersion>
   </PropertyGroup>
 
 </Project>