[automated] Merge branch 'release/6.0' => 'release/6.0-maui' #63112
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
…late. (dotnet#62716) * Fixing a possible null reference error in websocket deflate functionality. * Style feedback. Co-authored-by: Ivan Zlatanov <[email protected]>
ghost
added
the
|
Tagging subscribers to this area: @dotnet/ncl Issue DetailsI 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 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
git pull --ff-only
git checkout release/6.0-maui
git pull --ff-only
git merge --no-ff release/6.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/runtime HEAD:merge/release/6.0-to-release/6.0-mauior 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-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 SSHContact .NET Core Engineering if you have questions or issues.
|
…net#63032) * Move NoInt32OverflowInTheBufferingLogic to OuterLoop and address pending feedback (dotnet#60606) * Don't create multiple large files at the same time (dotnet#62519) * move existing large file tests into a separate type (no code changes) * don't run the large file tests in parallel * use FileOptions.DeleteOnClose to ensure that each test removes it's own file use single large file to test File.ReadAllBytes and ile.ReadAllBytesAsync for both limits * Fix DisableParallelization build issue * Apply suggestions from code review Co-authored-by: Adam Sitnik <[email protected]> * Update src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs Co-authored-by: Adam Sitnik <[email protected]> * Notepad with uppercase (dotnet#62487) Co-authored-by: Adam Sitnik <[email protected]> Co-authored-by: Dan Moseley <[email protected]>
Member
|
efs failure is #12339 |
…ages for enterprise linux pipeline (dotnet#63014) * Use Ubuntu 18.04 1ES pools and dotnet-buildtools-prereq docker images for enterprise linux pipeline Ubuntu 16.04 is no longer available on Azure Pipelines, move to 18.04 on 1ES pool and the Docker images from dotnet-buildtools-prereq. * Workaround dotnet#34649 * Use servicing 1ES pool * Fix property name for turning off PGO data It was changed in main with dotnet@4682098 * Fix property value Co-authored-by: Alexander Köplinger <[email protected]>
…otnet#62808) * Add runtime-community.yml pipeline and add s390x job (dotnet#60255) (cherry picked from commit 5f3062d) * Don't include s390x in coreclr outerloop runs (dotnet#60351) This was a copy-paste mistake, see dotnet#60255 (comment) (cherry picked from commit 49cf05c) * Enable for release/*.* branch, not just main * Fix condition for dependOnEvaluatePaths for runtime-community pipeline (dotnet#60552) It was missed where we set a default value for that variable. (cherry picked from commit 157a8b5) * [mono] For cross builds targeting s390x use proper objcopy (dotnet#57566) Co-authored-by: Stefan Schulze Frielinghaus <[email protected]> (cherry picked from commit 616ace3) * Use live-built corehost on s390x for creating testhost (dotnet#58952) This allows consuming the dotnet host that was just built instead of relying on a downloaded one. We need to move the `host` subset build before the `libs` subset so that the artifacts are available before externals.csproj runs. (cherry picked from commit cab3a63) Co-authored-by: Alexander Köplinger <[email protected]> Co-authored-by: stefan-sf-ibm <[email protected]>
* Make sure the combined field size matches the struct size * Fix the condition * Update test and include containHoles condition Co-authored-by: Kunal Pathak <[email protected]>
* Port changes to the TimerQueue from dotnet#62433. Test is only manual. Xharness version on this branch triggers timer queue in a way that makes the test useless. Co-authored-by: Pavel Savara <[email protected]> * Replace main method with plain static method for running timer tests. * Rename index.html to simple.html to avoid collision with generated index.html for unit tests. Co-authored-by: Pavel Savara <[email protected]>
…otnet#62236) Co-authored-by: Geoffrey Kizer <[email protected]>
…214.2 (dotnet#63007) 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.21609.4 -> To Version 6.0.0-beta.21614.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
|
Tagging subscribers to this area: @dotnet/area-meta Issue DetailsI 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 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
git pull --ff-only
git checkout release/6.0-maui
git pull --ff-only
git merge --no-ff release/6.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/runtime HEAD:merge/release/6.0-to-release/6.0-mauior 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-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 SSHContact .NET Core Engineering if you have questions or issues.
|
* Fix clang 13 induced runtime issues (dotnet#62170) The clang 13 optimizer started to assume that "this" pointer is always properly aligned. That lead to elimination of some code that was actually needed. It also takes pointer aliasing rules more strictly in one place in jit. That caused the optimizer to falsely assume that a callee with an argument passed by reference is not modifying that argument and used a stale copy of the original value at the caller site. This change fixes both of the issues. With this fix, runtime compiled using clang 13 seems to be fully functional. * Fix build with clang 13 (dotnet#60328)
…net#60966) (dotnet#63351) We reference entry #0 in the pinned plug queue even if there are no pinned plugs at all and thus the pinned plug queue contains left-over data from the mark phase. The fix is to initialize saved_pinned_plug_index to a value that is invalid as a pinned plug queue index, and only use saved_pinned_plug_index as an index if is valid. Co-authored-by: Peter Sollich <[email protected]>
…sses (dotnet#62765) - The page size is different between arm64 processes and emulated x64 processes - The shared memory file size is set to the page size and there was a strict check on the file size, leading to an exception from the second process of a different arch that tries to share the same mutex - Made the file size check less strict, and allowed an arch to increase but not decrease the file size such that it can be mapped at page size granularity - Fix for dotnet#62140 in main
…otnet#63301) The macOS arm64 was using a new mechanism to implement FlushProcessWriteBuffers because the original one based on a wired memory page doesn't work on arm64. We have seen people hitting problems with the wired memory page allocation on x64 in the past due to the fact that wired memory is a scarce resource and in some cases, e.g. in presence of apps that greedily grab all of the available wired memory pages, we were unable to initialize coreclr and execute any .NET application. This change switches x64 to the same mechanism as arm64 to prevent that issue from happening and updates the minimum supported x64 macOS to 10.14. That's the version required for the new APIs the change is using. Apple stopped supporting 10.13 a year ago anyways. Co-authored-by: Jan Vorlicek <[email protected]>
…et#63393) Backport of dotnet#59045 to release/6.0 The pthread_kill can fail with ENOTSUP on macOS when the target thread is a dispatch queue thread. Instead of aborting the process, it is better to fail to inject the activation and rely on return address hijacking and other means of syncing with GC.
* Fix XXHash for stripe size * Add servicing properties to System.IO.Hashing * Run package validation against 6.0.0 packages and enable it for IO Hashing. Co-authored-by: Tornhoof <[email protected]> Co-authored-by: Jeremy Barton <[email protected]> Co-authored-by: Santiago Fernandez Madero <[email protected]>
danmoseley
added
area-codeflow
* Making user secrets optional by default * update test * Update fix for 6.0.x servicing. Co-authored-by: Maryam Ariyan <[email protected]> Co-authored-by: Eric Erhardt <[email protected]>
…63346) * tests * enable WINHTTP_OPTION_REQUIRE_STREAM_END on request handles * set WINHTTP_OPTION_REQUIRE_STREAM_END on the session handle Co-authored-by: antonfirsov <[email protected]>
…net#62922) * Fix setting timestamp on Windows on readonly files (dotnet#62638) # Conflicts: # src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs * make it compile * fix build Co-authored-by: Dan Moseley <[email protected]>
…figuration prefix support (dotnet#62916) * Undo breaking change in 6.0 With environment variable configuration provider, undo support for normalizing prefix using double underscore * Update src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/EnvironmentVariablesTest.cs * Update src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/EnvironmentVariablesTest.cs * update tests, not windows specific * Update fix for 6.0.x servicing. Co-authored-by: Maryam Ariyan <[email protected]> Co-authored-by: Eric Erhardt <[email protected]>
…net#63423) * [release/6.0] Ensure UserSecretsIdAttribute is added to assembly When Microsoft.Extensions.Configuration.UserSecrets is referenced transitively, for example through Extensions.Hosting, the UserSecretsIdAttribute isn't getting added to the built assembly. This is because the logic is contained in a `build` folder which is excluded by the dependency from Extensions.Hosting. The fix is to move the logic to `buildTransitive`, so it gets picked up by NuGet. Note, we also need to service the Extensions.Hosting package so it references the new UserSecrets version by default. Fix dotnet#63246 * Add a binding redirect in order to fix test failure on netfx.
) * Add explicit null-check for tailcalls to VSD There is already a comment that this is necessary, but it is only being done for x86 tailcalls via jit helper. Do it for normal tailcalls to VSD as well. Fix dotnet#61486 * Revert cleanup to make potential backport easier Co-authored-by: Jakob Botsch Nielsen <[email protected]>
* Outerloop ports * Port EFS test fix * Partially disable test (dotnet#59760) * fix build
…ling (dotnet#62193) * Fix System.Object serialization with custom number handling * fix typos * Address feedback Co-authored-by: Eirik Tsarpalis <[email protected]> Co-authored-by: Eric StJohn <[email protected]>
dotnet-maestro-bot
requested review from
eiriktsarpalis,
layomia and
steveharter
as code owners
…dotnet#63493) * Fix bugs with generation for ctor param default values * Address review feedback * Address feedback
dotnet#63501) Co-authored-by: Layomi Akinrinade <[email protected]>
* fix TimeSpan support in sourcegen * address feedback * Address feedback Co-authored-by: Eirik Tsarpalis <[email protected]> Co-authored-by: Eric StJohn <[email protected]>
…tnet#63454) Co-authored-by: Layomi Akinrinade <[email protected]>
…et#62757) * [wasm] Disable native strip for tests * [wasm] improve fixup of symbol names * [wasm] Extract BuildProject params to BuildProjectOptions record * [wasm] Add WasmBuild.sln * [wasm] Add `@(NativeFileReference)` to up-to-date check items for VS VS does its own tracking of inputs/outputs too, and needs to be told about `@(NativeFileReference)` items, so a build can get triggered with F5 when a native file changes. Based on https://github.com/dotnet/project-system/blob/main/docs/up-to-date-check.md?rgh-link-date=2021-10-26T13%3A23%3A47Z#up-to-date-check Fixes dotnet#60862 * MonoAOTCompiler: log failed output as error * [wasm] Improve error message when runtime pack cannot be found * [wasm] PInvokeTableGenerator: don't fail on errors in reading custom attributes Inspired by https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1364890?src=WorkItemMention&src-action=artifact_link Works around a NRE in CustomAttributeData.AttributeType because it's ConstructorInfo is null. The mono side issue: mono/mono#15340 * replace '.', '-', and '+' with '_' instead of their code
Co-authored-by: wfurt <[email protected]>
…ltipleFileStreams_Success test on Windows 11 (dotnet#63526)
NETStandard libraries using JSON source gen would fail to load on .NETCore due to missing IsExternalInit in the assembly. On .NETCore this is defined, whereas on .NETStandard JSON carries an internal copy. The compiler emits references to the internal type when a NETStandard library calls init-only setters in JSON types, but these references are not satisfied when the library runs on .NETCore. Fix this by adding a type forward to JSON for the IsExternalInit type.
Co-authored-by: Layomi Akinrinade <[email protected]>
…tnet#61266) * Generate dynamic serialization assembly in the appropriate ALC, and don't keep any hard refs to types that could prevent unloading. * Add small test for ALC unloading. * PR feedback; Move into TempAssembly; Strong/Weak lookup tables; Test refinement * Refining TempAssembly cache; Reflection-based fix; Test corrections * Mono/wasm test fixup * Ensure that serializers from XmlMappings don't run afoul of collectible ALCs. * PR feedback * Unloadable contexts not yet supported in Mono. * Fix trimming of types for XmlSerializer tests that got moved out of main test assembly. * Encapsulating the duality of dealing with unloadable ALC instead of rewriting similar code everywhere. * Missed new file in last commit. * Compilation bug not seen locally. * Perf improvement. * Remove extraneous line. Test feedback. * Fix unloadability (dotnet#58948) There is a bug in AppDomain::FindAssembly code path that iterates over the domain assemblies. The iteration loop leaves the refcount of the LoaderAllocator related to the returned DomainAssembly bumped, but nothing ever decrements it. So when a code that needs to be unloaded ends up in that code path, all the managed things like managed LoaderAllocator, LoaderAllocatorScout are destroyed, but the unloading doesn't complete due to the refcount. We have never found it before as this code path is never executed in any of the coreclr tests even with unloadability testing option. (cherry picked from commit 8b38c19) Co-authored-by: Steve Molloy <[email protected]> Co-authored-by: Jan Vorlicek <[email protected]>
…operty declarations. (dotnet#62643) Co-authored-by: Eirik Tsarpalis <[email protected]>
akoeplinger
approved these changes
Jan 12, 2022
It got missed in release/6.0 since the package isn't built there, but release/6.0-maui builds all packages.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
16 participants
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.