[automated] Merge branch 'release/2.1' => 'release/2.2'#779
Conversation
* Add binlogging where supported. * Set working directory for RepoBuilds so logs get output correctly.
…ct.assets.json (dotnet#776) * By default, continue on prebuilt baseline error * Save all potential reports for more diagnosability * Create zip with all project.assets.json files * Set MSBUILDDEBUGPATH env var for all builds Save contents in CI in case the outputs help troubleshooting.
* Delete unused javascriptservices project * Remove references to javascriptservices * Update prebuilt baselines
* Enable portable builds on linux Most projects were already working fine. Only cli needed fixes to support $(PortableBuild). * Fix a couple more things with portable builds. - OSX should not try to use the portable linux shared framework. - Override target RID when portable to be correct from the start. This allows us to pass it in everywhere and remove a couple workarounds.
* Add portable builds to CI. * Address code review feedback. * Change to only do offline and tarball builds for portable since they require the online build anyway. * Fix tarball and offline build names. * Add PR jobs that can be triggered for portable testing.
Add a simple project for linker, and use the built tool in CoreCLR and CoreFX. Uses a patch to add "-h" arg and reflection heuristics feature. Update baselines: removes ILLink.Tasks, adds additional versions of some existing packages.
# Conflicts: # repos/core-setup.proj # repos/templating.proj # tools-local/prebuilt-baseline-offline.xml # tools-local/prebuilt-baseline-online.xml
|
@dotnet-bot test OSX10.12 Release @dotnet-bot test Fedora24 Release Heard about something similar at dotnet/coreclr#20047 (comment). Nothing on NuGet status page yet, and some of our other legs here passed anyway. Side note: autoresolving the prebuilt baseline conflicts seems to have actually worked perfectly, wow. |
|
Other legs hit the nuget restore issue too (didn't see them yet when I made the previous comment). Filed https://github.com/dotnet/core-eng/issues/4214 to track the problem. |
|
@dotnet-bot test OSX10.12 Release |
|
Build/smoke-test worked on my local OSX on 89f122c, ignoring OSX leg in CI after retries repeatedly hit the same issue. |
I detected changes in the release/2.1 branch which have not been merged yet to release/2.2.
I'm a robot and am configured to help you automatically keep release/2.2 up to date, so
I've opened this PR.
This PR merges commits made on release/2.1 by the following committers:
Instructions for merging
This PR will not be auto-merged. When pull request checks pass, please complete this PR
by creating a merge commit, not a squash or rebase commit.
You can also do this on command line:
Instructions for resolving conflicts
You can do this using GitHub
or using the command line.
Maintainers of this repo have permission to the branch 'merge/release/2.1-to-release/2.2' on https://github.com/dotnet-maestro-bot/source-build.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on release/2.1.
Please 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.