mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Download the stage0 dotnet tools from the beta feed for windows.

Browse source 
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 **
This commit is contained in:
Sridhar Periyasamy 2016-01-20 18:49:47 -08:00
parent 7555793363
commit a8aea60f14
5 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/build/generate-version.ps1
View file

@ -3,6 +3,8 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information. # Licensed under the MIT license. See LICENSE file in the project root for full license information.
# #
. "$PSScriptRoot\..\common\_common.ps1"
# MSI versioning # 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 # 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 # MSI versions are 3 part
@ -49,7 +51,6 @@ function GetMSIVersionFromCLIVersion([uint32]$Major, [uint32]$Minor, [uint32]$Pa
return $MSIVersion return $MSIVersion
} }
$env:ReleaseSuffix = "beta"
$env:MajorVersion = 1 $env:MajorVersion = 1
$env:MinorVersion = 0 $env:MinorVersion = 0
$env:PatchVersion = 0 $env:PatchVersion = 0

2
scripts/common/_common.ps1
View file

@ -15,6 +15,8 @@ $Stage1Dir = "$OutputDir\stage1"
$Stage2Dir = "$OutputDir\stage2" $Stage2Dir = "$OutputDir\stage2"
$HostDir = "$OutputDir\corehost" $HostDir = "$OutputDir\corehost"
$PackageDir = "$RepoRoot\artifacts\packages\dnvm" $PackageDir = "$RepoRoot\artifacts\packages\dnvm"
$env:ReleaseSuffix = "beta"
$env:Channel = "$env:ReleaseSuffix"
# Set reasonable defaults for unset variables # Set reasonable defaults for unset variables
setEnvIfDefault "DOTNET_INSTALL_DIR" "$(Convert-Path "$PSScriptRoot\..")\.dotnet_stage0\win7-x64" setEnvIfDefault "DOTNET_INSTALL_DIR" "$(Convert-Path "$PSScriptRoot\..")\.dotnet_stage0\win7-x64"

2
scripts/obtain/install-tools.ps1
View file

@ -13,7 +13,7 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR))
# Install a stage 0 # Install a stage 0
header "Installing dotnet stage 0" header "Installing dotnet stage 0"
_ "$RepoRoot\scripts\obtain\install.ps1" _ "$RepoRoot\scripts\obtain\install.ps1" @("$env:Channel")
# Put stage0 on the PATH # Put stage0 on the PATH
$env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$env:PATH" $env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$env:PATH"

4
scripts/obtain/install.ps1
View file

@ -3,11 +3,13 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information. # Licensed under the MIT license. See LICENSE file in the project root for full license information.
# #
param([string]$Channel="dev")
$ErrorActionPreference="Stop" $ErrorActionPreference="Stop"
$ProgressPreference="SilentlyContinue" $ProgressPreference="SilentlyContinue"
$Feed="https://dotnetcli.blob.core.windows.net/dotnet" $Feed="https://dotnetcli.blob.core.windows.net/dotnet"
$Channel="dev"
$DotNetFileName="dotnet-win-x64.latest.zip" $DotNetFileName="dotnet-win-x64.latest.zip"
$DotNetUrl="$Feed/$Channel/Binaries/Latest" $DotNetUrl="$Feed/$Channel/Binaries/Latest"

2
scripts/publish/publish.ps1
View file

@ -7,6 +7,8 @@ param(
[Parameter(Mandatory=$true)][string]$file [Parameter(Mandatory=$true)][string]$file
) )
. "$PSScriptRoot\..\common\_common.ps1"
function CheckRequiredVariables function CheckRequiredVariables
{ {
if([string]::IsNullOrEmpty($env:DOTNET_CLI_VERSION)) if([string]::IsNullOrEmpty($env:DOTNET_CLI_VERSION))