| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102 |
- commit bcc9bce87b462f63362b1915d7c831790a3ca6e7
- Author: Nate McMaster <[email protected]>
- Date: Thu Jun 28 16:20:37 2018 -0700
- Update infrastructure for the 2.2 release
- diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
- index d7ceb763786..dc7b8a3cb92 100644
- --- a/.vsts-pipelines/builds/ci-internal.yml
- +++ b/.vsts-pipelines/builds/ci-internal.yml
- @@ -1,5 +1,5 @@
- trigger:
- -- dev
- +- master
- - release/*
-
- resources:
- @@ -7,7 +7,7 @@ resources:
- - repository: buildtools
- type: git
- name: aspnet-BuildTools
- - ref: refs/heads/dev
- + ref: refs/heads/release/2.2
-
- 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 b7f25723f8b..f5087d9c309 100644
- --- a/.vsts-pipelines/builds/ci-public.yml
- +++ b/.vsts-pipelines/builds/ci-public.yml
- @@ -1,5 +1,5 @@
- trigger:
- -- dev
- +- master
- - release/*
-
- # See https://github.com/aspnet/BuildTools
- @@ -9,7 +9,7 @@ resources:
- type: github
- endpoint: DotNet-Bot GitHub Connection
- name: aspnet/BuildTools
- - ref: refs/heads/dev
- -
- + ref: refs/heads/release/2.2
- +
- phases:
- - template: .vsts-pipelines/templates/project-ci.yml@buildtools
- diff --git a/benchmarkapps/PlatformBenchmarks/benchmarks.json.json b/benchmarkapps/PlatformBenchmarks/benchmarks.json.json
- index 157cee28dc3..9ae9f4836fc 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": "dev",
- + "BranchOrCommit": "release/2.2",
- "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 5ad58aee151..78a3fc1b6e2 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": "dev",
- + "BranchOrCommit": "release/2.2",
- "Project": "benchmarkapps/PlatformBenchmarks/PlatformBenchmarks.csproj"
- },
- "Port": 8080
- diff --git a/build/repo.props b/build/repo.props
- index fb1ef593d71..cd93ea9da13 100644
- --- a/build/repo.props
- +++ b/build/repo.props
- @@ -5,6 +5,7 @@
- <EnableBenchmarkValidation>true</EnableBenchmarkValidation>
- <!-- These properties are use by the automation that updates dependencies.props -->
- <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
- + <LineupPackageVersion>2.2.0-*</LineupPackageVersion>
- <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
- </PropertyGroup>
-
- diff --git a/korebuild.json b/korebuild.json
- index bd5d51a51b0..d217d06e3e4 100644
- --- a/korebuild.json
- +++ b/korebuild.json
- @@ -1,4 +1,4 @@
- {
- - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
- - "channel": "dev"
- + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json",
- + "channel": "release/2.2"
- }
|
