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 f5087d9c30..507c89b025 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/project-ci.yml@buildtools diff --git a/benchmarkapps/PlatformBenchmarks/benchmarks.json.json b/benchmarkapps/PlatformBenchmarks/benchmarks.json.json index 9ae9f4836f..157cee28dc 100644 --- a/benchmarkapps/PlatformBenchmarks/benchmarks.json.json +++ b/benchmarkapps/PlatformBenchmarks/benchmarks.json.json @@ -5,11 +5,11 @@ "Source": { "Repository": "https://github.com/aspnet/KestrelHttpServer.git", - "BranchOrCommit": "release/2.2", + "BranchOrCommit": "dev", "Project": "benchmarkapps/PlatformBenchmarks/PlatformBenchmarks.csproj" } }, "JsonPlatform": { "Path": "/json" } -} +} \ No newline at end of file diff --git a/benchmarkapps/PlatformBenchmarks/benchmarks.plaintext.json b/benchmarkapps/PlatformBenchmarks/benchmarks.plaintext.json index 78a3fc1b6e..5ad58aee15 100644 --- a/benchmarkapps/PlatformBenchmarks/benchmarks.plaintext.json +++ b/benchmarkapps/PlatformBenchmarks/benchmarks.plaintext.json @@ -8,7 +8,7 @@ }, "Source": { "Repository": "https://github.com/aspnet/KestrelHttpServer.git", - "BranchOrCommit": "release/2.2", + "BranchOrCommit": "dev", "Project": "benchmarkapps/PlatformBenchmarks/PlatformBenchmarks.csproj" }, "Port": 8080 diff --git a/build/dependencies.props b/build/dependencies.props index 9102dfd47a..ba2ae0b0d8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,49 +5,49 @@ 0.10.13 - 2.2.0-preview1-34694 - 2.2.0-preview1-17099 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10009 1.10.0 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 2.1.1 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34694 + 3.0.0-alpha1-10081 15.6.1 4.7.49 2.0.3 11.0.2 - 4.5.0 - 4.5.0 - 4.5.1 - 4.5.0 - 4.5.0 - 4.5.1 - 4.5.0 - 4.5.1 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 1.3.7 0.9.0 2.3.1 diff --git a/build/repo.props b/build/repo.props index cd93ea9da1..fb1ef593d7 100644 --- a/build/repo.props +++ b/build/repo.props @@ -5,7 +5,6 @@ true 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 27e2e80f9a..4db537685b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17099 -commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 +version:3.0.0-alpha1-10009 +commithash:86be4707e47d2f1930a982f2b59eacfc4196da33 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 bebad1de91..71a78cddd8 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@  - 2.2.0 - preview1 + 3.0.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000