diff --git a/.appveyor.yml b/.appveyor.yml index 711303fa0f..018881c604 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 e75fe73221..d56301c453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ os: osx_image: xcode8.2 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 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/BasicApi/benchmarks.json b/benchmarkapps/BasicApi/benchmarks.json index 7b64057987..4a99d0bbd3 100644 --- a/benchmarkapps/BasicApi/benchmarks.json +++ b/benchmarkapps/BasicApi/benchmarks.json @@ -7,7 +7,7 @@ "PresetHeaders": "Json", "ReadyStateText": "Application started.", "Source": { - "BranchOrCommit": "release/2.2", + "BranchOrCommit": "dev", "Project": "benchmarkapps/BasicApi/BasicApi.csproj", "Repository": "https://github.com/aspnet/mvc.git" } @@ -19,20 +19,20 @@ }, "BasicApi.GetUsingQueryString": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/release/2.2/benchmarkapps/BasicApi/getWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/dev/benchmarkapps/BasicApi/getWithToken.lua" }, "Path": "/pet/findByStatus", "Query": "?status=available" }, "BasicApi.GetUsingRouteValue": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/release/2.2/benchmarkapps/BasicApi/getWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/dev/benchmarkapps/BasicApi/getWithToken.lua" }, "Path": "/pet/-1" }, "BasicApi.GetUsingRouteValueWithoutAuthorization": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/release/2.2/benchmarkapps/BasicApi/getWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/dev/benchmarkapps/BasicApi/getWithToken.lua" }, "Path": "/pet/anonymous/-1" }, @@ -41,7 +41,7 @@ }, "BasicApi.Post": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/release/2.2/benchmarkapps/BasicApi/postJsonWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/dev/benchmarkapps/BasicApi/postJsonWithToken.lua" }, "Path": "/pet" } diff --git a/benchmarkapps/BasicViews/benchmarks.json b/benchmarkapps/BasicViews/benchmarks.json index 6a50d9386d..82e0812a21 100644 --- a/benchmarkapps/BasicViews/benchmarks.json +++ b/benchmarkapps/BasicViews/benchmarks.json @@ -7,7 +7,7 @@ "PresetHeaders": "Html", "ReadyStateText": "Application started.", "Source": { - "BranchOrCommit": "release/2.2", + "BranchOrCommit": "dev", "Project": "benchmarkapps/BasicViews/BasicViews.csproj", "Repository": "https://github.com/aspnet/mvc.git" } @@ -20,19 +20,19 @@ }, "BasicViews.Post": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/release/2.2/benchmarkapps/BasicViews/postWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/dev/benchmarkapps/BasicViews/postWithToken.lua" }, "Path": "/Home/Index" }, "BasicViews.PostIgnoringToken": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/release/2.2/benchmarkapps/BasicViews/postWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/dev/benchmarkapps/BasicViews/postWithToken.lua" }, "Path": "/Home/IndexWithoutToken" }, "BasicViews.PostWithoutToken": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/release/2.2/benchmarkapps/BasicViews/post.lua" + "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/dev/benchmarkapps/BasicViews/post.lua" }, "Path": "/Home/IndexWithoutToken" } diff --git a/build/dependencies.props b/build/dependencies.props index 9fc6186a0c..cd3ad2ce1b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -16,94 +16,94 @@ 0.42.1 2.1.0 2.1.0-rc1-final - 2.2.0-preview1-34816 - 2.2.0-preview1-17099 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-a-preview1-action-constraints-come-home-16802 - 2.2.0-a-preview1-action-constraints-come-home-16802 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10011 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-a-alpha1-master-action-constraints-come-home-16807 + 3.0.0-a-alpha1-master-action-constraints-come-home-16807 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 5.2.6 2.8.0 2.8.0 - 2.2.0-preview1-34816 + 3.0.0-alpha1-10146 1.7.0 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.1.0 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-preview1-26724-02 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34816 - 2.2.0-preview1-34816 + 3.0.0-alpha1-10146 + 3.0.0-alpha1-10146 15.6.1 4.7.49 2.0.3 1.0.1 - 4.5.0 - 4.5.0 - 4.5.1 + 4.6.0-preview1-26724-01 + 4.6.0-preview1-26724-01 + 4.6.0-preview1-26724-01 0.9.0 2.3.1 2.4.0-rc.1.build4038 diff --git a/build/repo.props b/build/repo.props index 3bd17f1b84..8156b45eaf 100644 --- a/build/repo.props +++ b/build/repo.props @@ -14,7 +14,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 27e2e80f9a..9a67ee9c28 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-10011 +commithash:717c2eb1f91dafd2580c1a9b8e5064d12dd8c054 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 4d7257694d..575dd6248e 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@  - 2.2.0 - preview1 + 3.0.0 + alpha1 t000 a- @@ -10,8 +10,8 @@ $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) $(VersionSuffix)-$(BuildNumber) - 0.2.0 - preview1 + 0.3.0 + alpha1 $(ExperimentalVersionPrefix) $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final