Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Merge in 'release/2.1' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Jun 18, 2020
2 parents bc34580 + 4f47544 commit 0232dc2
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
"type": "TfsGit",
"name": "DotNet-CoreFX-Trusted",
"url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreFX-Trusted",
"defaultBranch": "refs/heads/master",
"defaultBranch": "refs/heads/release/2.1",
"clean": "false",
"checkoutSubmodules": false
},
Expand Down
2 changes: 1 addition & 1 deletion buildpipeline/DotNet-CoreFx-Trusted-Linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@
"type": "TfsGit",
"name": "DotNet-CoreFX-Trusted",
"url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreFX-Trusted",
"defaultBranch": "refs/heads/master",
"defaultBranch": "refs/heads/release/2.1",
"clean": "false",
"checkoutSubmodules": false
},
Expand Down
2 changes: 1 addition & 1 deletion buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@
"isSecret": true
},
"PB_SourceBranch": {
"value": "master",
"value": "release/2.1",
"allowOverride": true
},
"PB_Git": {
Expand Down
2 changes: 1 addition & 1 deletion buildpipeline/DotNet-CoreFx-Trusted-Windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
"value": "win10"
},
"PB_SourceBranch": {
"value": "master",
"value": "release/2.1",
"allowOverride": true
},
"PB_SyncArguments": {
Expand Down
4 changes: 2 additions & 2 deletions buildpipeline/DotNet-Trusted-Publish-Symbols.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@
"allowOverride": true
},
"SourceVersion": {
"value": "master",
"value": "release/2.1",
"allowOverride": true
},
"SourceBranch": {
"value": "master",
"value": "release/2.1",
"allowOverride": true
},
"FeedPublishArguments": {
Expand Down
4 changes: 2 additions & 2 deletions buildpipeline/DotNet-Trusted-Publish.json
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,11 @@
"allowOverride": true
},
"SourceVersion": {
"value": "master",
"value": "release/2.1",
"allowOverride": true
},
"SourceBranch": {
"value": "master",
"value": "release/2.1",
"allowOverride": true
},
"FeedPublishArguments": {
Expand Down
4 changes: 2 additions & 2 deletions buildpipeline/DotNet-Trusted-Tests-Publish.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@
"type": "TfsGit",
"name": "DotNet-CoreFX-Trusted",
"url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreFX-Trusted",
"defaultBranch": "refs/heads/master",
"defaultBranch": "refs/heads/release/2.1",
"clean": "true",
"checkoutSubmodules": false
},
"quality": "definition",
"defaultBranch": "refs/heads/master",
"defaultBranch": "refs/heads/release/2.1",
"queue": {
"pool": {
"id": 39,
Expand Down

0 comments on commit 0232dc2

Please sign in to comment.