Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[automated] Merge branch 'release/6.0-rc1' => 'release/6.0' #57740

Merged
merged 14 commits into from
Aug 20, 2021
Merged

[automated] Merge branch 'release/6.0-rc1' => 'release/6.0' #57740

merged 14 commits into from
Aug 20, 2021

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/6.0-rc1 by the following committers:

  • github-actions[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.

merge button instructions

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/6.0-rc1
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc1

# 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/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH 
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

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/6.0-rc1-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH 
git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

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.

github-actions bot and others added 5 commits August 18, 2021 15:36
@github-actions @stephentoub
Fix Debug.Assert use of string interpolation (dotnet#57668)
2a28e2f 
Co-authored-by: Stephen Toub <stoub@microsoft.com>
@github-actions @CarnaViire
Throw on invalid payload length in WebSockets (dotnet#57635)
f2b270c 
Co-authored-by: Natalia Kondratyeva <knatalia@microsoft.com>
@github-actions @akoeplinger
Bump timeout for workloads build job (dotnet#57721)
3d39a37 
We're seeing it sometimes timing out on official builds.

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
@github-actions @AndyAyersMS @SingleAccretion
[release/6.0-rc1] JIT: don't clone loops where init or limit is a cas…
3d5987f 
…t local (dotnet#57690)

* JIT: don't clone loops where init or limit is a cast local

The loop cloner assumes all computations it introduces are compatible
with TYP_INT, so don't allow cloning when the initial or final value
are variables with incompatible types.

Fixes dotnet#57535.

* Apply suggestions from code review

Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>

Co-authored-by: Andy Ayers <andya@microsoft.com>
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
@github-actions @stephentoub
[release/6.0-rc1] Update pinned compiler version (dotnet#57730)
ba8967d 
* Update pinned compiler version

The version that flows in automatically appears to still be old.  We need to fix that, but in the meantime, we're a month out of date on the compiler.

* Suppress CS8969 warnings

* Change several dynamic tests to use typeof(object[])

Co-authored-by: Stephen Toub <stoub@microsoft.com>
@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Aug 19, 2021
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Aug 19, 2021
@ghost
Copy link

ghost commented Aug 19, 2021

Tagging subscribers to this area: @JulieLeeMSFT
See info in area-owners.md if you want to be subscribed.

Issue Details

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

This PR merges commits made on release/6.0-rc1 by the following committers:

  • github-actions[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.

merge button instructions

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/6.0-rc1
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc1

# 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/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH 
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

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/6.0-rc1-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH 
git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

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.

Author: dotnet-maestro-bot
Assignees: -
Labels:

area-CodeGen-coreclr, community-contribution
Milestone: -

@ViktorHofer ViktorHofer self-assigned this Aug 19, 2021
@ViktorHofer ViktorHofer added area-Infrastructure and removed area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI labels Aug 19, 2021
@ghost
Copy link

ghost commented Aug 19, 2021

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

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

This PR merges commits made on release/6.0-rc1 by the following committers:

  • github-actions[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.

merge button instructions

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/6.0-rc1
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc1

# 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/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH 
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

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/6.0-rc1-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH 
git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

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.

Author: dotnet-maestro-bot
Assignees: ViktorHofer
Labels:

area-Infrastructure, community-contribution
Milestone: -

@ViktorHofer ViktorHofer added blocking-release and removed community-contribution Indicates that the PR has been added by a community member labels Aug 19, 2021
@github-actions @uweigand
[mono] Fix crash in common_call_trampoline due to inconsistent rgctx …
fe6bd2d 
…mode (dotnet#57677)

* Assume MRGCTX mode if mini_method_is_default_method is true

* Fixes dotnet#57664

Co-authored-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
dotnet-maestro bot and others added 7 commits August 20, 2021 00:37
@dotnet-maestro @ViktorHofer
[release/6.0-rc1] Update dependencies from dotnet/arcade (dotnet#57628)
b24f1aa 
* Update dependencies from https://github.com/dotnet/arcade build 20210817.1

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21413.4 -> To Version 6.0.0-beta.21417.1

* Unpin compiler version

* Update source-index-stage1.yml

* Update dependencies from https://github.com/dotnet/arcade build 20210818.12

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21413.4 -> To Version 6.0.0-beta.21418.12

* Partial cherry pick from a169ca9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
@github-actions @ViktorHofer
Fix Microsoft.NETCore.Platforms builds on Unix (dotnet#57757)
86b25c6 
The casing of the SDK imported via the Sdk attribute was wrong which lead to:

Microsoft.NETCore.Platforms.csproj : error MSB4236: The SDK 'Microsoft.NET.SDK' specified could not be found.

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202108…
8493829 
…19.1 (dotnet#57759)

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0-rc.1.21416.1 -> To Version 6.0.0-rc.1.21419.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions @stephentoub
Re-disable AsyncMethodsDropsStateMachineAndExecutionContextUponComple…
4a79fcb 
…tion test (dotnet#57762)

Co-authored-by: Stephen Toub <stoub@microsoft.com>
@github-actions @ericstj
Pack windows implementation assemblies in windowsdesktop transport pa…
e15b35e 
…ckage (dotnet#57796)

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies from https://github.com/mono/linker build 2021081…
5840e15 
…9.1 (dotnet#57777)

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.6.21416.1 -> To Version 6.0.100-preview.6.21419.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/icu build 20210819…
27d062a 
….1 (dotnet#57763)

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 6.0.0-rc.1.21416.1 -> To Version 6.0.0-rc.1.21419.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@ViktorHofer
Copy link
Member

Failure is #57655

@ViktorHofer ViktorHofer merged commit 9f8f736 into dotnet:release/6.0 Aug 20, 2021
@CarnaViire CarnaViire mentioned this pull request Aug 20, 2021
Closed
@danmoseley danmoseley added area-codeflow for labeling automated codeflow and removed area-Infrastructure labels Aug 23, 2021
@ghost ghost locked as resolved and limited conversation to collaborators Sep 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ViktorHofer ViktorHofer ViktorHofer approved these changes

Assignees

@ViktorHofer ViktorHofer

Labels
area-codeflow for labeling automated codeflow blocking-release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dotnet-maestro-bot @ViktorHofer @danmoseley