diff --git a/.appveyor.yml b/.appveyor.yml index 2bc93c45a8..2b99c7fb7e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,20 +8,20 @@ init: - 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 b4708cadc2..edb736edd6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,50 +4,51 @@ 0.10.13 - 2.2.0-preview2-20181011.10 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 0.6.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 + 3.0.0-alpha1-20181011.11 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 0.7.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 15.6.82 15.6.82 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 - 2.2.0-preview3-35496 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 2.0.9 2.1.3 - 2.2.0-preview3-27008-03 + 2.2.0-preview2-26905-02 1.0.1 - 2.2.0-preview3-35496 + 3.0.0-alpha1-10620 15.6.1 11.1.0 2.0.3 - 4.5.0 - 4.5.0 - 4.5.2 - 4.5.1 - 4.5.1 - 4.5.0 - 4.5.1 - 4.5.0 - 4.5.0 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26717-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 9.0.1 2.3.1 2.4.0 diff --git a/build/repo.props b/build/repo.props index 77073056a2..a0d69a9923 100644 --- a/build/repo.props +++ b/build/repo.props @@ -16,7 +16,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 e3cc145b03..27b605e3c6 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181016.3 -commithash:17ee7986dbe75408d9e4efd94eab1003adcc3ad7 +version:3.0.0-alpha1-20181011.11 +commithash:f57aa8ddda0abdd74ada55853587bedb4f364065 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/version.props b/version.props index 6ccce8b1c1..4c37bb8777 100644 --- a/version.props +++ b/version.props @@ -1,13 +1,13 @@  - 2 - 2 + 3 + 0 0 $(DotNetMajorVersion).$(DotNetMinorVersion).$(DotNetPatchVersion) - 12 + 13 $(DotNetMinorVersion) $(DotNetPatchVersion) - rtm + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000