[automated] Merge branch 'release/6.0-rc2' => 'release/6.0' #59238
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Kevin Jones <kevin@vcsjones.com>
|
Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer Issue DetailsI detected changes in the release/6.0-rc2 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-rc2 by the following committers:
Instructions for merging from UIThis 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 lineRun these commands to merge this pull request from the command line. git fetch
git checkout release/6.0-rc2
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc2
# 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-rc2-to-release/6.0or if you are using SSHAfter PR checks are complete push the branch Instructions for resolving conflictsInstructions for updating this pull requestContributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0-rc2-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. or if you are using SSHContact .NET Core Engineering if you have questions or issues.
|
danmoseley
added
area-codeflow
ViktorHofer
approved these changes
Sep 17, 2021
* Bump intellisense version to RC1 * Use package pushed to correct feed (dotnet6-transport) Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com> Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@dotnet/dnceng any idea about this one? |
Co-authored-by: vsadov <8218165+VSadov@users.noreply.github.com>
|
We are currently observing issues with AzDO feeds: https://github.com/dotnet/core-eng/issues/14404 . I will add this to the IcM. |
…in ForEachAsync (dotnet#59237) * Fix corner-case handling of cancellation exception in ForEachAsync If code in Parallel.ForEachAsync throws OperationCanceledExceptions containing the CancellationToken passed to the iteration and that token has _not_ had cancellation requested (so why are they throwing with it) and there are no other exceptions, the ForEachAsync will effectively hang after failing to complete the task returned from it. The issue stems from how we treat cancellation. If the user-supplied token hasn't been canceled but we have OperationCanceledExceptions for the token passed into the iteration (the "internal" token), it can only have been canceled because an exception occurred. We filter out these cancellation exceptions, leaving just the exceptions that are deemed to have caused the failure in the first place. But the code doesn't currently account for the possibility that the developer is (arguably erroneously) throwing such an OperationCanceledException with the internal cancellation token as that root failure. The fix is to only filter out these OCEs if there are other exceptions besides them. * Stop filtering out cancellation exceptions in Parallel.ForEachAsync Co-authored-by: Stephen Toub <stoub@microsoft.com>
…14.1 (dotnet#59264) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rtm.21464.2 -> To Version 6.0.0-rc.2.21464.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…spaces (dotnet#57894) (dotnet#59100) * Handle file-scoped namespaces (dotnet#57894) Handle namespace not being emitted when file-scoped namespaces are used for a log class. Relates to dotnet#57880. * Fix build issue Co-authored-by: Martin Costello <martin@martincostello.com>
* Add UriCreationOptions Includes DangerousDisablePathAndQueryCanonicalization * Add /// comments Co-authored-by: Miha Zupan <mihazupan.zupan1@gmail.com>
…59243) * Update source-gen APIs according to review * Rename fast-path func name and add src-gen/JsonNode interop support * Address review feedback * Disable src-gen tests in browser target OS Co-authored-by: Layomi Akinrinade <layomia@gmail.com>
dotnet-maestro-bot
requested review from
eiriktsarpalis,
layomia and
steveharter
as code owners
…otnet#59231) * Undo breaking change compat * Fix compilation Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Need to port dotnet/arcade#7916 to arcade/6.0 or you can set the values in the common variables yaml like in main. |
* Fix symbols for Microsoft.MonoTargets.Sdk * Build and include .pdb file on Windows builds of mono-aot-cross * Only TARGET_PDB_FILE on HOST_WIN32 * Another conditional * Output directly "mono-aot-cross.exe", don't rename "mono-sgen.exe" Co-authored-by: Jo Shields <directhex@apebox.org> Co-authored-by: Jo Shields <joshield@microsoft.com>
dotnet-maestro-bot
requested review from
imhameed,
lambdageek,
marek-safar,
SamMonoRT and
vargaz
as code owners
* Retarget DOTNETHOME when installing x64 on ARM64 (dotnet#58669) * Only set path in x64 mac installer when installing on x64 (dotnet#59210) * Only set path in x64 mac installer when installing on x64 In other words don't set the path for x64 installer on ARM64 * Remove postinstall script from hostfxr There should be no need for both the host and hostfxr to set the path to dotnet. Since the host installs dotnet, it should be the only package responsible for this. * Make postinstall set install_location on mac Also refactor script to use a template so that we don't need to fork the script. * fix some syntax errors in script * Update src/installer/pkg/sfx/installers/dotnet-host.proj Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> * Refine uname regular expressions Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> * Updating dependencies from https://github.com/dotnet/arcade build 20210917.3 Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/6.0-rc2 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-rc2 by the following committers:
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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-rc2-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
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.