[release/6.0-staging] Merge #92901 #102862
Merged
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
dotnet-issue-labeler
bot
added
the
needs-area-label
amanasifkhalid
added
area-Infrastructure
and removed
needs-area-label
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure |
This was referenced May 30, 2024
amanasifkhalid
changed the title
amanasifkhalid
force-pushed
the
merge-92091
branch
from
0faf317 to
583b3d2
Compare
|
@jkoritzinsky @agocke PTAL. Failures are known. Thanks! |
|
ping @jkoritzinsky @agocke |
jkoritzinsky
approved these changes
Jun 4, 2024
jeffschwMSFT
approved these changes
Jun 4, 2024
amanasifkhalid
merged commit f71677a
into
dotnet:release/6.0-staging
150 of 156 checks passed
jkoritzinsky
added a commit
to jkoritzinsky/runtime
that referenced
this pull request
Jun 14, 2024
This reverts commit f71677a.
carlossanlop
pushed a commit
that referenced
this pull request
Jun 14, 2024
jkoritzinsky
added a commit
that referenced
this pull request
Jun 14, 2024
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.
This continues replicating @eduardo-vp's 1ES port work for the .NET 6 servicing branch by merging #92901. I had to do this by hand to contend with the divergence between
release/6.0-stagingandmain; in addition to #92901's changes, I cherry-picked small changes from other (otherwise-unrelated) PRs to simplify the merge -- the removal ofeng/pipelines/installer/installer-matrix.ymlin favor ofeng/pipelines/common/platform-matrix.ymlis one such change.Official build