Merge pull request #2325 from dotnet/piotrpMSFT/Issue2288/Beta2RC2
Moves version suffix from beta to rc2
This commit is contained in:
commit
b9d6a0c911
3 changed files with 2 additions and 5 deletions
|
@ -4,4 +4,5 @@
|
||||||
MAJOR_VERSION=1
|
MAJOR_VERSION=1
|
||||||
MINOR_VERSION=0
|
MINOR_VERSION=0
|
||||||
PATCH_VERSION=0
|
PATCH_VERSION=0
|
||||||
RELEASE_SUFFIX=beta
|
RELEASE_SUFFIX=rc2
|
||||||
|
CHANNEL=beta
|
||||||
|
|
|
@ -49,8 +49,6 @@ cat "$PSScriptRoot\..\branchinfo.txt" | ForEach-Object {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$env:CHANNEL=$env:RELEASE_SUFFIX
|
|
||||||
|
|
||||||
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
|
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
|
||||||
if (!$env:DOTNET_INSTALL_DIR)
|
if (!$env:DOTNET_INSTALL_DIR)
|
||||||
{
|
{
|
||||||
|
|
|
@ -84,8 +84,6 @@ done < "$DIR/../branchinfo.txt"
|
||||||
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$DIR/../.dotnet_stage0/$(uname)
|
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$DIR/../.dotnet_stage0/$(uname)
|
||||||
[ -d $DOTNET_INSTALL_DIR ] || mkdir -p $DOTNET_INSTALL_DIR
|
[ -d $DOTNET_INSTALL_DIR ] || mkdir -p $DOTNET_INSTALL_DIR
|
||||||
|
|
||||||
# Ensure the latest stage0 is installed
|
|
||||||
export CHANNEL=$RELEASE_SUFFIX
|
|
||||||
$DIR/obtain/install.sh --channel $CHANNEL --verbose
|
$DIR/obtain/install.sh --channel $CHANNEL --verbose
|
||||||
|
|
||||||
# Put stage 0 on the PATH (for this shell only)
|
# Put stage 0 on the PATH (for this shell only)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue