Merge pull request #5944 from piotrpMSFT/piotrpMSFT/infra/00prefix

Re-introduce 00 prefix

build/Branding.props

@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0">
   <PropertyGroup>
-    <SdkBrandName>Microsoft .NET Core 2.0.0 - SDK Alpha</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core 2.0.0 - SDK Preview 1</SdkBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core 2.0.0 - Runtime</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core 2.0.0 - Host</SharedHostBrandName>
     <HostFxrBrandName>Microsoft .NET Core 2.0.0 - Host FX Resolver</HostFxrBrandName>

build/GitCommitInfo.targets

@@ -11,8 +11,10 @@
     </Exec>
 
     <PropertyGroup>
+      <GitInfoCommitCount>$(GitInfoCommitCount.PadLeft(6,'0'))</GitInfoCommitCount>
+      
       <ShouldOverWriteThePropsFile 
-        Condition=" '$(CommitCount)' != '$(GitInfoCommitCount)' Or 
+        Condition=" 'ForceStringComparison$(CommitCount)' != 'ForceStringComparison$(GitInfoCommitCount)' Or 
                     '$(CommitHash)' != '$(GitInfoCommitHash)' ">true</ShouldOverWriteThePropsFile>
 
       <GitCommitInfoPropsContent>
@@ -29,5 +31,6 @@
                       Lines="$(GitCommitInfoPropsContent)"
                       Condition=" '$(ShouldOverwriteThePropsFile)' == 'true' "
                       Overwrite="true" />
+
   </Target>
 </Project>

build/Version.props

@@ -3,7 +3,7 @@
     <VersionMajor>2</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionPatch>0</VersionPatch>
-    <ReleaseSuffix>alpha</ReleaseSuffix>
+    <ReleaseSuffix>preview1</ReleaseSuffix>
 
     <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
     <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion>