diff --git a/.appveyor.yml b/.appveyor.yml
index 4eea96ab69..d45bd5a1f8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,7 +2,7 @@ init:
- git config --global core.autocrlf true
branches:
only:
- - dev
+ - master
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
build_script:
diff --git a/.travis.yml b/.travis.yml
index 64bdbb4441..ab3980055c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ addons:
- libunwind8
branches:
only:
- - dev
+ - master
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
before_install:
diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
index dc7b8a3cb9..c2c5336fd0 100644
--- a/.vsts-pipelines/builds/ci-internal.yml
+++ b/.vsts-pipelines/builds/ci-internal.yml
@@ -7,7 +7,7 @@ resources:
- repository: buildtools
type: git
name: aspnet-BuildTools
- ref: refs/heads/release/2.2
+ ref: refs/heads/master
phases:
- template: .vsts-pipelines/templates/project-ci.yml@buildtools
diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
index b37fbf760f..4a7bb79066 100644
--- a/.vsts-pipelines/builds/ci-public.yml
+++ b/.vsts-pipelines/builds/ci-public.yml
@@ -9,7 +9,7 @@ resources:
type: github
endpoint: DotNet-Bot GitHub Connection
name: aspnet/BuildTools
- ref: refs/heads/release/2.2
+ ref: refs/heads/master
phases:
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 64ff041d5c..eac4268e4c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
Contributing
======
-Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo.
+Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo.
diff --git a/build/dependencies.props b/build/dependencies.props
index 7ef83bd4d7..845b6b06cc 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,32 +3,32 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.2.0-preview1-17102
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
- 2.2.0-preview1-34823
+ 3.0.0-alpha1-10015
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
+ 3.0.0-alpha1-10173
2.0.9
2.1.2
2.2.0-preview1-26618-02
@@ -36,8 +36,8 @@
4.7.49
2.0.3
11.0.2
- 4.5.0
- 1.6.0
+ 4.6.0-preview1-26727-04
+ 1.7.0-preview1-26727-04
2.3.1
2.4.0
diff --git a/build/repo.props b/build/repo.props
index 22d6024b50..4a805f4722 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -7,7 +7,6 @@
Internal.AspNetCore.Universe.Lineup
- 2.2.0-*
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 6b8da29e6b..1e75dc3a23 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.0-preview1-17102
-commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9
+version:3.0.0-alpha1-10015
+commithash:3f36e5c2f061712f76f2766c435d2555681d5c55
diff --git a/korebuild.json b/korebuild.json
index d217d06e3e..8a276a7f35 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,4 +1,4 @@
{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json",
- "channel": "release/2.2"
+ "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+ "channel": "master"
}
diff --git a/run.ps1 b/run.ps1
index 3b27382468..34604c7175 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/dev/tools/korebuild.schema.json",
- "channel": "dev",
+ "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+ "channel": "master",
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
}
```
@@ -192,7 +192,7 @@ if (!$DotNetHome) {
else { Join-Path $PSScriptRoot '.dotnet'}
}
-if (!$Channel) { $Channel = 'dev' }
+if (!$Channel) { $Channel = 'master' }
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
# Execute
diff --git a/run.sh b/run.sh
index 02aac15874..61f7a53385 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='dev'
+[ -z "$channel" ] && channel='master'
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
get_korebuild
diff --git a/version.props b/version.props
index 8e872d018e..3cba6cd9d8 100644
--- a/version.props
+++ b/version.props
@@ -1,7 +1,7 @@
-
+
- 2.2.0
- preview1
+ 3.0.0
+ alpha1
$(VersionPrefix)
$(VersionPrefix)-$(VersionSuffix)-final
t000
@@ -9,8 +9,8 @@
$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))
$(VersionSuffix)-$(BuildNumber)
- 0.5.0
- preview1
+ 0.6.0
+ alpha1
$(ExperimentalVersionPrefix)
$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final
$(ExperimentalVersionSuffix)-$(BuildNumber)