diff --git a/branchinfo.txt b/branchinfo.txt index 7ac005498..63cf71251 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,4 +4,5 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=0 -RELEASE_SUFFIX=beta +RELEASE_SUFFIX=rc2 +CHANNEL=beta diff --git a/scripts/run-build.ps1 b/scripts/run-build.ps1 index e75741858..8b9141f8b 100644 --- a/scripts/run-build.ps1 +++ b/scripts/run-build.ps1 @@ -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 if (!$env:DOTNET_INSTALL_DIR) { diff --git a/scripts/run-build.sh b/scripts/run-build.sh index 175cc10ea..4daa328a3 100755 --- a/scripts/run-build.sh +++ b/scripts/run-build.sh @@ -84,8 +84,6 @@ done < "$DIR/../branchinfo.txt" [ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$DIR/../.dotnet_stage0/$(uname) [ -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 # Put stage 0 on the PATH (for this shell only)