[automated] Merge branch 'release/3.0' => 'release/3.1' #1326

dotnet-maestro-bot · 2019-10-20T04:24:28Z

I detected changes in the release/3.0 branch which have not been merged yet to release/3.1. I'm a robot and am configured to help you automatically keep release/3.1 up to date, so I've opened this PR.

This PR merges commits made on release/3.0 by the following committers:

@dotnet-maestro[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/3.0
git pull --ff-only
git checkout release/3.1
git pull --ff-only
git merge --no-ff release/3.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/source-build HEAD:merge/release/3.0-to-release/3.1

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/source-build HEAD:merge/release/3.0-to-release/3.1

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.0-to-release/3.1'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/3.0-to-release/3.1 release/3.1
git pull https://github.com/dotnet-maestro-bot/source-build merge/release/3.0-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/source-build HEAD:merge/release/3.0-to-release/3.1

or if you are using SSH

git checkout -b merge/release/3.0-to-release/3.1 release/3.1
git pull [email protected]:dotnet-maestro-bot/source-build merge/release/3.0-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/source-build HEAD:merge/release/3.0-to-release/3.1

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

…packages (dotnet#1325) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191017.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19517.1 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Revert changes

* directly call darc-init * add runtime to support darc, add tools-path, remove un-needed projects * Use the latest darc version * remove darc and dependent stuff from tarball * remove extra stuff from tarball * add environment ld_path to build tarball * add darcVersion to tarball

dotnet-maestro-bot · 2019-10-21T15:19:51Z

This pull request has been updated.

This PR merges commits made on release/3.0 by the following committers:

@adaggarwal
@dotnet-maestro[bot]

dotnet-maestro-bot · 2019-10-23T17:56:01Z

This pull request has been updated.

This PR merges commits made on release/3.0 by the following committers:

…packages (dotnet#1327) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191023.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19523.1 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191023.2 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19523.2 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Undo changes in non ref-pack projects

dotnet-maestro-bot · 2019-10-23T22:35:33Z

This pull request has been updated.

This PR merges commits made on release/3.0 by the following committers:

* Switch to PROD pool * Update matrix.yml

…into release/3.0

* Add patches to fix Arcade prebuilts * A couple more patch changes * Update online baseline * One more osx specific baseline update

…packages (dotnet#1328) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191023.3 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19523.3 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191024.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19524.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191024.2 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19524.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191024.3 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19524.3 * rollback to original versions for non sb-ref-pack projects

…into release/3.0

* Set BuildAllPackages in corefx Update corefx project to set property to build all packages. After the merge of dotnet#1237, corefx in source-build stopped building all packages. With the latest update to corefx brought in by dotnet#1237, building all packages is gated by the BuildAllPackages property here: https://github.com/dotnet/corefx/blob/c1778515a3bee34cc09c757b5563d0af0c8b1e99/src/packages.builds#L8-L12 * Fix BuildAllPackages...should be true

…1335) * Add patch to use non-portable NETCoreAppRuntime for crossgen * Don't update RID when on OSX

dotnet-maestro-bot · 2019-11-01T01:11:32Z

This pull request has been updated.

This PR merges commits made on release/3.0 by the following committers:

adaggarwal · 2019-11-18T22:38:22Z

/azp run

azure-pipelines · 2019-11-18T22:38:27Z

Pull request contains merge conflicts.

eng/Version.Details.xml

dseefeld

I'm not sure we should merge this change as it's going backwards.

adaggarwal and others added 21 commits October 15, 2019 15:48

directly call darc-init

c995613

add runtime to support darc, add tools-path, remove un-needed projects

708d09f

Use the latest darc version

aa93577

wip

4dc1272

remove darc and dependent stuff from tarball

55be598

test: experimental

a5aa9df

test: experimental

b8ecf18

remove extra stuff from tarball

0cf3b27

wip

c35ad46

update to fedora30

e181585

wip

1114df3

wip

b0e3e7c

wip

7f298e6

wip

aed09a6

add environment ld_path to build tarball

5904e1d

code review resolve

3fd9230

code review resolve

06e57f1

code review resolve

0c2cdc6

add darcVersion to tarball

1ba1c55

Patch update 2019-10-23.

be813df

NikolaMilosavljevic and others added 4 commits October 24, 2019 06:25

Switch to PROD pool (dotnet#1257)

9dd007e

* Switch to PROD pool * Update matrix.yml

Patch status update 2019-10-24.

9d0ba1c

Merge branch 'release/3.0' of https://github.com/dotnet/source-build …

6c62990

…into release/3.0

Add patches to fix Arcade prebuilts (dotnet#1331)

07303a5

* Add patches to fix Arcade prebuilts * A couple more patch changes * Update online baseline * One more osx specific baseline update

dotnet-maestro bot and others added 5 commits October 25, 2019 10:15

Merge branch 'release/3.0' of https://github.com/dotnet/source-build …

90be5b7

…into release/3.0

Add patch to use non-portable NETCoreAppRuntime for crossgen (dotnet#…

3ecb90b

…1335) * Add patch to use non-portable NETCoreAppRuntime for crossgen * Don't update RID when on OSX

Conditionally override PackageVersions in coreclr (dotnet#1336)

93def3a

Accept 3.1 changes in

1a01844

adaggarwal self-assigned this Nov 18, 2019

adaggarwal requested review from crummel and dseefeld November 18, 2019 23:21

adaggarwal added this to the 3.1 milestone Nov 18, 2019

aspentcore: remove patch: not applicable

3456d4c

crummel approved these changes Nov 19, 2019

View reviewed changes

dseefeld reviewed Nov 19, 2019

View reviewed changes

eng/Version.Details.xml Outdated Show resolved Hide resolved

dseefeld suggested changes Nov 19, 2019

View reviewed changes

adaggarwal added 2 commits November 19, 2019 16:38

s-b-ref-packs: rectify the version

38c0459

s-b-ref-packs: rectify the version

fe57a83

dseefeld approved these changes Nov 19, 2019

View reviewed changes

adaggarwal merged commit dac835d into dotnet:release/3.1 Nov 19, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/3.0' => 'release/3.1' #1326

[automated] Merge branch 'release/3.0' => 'release/3.1' #1326

Uh oh!

dotnet-maestro-bot commented Oct 20, 2019

Uh oh!

dotnet-maestro-bot commented Oct 21, 2019

Uh oh!

dotnet-maestro-bot commented Oct 23, 2019

Uh oh!

dotnet-maestro-bot commented Oct 23, 2019

Uh oh!

dotnet-maestro-bot commented Nov 1, 2019

Uh oh!

adaggarwal commented Nov 18, 2019

Uh oh!

azure-pipelines bot commented Nov 18, 2019

Uh oh!

Uh oh!

dseefeld left a comment

Uh oh!

Uh oh!

[automated] Merge branch 'release/3.0' => 'release/3.1' #1326

[automated] Merge branch 'release/3.0' => 'release/3.1' #1326

Uh oh!

Conversation

dotnet-maestro-bot commented Oct 20, 2019

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

dotnet-maestro-bot commented Oct 21, 2019

Uh oh!

dotnet-maestro-bot commented Oct 23, 2019

Uh oh!

dotnet-maestro-bot commented Oct 23, 2019

Uh oh!

dotnet-maestro-bot commented Nov 1, 2019

Uh oh!

adaggarwal commented Nov 18, 2019

Uh oh!

azure-pipelines bot commented Nov 18, 2019

Uh oh!

Uh oh!

dseefeld left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!