Merge branch 'alpha' into dev

Author: moozzyk

Build/Version.props

@@ -5,9 +5,9 @@
     <SignalRClientCppVersionMajor>1</SignalRClientCppVersionMajor>
     <SignalRClientCppVersionMinor>0</SignalRClientCppVersionMinor>
     <SignalRClientCppVersionPatch>0</SignalRClientCppVersionPatch>
-    <SignalRClientCppVersionSuffix>-alpha</SignalRClientCppVersionSuffix>
+    <SignalRClientCppVersionSuffix>-alpha1</SignalRClientCppVersionSuffix>
     <!-- $(build_number) generated by Team City -->
-    <SignalRClientCppVersionSuffix Condition="'$(build_number)' != ''">$(SignalRClientCppVersionSuffix)-$(build_number)</SignalRClientCppVersionSuffix>
+    <SignalRClientCppVersionSuffix Condition="'$(build_number)' != '' And '$(build_branch)' != 'release'">$(SignalRClientCppVersionSuffix)-$(build_number)</SignalRClientCppVersionSuffix>
 
     <SignalRClientCppVersionString>$(SignalRClientCppVersionMajor).$(SignalRClientCppVersionMinor).$(SignalRClientCppVersionPatch)$(SignalRClientCppVersionSuffix)</SignalRClientCppVersionString>
   </PropertyGroup>