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

Merge pull request #935 from Sridhar-MS/beta-channel

Browse source 
Download the stage0 dotnet tools from the beta feed.
This commit is contained in:
Sridhar Periyasamy 2016-01-21 12:02:19 -08:00
commit 0cb495f356
10 changed files with 19 additions and 9 deletions
Show stats 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.
#
. "$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

1
scripts/build/generate-version.sh
View file

@ -4,7 +4,6 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
export RELEASE_SUFFIX=beta
export MAJOR_VERSION=1
export MINOR_VERSION=0
export PATCH_VERSION=0

2
scripts/common/_common.ps1
View file

@ -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"

2
scripts/common/_common.sh
View file

@ -23,6 +23,8 @@ export DNX_ROOT=$DNX_DIR/bin
export STAGE1_DIR=$OUTPUT_ROOT/stage1
export STAGE2_DIR=$OUTPUT_ROOT/stage2
export HOST_DIR=$OUTPUT_ROOT/corehost
export RELEASE_SUFFIX=beta
export CHANNEL=$RELEASE_SUFFIX
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$RID
[ -z "$DOTNET_CLI_VERSION" ] && export DOTNET_CLI_VERSION=0.1.0.0

2
scripts/compile/compile-stage.sh
View file

@ -118,4 +118,4 @@ fi
# Stamp the output with the commit metadata
COMMIT=$(git rev-parse HEAD)
echo $COMMIT > $OUTPUT_DIR/.version
echo $DOTNET_BUILD_VERSION >> $OUTPUT_DIR/.version
echo $DOTNET_CLI_VERSION >> $OUTPUT_DIR/.version

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

@ -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"

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.
#
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"

6
scripts/obtain/install.sh
View file

@ -54,6 +54,8 @@ exec "$MY_TARGET" "$@"
EOF
)
[ -z "$CHANNEL" ] && CHANNEL="dev"
#set default prefix (PREFIX is a fairly standard env-var, but we also want to allow the use the specific "DOTNET_INSTALL_DIR" one)
if [ ! -z "$DOTNET_INSTALL_DIR" ]; then
PREFIX=$DOTNET_INSTALL_DIR
@ -171,13 +173,13 @@ install_dotnet()
fi
local os=$(current_os)
local installLocation="$PREFIX/share/dotnet"
local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/Latest"
local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/Latest"
local dotnet_filename="dotnet-$os-x64.latest.tar.gz"
if [ "$RELINK" = "0" ]; then
if [ "$FORCE" = "0" ]; then
# Check if we need to bother
local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/dev/dnvm/latest.$os.version)"
local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/dnvm/latest.$os.version)"
[ $? != 0 ] && say_err "Unable to determine latest version." && return 1
local remoteVersion=$(IFS="\n" && echo $remoteData | tail -n 1)

4
scripts/package/package-debian.sh
View file

@ -35,7 +35,7 @@ MANPAGE_DIR="$REPOROOT/Documentation/manpages"
NIGHTLY_PACKAGE_NAME="dotnet-nightly"
RELEASE_PACKAGE_NAME="dotnet"
[ -z "$RELEASE_SUFFIX" ] && RELEASE_SUFFIX="dev"
[ -z "$CHANNEL" ] && CHANNEL="dev"
execute_build(){
determine_package_name
@ -97,7 +97,7 @@ test_debian_package(){
header "Testing debian package"
# Set LAST_VERSION_URL to enable upgrade tests
export LAST_VERSION_URL="https://dotnetcli.blob.core.windows.net/dotnet/$RELEASE_SUFFIX/Installers/Latest/dotnet-ubuntu-x64.latest.deb"
export LAST_VERSION_URL="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Installers/Latest/dotnet-ubuntu-x64.latest.deb"
rm -rf $TEST_STAGE_DIR
git clone https://github.com/sstephenson/bats.git $TEST_STAGE_DIR

2
scripts/publish/publish.ps1
View file

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