[automated] Merge branch 'release/9.0-rc1' => 'release/9.0' #106649
Merged
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Co-authored-by: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
…15.2 (#106481) Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.0-rc.1.24402.2 -> To Version 9.0.0-rc.1.24415.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…uild 20240815.1 (#106499) Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24405.1 -> To Version 3.11.0-beta1.24415.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Aman Khalid (from Dev Box) <amankhalid@microsoft.com>
…06550) Fixing the problem introduced by the previous attempt to fix that. The problem was that the CONTEXT_XSTATE contains not only the bit for the xstate, but also the architecture "id" (CONTEXT_AMD64, CONTEXT_ARM64, ...). I've verified this fix using the debugger tests that the previous change was breaking. There is a bug in updating REGDISPLAY from a faulting exception frame. The context stored in the frame can contain extended state, but we only copy the basic CONTEXT part. But we are not removing the CONTEXT_XSTATE flag. There was an issue found on arm64 Windows with SVE enabled. The context from a hardware exception contains the SVE extended state and when we resume after catch for the exception or start propagating it through native frames, the RtlRestoreContext uses some garbage to try to restore the extended state and ends up corrupting memory. The fix is to remove the CONTEXT_XSTATE flag from the context after we copy it to the REGDISPLAY. While we have hit this problem on Windows ARM64 with SVE only, I have made the same change for other targets that can have extended state too. Close #105483 Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>
…106517) * Fallback to treating as object if not collection The reflection binder will fallback if a type does not meet collection heuristics, but the source generator did not. * Fix UnsupportedTypes test * Update collection to object fallback condition This matches what the refelction binder does, and fixes the baseline diffs (and diagnostics changes) we were seeing for unsupported collection types. * Refactor fallback from collection to object mode --------- Co-authored-by: Eric StJohn <ericstj@microsoft.com>
…16.2 (#106567) Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.0-rc.1.24415.2 -> To Version 9.0.0-rc.1.24416.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: Farhad Alizada <falizada@microsoft.com>
* Fix condition for adding package readmes Fixes #106585 The EnableDefualtPackageReadmeFile property needs to be defined before packaging.targets is imported. * Update workloads.csproj --------- Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
github-actions
bot
requested review from
sbomer,
lewing and
pavelsavara
as code owners
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries |
…TernaryLogic (#106574) * JIT: fix unused operand marking in LowerHWIntrinsicTernaryLogic In `LowerHWIntrinsicTernaryLogic` we do some operand swapping and replacing, and were not accounting for this when marking operands as unused. Fixes #106480. * review feedback --------- Co-authored-by: Andy Ayers <andya@microsoft.com>
carlossanlop
added
area-Infrastructure
area-codeflow
|
Ya! We have inter branch flow working! cc @dotnet/runtime-infrastructure |
|
@lewing I need your help. Which version should we be taking into release/9.0? The 10 version seems... wrong? But also the rc1 version seems wrong. The darc subscriptions are correct though. <<<<<<< merge/release/9.0-rc1-to-release/9.0
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.1.24416.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
=======
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>10.0.0-alpha.1.24415.4</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
>>>>>>> release/9.0 |
| @@ -0,0 +1,13 @@ | |||
| name: Inter-branch merge workflow | |||
There was a problem hiding this comment.
@f-alizada nice, this is getting autoflowed too.
| MirrorBranch: main | ||
| LclSource: lclFilesfromPackage | ||
| LclPackageId: 'LCL-JUNO-PROD-RUNTIME' | ||
| - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/9.0') }}: |
There was a problem hiding this comment.
@dotnet/runtime-infrastructure heads up - we will have to retarget any localization PRs that get opened for release/9.0-rc1 to target release/9.0 instead, as the RC1 branch will be closed by the time we start getting such changes.
There was a problem hiding this comment.
Okay I think this won't be necessary. By simply notifying the loc team that they need to work in the release/9.0, they can ignore all others.
carlossanlop
approved these changes
Aug 19, 2024
This was referenced Aug 19, 2024
|
/ba-g The Build Analysis leg is not getting updated in release branches. All failures are known. |
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/9.0-rc1 branch which have not been merged yet to release/9.0. I'm a robot and am configured to help you automatically keep release/9.0 up to date, so I've opened this PR.
This PR merges commits made on release/9.0-rc1 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/9.0-rc1-to-release/9.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 (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.