[automated] Merge branch 'release/6.0' => 'release/6.0-maui' #62850
Conversation
This file contains hidden or 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
…cols in 6.0 and backport changes from 5.0 release. Supersedes https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/pullrequest/17428 for release/6.0 branch.
* Guard pool scavenging callback from parallel execution when it takes longer than the timer interval gets triggered * Dispose connection from the pool in a serate task to not to block the caller (scavenge timer callback) * feedback Co-authored-by: ManickaP <mapichov@microsoft.com>
…pHooks to both be present (dotnet#62124) * Allow configProperties "STARTUP_HOOKS" and env "DOTNET_STARTUP_HOOKS" to both be present * Fix duplicate_property_error property names to reflect the actual duplicate * fixup! Allow configProperties "STARTUP_HOOKS" and env "DOTNET_STARTUP_HOOKS" to both be present * Enforce env startup hook precedence over runtimeconfig startup hooks Co-authored-by: Tom de Goede <tom.degoede@afas.nl>
dotnet#62155) * Fix calling NLS with Cultures has alternative sort names * Exclude the test for the browser * Update src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> * Fix test typo Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com> Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
…et#62194) We have two non-public methods for getting a HeaderDescriptor from a string name, one static on HeaderDescriptor and one instance on HttpHeaders. HttpHeadersNonValidated was using the former, but this then doesn't take into account custom logic used by HttpHeaders in other methods, like TryAddWithoutValidation, which means some methods on HttpHeadersNonValidated can't find the corresponding headers. Co-authored-by: Stephen Toub <stoub@microsoft.com>
…Reg" (dotnet#62207) If the only local is an enregistered must-init struct, we were setting `initReg` to its register (in this case, `xmm0`). However, `initReg` is expected to be an integer register. In the test case, with GS cookie stress, the GS cookie code asserted that `initReg` was an integer register, but it wasn't. The fix is the change the condition to use the actual register assigned to the variable (in this case, `xmm0`), not the variable type (here, `TYP_STRUCT`). No spmi asm diffs. Fixes dotnet#57911
…blish to Build Asset Registry" job (dotnet#62839) * Use 1ES pool instead of deprecated windows image in "Publish to Build Asset Registry" job * Use servicing 1ES pool Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
….0-2021-12-14-0948 Merging internal commits for release/6.0
…ase/6.0 [release/6.0] Fix re-initialization of hash objects on CNG.
…t#62286) * Cache LastAccessed during MemoryCache compaction (dotnet#61187) * Cache LastAccessed during MemoryCache compaction During cache compaction, we are sorting entries based on their LastAccessed time. However, since the cache entries can still be used concurrently on other threads, the LastAccessed time may be updated in the middle of sorting the entries. This leads to exceptions in a background thread, crashing the process. The fix is to cache the LastAccessed time outside of the entry when we are adding it to the list. This will ensure the time is stable during the compaction process. Fix dotnet#61032 * Update fix for 6.0.x servicing. 1. Remove the dependency on ValueTuple and use a custom struct instead. 2. Add servicing package changes. 3. In the tests, move the DisableParallelization collection declaration in the test project, since it is only in "Common" in main.
Co-authored-by: Anton Firszov <Anton.Firszov@microsoft.com>
* Update msquic * Remove exclusion of 100-continue
Co-authored-by: DESKTOP-GEPIA6N\Thays <thaystg@gmail.com>
…led after .Advance(int) (dotnet#62348) * Fixes dotnet#62167. WriteAsync was bugged when writing multiple segments if called after an .Advance(int) * Add packaging changes to IO Pipelines Co-authored-by: Kuinox <github@kuinox.io> Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
…209.4 (dotnet#62799) Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , 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.21560.2 -> To Version 6.0.0-beta.21609.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…et#62859) * Include Microsoft.NETCore.App.Ref pack as part of 6.0.2 release * Update eng/Versions.props
… a NullReferenceException be thrown. (dotnet#62824) * Fixing regression for AuthType.Anonymous which leads to a NullReferenceException be thrown. * Adding a unitTest to protect against a regression * Ensure System.DirectoryServices.Protocols package gets built. Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
akoeplinger
approved these changes
Dec 20, 2021
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 branch which have not been merged yet to release/6.0-maui. I'm a robot and am configured to help you automatically keep release/6.0-maui up to date, so I've opened this PR.
This PR merges commits made on release/6.0 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-to-release/6.0-maui'. 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.