From a8aea60f1408c9621da4467c876b0ed8563fe35f Mon Sep 17 00:00:00 2001
From: Sridhar Periyasamy <sridhper@microsoft.com>
Date: Wed, 20 Jan 2016 18:49:47 -0800
Subject: [PATCH] Download the stage0 dotnet tools from the beta feed for
 windows.

Set the correct channel so that the stage0 binaries are downloaded
correctly.

** This commit cannot be directly merged from the release branch to the
master branch **
---
 scripts/build/generate-version.ps1 | 3 ++-
 scripts/common/_common.ps1         | 2 ++
 scripts/obtain/install-tools.ps1   | 2 +-
 scripts/obtain/install.ps1         | 4 +++-
 scripts/publish/publish.ps1        | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/build/generate-version.ps1 b/scripts/build/generate-version.ps1
index 0200f51a4..28e49bec2 100644
--- a/scripts/build/generate-version.ps1
+++ b/scripts/build/generate-version.ps1
@@ -3,6 +3,8 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
+. "$PSScriptRoot\..\common\_common.ps1"
+
 # MSI versioning
 # Encode the CLI version to fit into the MSI versioning scheme - https://msdn.microsoft.com/en-us/library/windows/desktop/aa370859(v=vs.85).aspx
 # MSI versions are 3 part
@@ -49,7 +51,6 @@ function GetMSIVersionFromCLIVersion([uint32]$Major, [uint32]$Minor, [uint32]$Pa
     return $MSIVersion
 }
 
-$env:ReleaseSuffix = "beta"
 $env:MajorVersion = 1
 $env:MinorVersion = 0
 $env:PatchVersion = 0
diff --git a/scripts/common/_common.ps1 b/scripts/common/_common.ps1
index 31c3722f9..040c7a40b 100644
--- a/scripts/common/_common.ps1
+++ b/scripts/common/_common.ps1
@@ -15,6 +15,8 @@ $Stage1Dir = "$OutputDir\stage1"
 $Stage2Dir = "$OutputDir\stage2"
 $HostDir = "$OutputDir\corehost"
 $PackageDir = "$RepoRoot\artifacts\packages\dnvm"
+$env:ReleaseSuffix = "beta"
+$env:Channel = "$env:ReleaseSuffix"
 
 # Set reasonable defaults for unset variables
 setEnvIfDefault "DOTNET_INSTALL_DIR"  "$(Convert-Path "$PSScriptRoot\..")\.dotnet_stage0\win7-x64"
diff --git a/scripts/obtain/install-tools.ps1 b/scripts/obtain/install-tools.ps1
index faea84bf4..49f48614d 100644
--- a/scripts/obtain/install-tools.ps1
+++ b/scripts/obtain/install-tools.ps1
@@ -13,7 +13,7 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR))
 
 # Install a stage 0
 header "Installing dotnet stage 0"
-_ "$RepoRoot\scripts\obtain\install.ps1"
+_ "$RepoRoot\scripts\obtain\install.ps1" @("$env:Channel")
 
 # Put stage0 on the PATH
 $env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$env:PATH"
diff --git a/scripts/obtain/install.ps1 b/scripts/obtain/install.ps1
index 2287f3a35..79980ad8c 100644
--- a/scripts/obtain/install.ps1
+++ b/scripts/obtain/install.ps1
@@ -3,11 +3,13 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
+param([string]$Channel="dev")
+
+
 $ErrorActionPreference="Stop"
 $ProgressPreference="SilentlyContinue"
 
 $Feed="https://dotnetcli.blob.core.windows.net/dotnet"
-$Channel="dev"
 $DotNetFileName="dotnet-win-x64.latest.zip"
 $DotNetUrl="$Feed/$Channel/Binaries/Latest"
 
diff --git a/scripts/publish/publish.ps1 b/scripts/publish/publish.ps1
index e0ac07b1a..6848356cd 100644
--- a/scripts/publish/publish.ps1
+++ b/scripts/publish/publish.ps1
@@ -7,6 +7,8 @@ param(
     [Parameter(Mandatory=$true)][string]$file
 )
 
+. "$PSScriptRoot\..\common\_common.ps1"
+
 function CheckRequiredVariables 
 {
     if([string]::IsNullOrEmpty($env:DOTNET_CLI_VERSION))