diff --git a/.appveyor.yml b/.appveyor.yml index f46dcc270f..147e309707 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,21 +1,21 @@ init: - - git config --global core.autocrlf true +- git config --global core.autocrlf true branches: only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ + - master + - /^release\/.*$/ + - /^(.*\/)?ci-.*$/ install: - - ps: .\tools\update_schema.ps1 - - git submodule update --init --recursive - - net start w3svc +- ps: .\tools\update_schema.ps1 +- git submodule update --init --recursive +- net start w3svc build_script: - - ps: .\run.ps1 default-build +- ps: .\run.ps1 default-build clone_depth: 1 environment: global: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: off -deploy: off +test: 'off' +deploy: 'off' os: Visual Studio 2017 diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml index 260baf4536..f0b1d1573d 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: ../templates/build-steps.yml diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml index 0ed1a241ab..448a5ed56d 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: ../templates/build-steps.yml diff --git a/build/dependencies.props b/build/dependencies.props index a181793011..b23adbabd4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,49 +4,49 @@ 0.10.13 - 2.2.0-preview1-17099 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 0.6.0-a-preview1-test-application-17108 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 + 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 + 0.7.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 15.6.82 15.6.82 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 + 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 1.0.1 - 2.2.0-preview1-34825 + 3.0.0-alpha1-10173 15.6.1 11.1.0 2.0.3 - 4.5.0 - 4.5.0 - 4.5.0 - 4.5.1 - 4.5.1 - 4.5.0 - 4.5.1 - 4.5.0 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26717-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 9.0.1 2.3.1 2.4.0 diff --git a/build/repo.props b/build/repo.props index ba3cca9388..1323b23e8d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -15,7 +15,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 28cd6a5b03..8c70cbad9f 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 2624779e51..b76e84272b 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { - "$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", "toolsets": { "visualstudio": { "required": ["Windows"], 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 5055696e1c..e37dbcf611 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@  - 2.2.0 - preview1 + 3.0.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000