From ee0a25e618bc6fccb89a38f4687b72003f8fc303 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Aug 2018 16:09:31 -0700 Subject: [PATCH 1/2] Revert "Bumping version from 2.2.0 to 3.0.0" This reverts commit b005ef7831eb511ad5ad960546f2077f1fac7f9a. --- version.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/version.props b/version.props index 3cba6cd9d8..8e872d018e 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - + - 3.0.0 - alpha1 + 2.2.0 + preview1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 @@ -9,8 +9,8 @@ $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) $(VersionSuffix)-$(BuildNumber) - 0.6.0 - alpha1 + 0.5.0 + preview1 $(ExperimentalVersionPrefix) $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final $(ExperimentalVersionSuffix)-$(BuildNumber) From 1b8b581aaefdef09f5200bbaf7b3bf35f989933d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Aug 2018 16:09:36 -0700 Subject: [PATCH 2/2] Revert "[automated] Change default branch to master" This reverts commit 32a08fea5d9856bcdcd7a9bd532bd2f196646310. --- .appveyor.yml | 2 +- .travis.yml | 2 +- run.ps1 | 6 +++--- run.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d45bd5a1f8..4eea96ab69 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,7 +2,7 @@ init: - git config --global core.autocrlf true branches: only: - - master + - dev - /^release\/.*$/ - /^(.*\/)?ci-.*$/ build_script: diff --git a/.travis.yml b/.travis.yml index ab3980055c..64bdbb4441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ addons: - libunwind8 branches: only: - - master + - dev - /^release\/.*$/ - /^(.*\/)?ci-.*$/ before_install: diff --git a/run.ps1 b/run.ps1 index 34604c7175..3b27382468 100644 --- a/run.ps1 +++ b/run.ps1 @@ -52,8 +52,8 @@ in the file are overridden by command line parameters. Example config file: ```json { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", + "channel": "dev", "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" } ``` @@ -192,7 +192,7 @@ if (!$DotNetHome) { else { Join-Path $PSScriptRoot '.dotnet'} } -if (!$Channel) { $Channel = 'master' } +if (!$Channel) { $Channel = 'dev' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } # Execute diff --git a/run.sh b/run.sh index 61f7a53385..02aac15874 100755 --- a/run.sh +++ b/run.sh @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" fi -[ -z "$channel" ] && channel='master' +[ -z "$channel" ] && channel='dev' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild