Merge all hard-coded versions and version suffixes to be defined in a single spot.

TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj

@@ -1,4 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
   <PropertyGroup>
     <VersionPrefix>1.0.0-rc</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
@@ -8,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <SdkNugetVersion Condition=" '$(SdkNugetVersion)' == ''">1.0.0-preview5-*</SdkNugetVersion>
+    <SdkNugetVersion Condition=" '$(SdkNugetVersion)' == ''">$(CliVersionPrefix)-*</SdkNugetVersion>
   </PropertyGroup>
 
   <ItemGroup>

branchinfo.txt

@@ -1,9 +0,0 @@
-# This is a file containing environment variables specific to this branch
-# Any line that is not blank and does not start with '#' is interpreted as a variable to set
-# Each line is expected to be in the format "[Name]=[Value]".
-MAJOR_VERSION=2
-MINOR_VERSION=0
-PATCH_VERSION=0
-RELEASE_SUFFIX=alpha
-CHANNEL=master
-BRANCH_NAME=master

build/Microsoft.DotNet.Cli.Prepare.targets

@@ -49,19 +49,17 @@
       <Output TaskParameter="CommitHash" PropertyName="CommitHash" />
     </GetCommitHash>
 
-    <GenerateBuildVersionInfo RepoRoot="$(RepoRoot)">
+    <GenerateBuildVersionInfo RepoRoot="$(RepoRoot)"
-      <Output TaskParameter="VersionMajor" PropertyName="VersionMajor" />
+                              VersionMajor="$(VersionMajor)"
-      <Output TaskParameter="VersionMinor" PropertyName="VersionMinor" />
+                              VersionMinor="$(VersionMinor)"
-      <Output TaskParameter="VersionPatch" PropertyName="VersionPatch" />
+                              VersionPatch="$(VersionPatch)"
+                              ReleaseSuffix="$(ReleaseSuffix)">
       <Output TaskParameter="CommitCount" PropertyName="CommitCount" />
-      <Output TaskParameter="ReleaseSuffix" PropertyName="ReleaseSuffix" />
       <Output TaskParameter="VersionSuffix" PropertyName="VersionSuffix" />
       <Output TaskParameter="SimpleVersion" PropertyName="SimpleVersion" />
       <Output TaskParameter="NugetVersion" PropertyName="NugetVersion" />
       <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
       <Output TaskParameter="VersionBadgeMoniker" PropertyName="VersionBadgeMoniker" />
-      <Output TaskParameter="Channel" PropertyName="Channel" />
-      <Output TaskParameter="BranchName" PropertyName="BranchName" />
     </GenerateBuildVersionInfo>
 
     <GenerateNuGetPackagesArchiveVersion RepoRoot="$(RepoRoot)">
@@ -72,9 +70,7 @@
       <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
       <SdkVersion>$(NugetVersion)</SdkVersion>
 
-      <SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-preview5-$(CommitCount)</SdkNugetVersion>
+      <SdkNugetVersion>$(SdkVersion)</SdkNugetVersion>
-      <ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion>
-      <DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion>
 
       <ArchiveExtension Condition=" '$(OSName)' == 'win' ">.zip</ArchiveExtension>
       <ArchiveExtension Condition=" '$(OSName)' != 'win' ">.tar.gz</ArchiveExtension>

build/package/Microsoft.DotNet.Cli.Nupkg.targets

@@ -26,7 +26,7 @@
                 Output="$(NupkgOutputDirectory)"
                 ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj"
                 ToolPath="$(Stage0Directory)"
-                VersionSuffix="preview5-$(NupkgVersionSuffix)"
+                VersionSuffix="$(ReleaseSuffix)-$(NupkgVersionSuffix)"
                 Configuration="$(Configuration)" />
   </Target>
 

build/test/TestPackageProjects.targets

@@ -76,7 +76,7 @@
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
         <VersionPrefix>$(CliVersionPrefix)-</VersionPrefix>
-        <VersionSuffix>rc3-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(ReleaseSuffix)-$(TestPackageBuildVersionSuffix)</VersionSuffix>
         <Clean>False</Clean>
         <Frameworks>netstandard1.5</Frameworks>
       </BaseTestPackageProject>

build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs

@@ -12,21 +12,21 @@ namespace Microsoft.DotNet.Cli.Build
         [Required]
         public string RepoRoot { get; set; }
 
-        [Output]
+        [Required]
         public int VersionMajor { get; set; }
 
-        [Output]
+        [Required]
         public int VersionMinor { get; set; }
 
-        [Output]
+        [Required]
         public int VersionPatch { get; set; }
 
+        [Required]
+        public string ReleaseSuffix { get; set; }
+
         [Output]
         public string CommitCount { get; set; }
 
-        [Output]
-        public string ReleaseSuffix { get; set; }
-
         [Output]
         public string VersionSuffix { get; set; }
 
@@ -42,41 +42,27 @@ namespace Microsoft.DotNet.Cli.Build
         [Output]
         public string VersionBadgeMoniker { get; set; }
 
-        [Output]
-        public string Channel { get; set; }
-
-        [Output]
-        public string BranchName { get; set; }
-
         private int _commitCount;
 
         public override bool Execute()
         {
             base.Execute();
 
-            var branchInfo = new BranchInfo(RepoRoot);
-
             var buildVersion = new BuildVersion()
             {
-                Major = int.Parse(branchInfo.Entries["MAJOR_VERSION"]),
+                Major = VersionMajor,
-                Minor = int.Parse(branchInfo.Entries["MINOR_VERSION"]),
+                Minor = VersionMinor,
-                Patch = int.Parse(branchInfo.Entries["PATCH_VERSION"]),
+                Patch = VersionPatch,
-                ReleaseSuffix = branchInfo.Entries["RELEASE_SUFFIX"],
+                ReleaseSuffix = ReleaseSuffix,
                 CommitCount = _commitCount
             };
 
-            VersionMajor = buildVersion.Major;
-            VersionMinor = buildVersion.Minor;
-            VersionPatch = buildVersion.Patch;
             CommitCount = buildVersion.CommitCountString;
-            ReleaseSuffix = buildVersion.ReleaseSuffix;
             VersionSuffix = buildVersion.VersionSuffix;
             SimpleVersion = buildVersion.SimpleVersion;
             NugetVersion = buildVersion.NuGetVersion;
             MsiVersion = buildVersion.GenerateMsiVersion();
             VersionBadgeMoniker = Monikers.GetBadgeMoniker();
-            Channel = branchInfo.Entries["CHANNEL"];
-            BranchName= branchInfo.Entries["BRANCH_NAME"];
 
             return true;
         }

build_projects/shared-build-targets-utils/Utils/BranchInfo.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using Microsoft.DotNet.Cli.Build.Framework;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
-
-namespace Microsoft.DotNet.Cli.Build
-{
-    public class BranchInfo
-    {
-        private static readonly string s_branchInfoFileName = "branchinfo.txt";
-
-        private string _repoRoot;
-        private string _branchInfoFile;
-
-        public IDictionary<string, string> Entries { get; set; }
-
-        public BranchInfo(string repoRoot)
-        {
-            _repoRoot = repoRoot;
-            _branchInfoFile = Path.Combine(_repoRoot, s_branchInfoFileName);
-
-            Entries = ReadBranchInfo(_branchInfoFile);
-        }
-
-        private IDictionary<string, string> ReadBranchInfo(string path)
-        {
-            var lines = File.ReadAllLines(path);
-            var dict = new Dictionary<string, string>();
-            foreach (var line in lines)
-            {
-                if (!line.Trim().StartsWith("#") && !string.IsNullOrWhiteSpace(line))
-                {
-                    var splat = line.Split(new[] { '=' }, 2);
-                    dict[splat[0]] = splat[1];
-                }
-            }
-            return dict;
-        }
-    }
-}

build_projects/shared-build-targets-utils/Utils/BuildVersion.cs

@@ -7,7 +7,5 @@ namespace Microsoft.DotNet.Cli.Build
         public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
         public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
         public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
-        public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc3-{CommitCountString}";
-        public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
     }
 }

dir.props

@@ -12,5 +12,13 @@
 
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
 
+    <VersionMajor>2</VersionMajor>
+    <VersionMinor>0</VersionMinor>
+    <VersionPatch>0</VersionPatch>
+    <ReleaseSuffix>alpha</ReleaseSuffix>
+    <Channel>master</Channel>
+    <BranchName>master</BranchName>
+    <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
+
   </PropertyGroup>
 </Project>

run-build.ps1

@@ -40,14 +40,6 @@ else
     $env:DOTNET_BUILD_SKIP_PACKAGING=0
 }
 
-# Load Branch Info
-cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
-    if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) {
-        $splat = $_.Split([char[]]@("="), 2)
-        Set-Content "env:\$($splat[0])" -Value $splat[1]
-    }
-}
-
 # Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
 if (!$env:DOTNET_INSTALL_DIR_PJ)
 {

run-build.sh

@@ -120,14 +120,6 @@ done
 temp="${args[@]}"
 args=($temp)
 
-# Load Branch Info
-while read line; do
-    if [[ $line != \#* ]]; then
-        IFS='=' read -ra splat <<< "$line"
-        export ${splat[0]}="${splat[1]}"
-    fi
-done < "$REPOROOT/branchinfo.txt"
-
 # Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
 [ -z "$DOTNET_INSTALL_DIR_PJ" ] && export DOTNET_INSTALL_DIR_PJ=$REPOROOT/.dotnet_stage0PJ/$ARCHITECTURE
 [ -d "$DOTNET_INSTALL_DIR_PJ" ] || mkdir -p $DOTNET_INSTALL_DIR_PJ

src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj

@@ -3,7 +3,7 @@
   
   <PropertyGroup>
     <Description>Archive and compression types.</Description>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <Description>SLN file reader/writer</Description>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netstandard1.6</TargetFramework>
     <DebugType>portable</DebugType>
     <AssemblyName>Microsoft.DotNet.Cli.Sln.Internal</AssemblyName>

src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-rc3</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netstandard1.5</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <Description>Microsoft.DotNet.TestFramework Class Library</Description>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

src/dotnet/dotnet.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <AssemblyName>dotnet</AssemblyName>
     <OutputType>Exe</OutputType>

src/redist/redist.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.4</PackageTargetFallback>

src/tool_msbuild/tool_msbuild.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>

src/tool_nuget/tool_nuget.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>

src/tool_roslyn/tool_roslyn.csproj

@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>