Skip to content

Merge #91634 into release/8.0-staging #100994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 16 commits into from
Apr 19, 2024
Merged

Merge #91634 into release/8.0-staging #100994

merged 16 commits into from
Apr 19, 2024

Conversation

@amanasifkhalid
Copy link
Contributor

Testing to see If I can merge #91634 into release/8.0 without breaking CI...

This is the first of multiple merges to transition the release/8.0 branch over to official 1ES templates.

@amanasifkhalid amanasifkhalid added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Apr 12, 2024
@ghost ghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Apr 12, 2024
@amanasifkhalid amanasifkhalid added area-Infrastructure and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Apr 12, 2024
@dotnet-policy-service
Copy link
Contributor

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

directhex and others added 5 commits April 15, 2024 19:23
@directhex
Merge branch 'release/8.0' into release/8.0-staging
befe7ad
@directhex
Merge pull request dotnet#101091 from directhex/release/8.0-staging
b55fd6f 
[manual] Merge release/8.0-staging into release/8.0
@amanasifkhalid
Restore deleted line
c77e7a1
@github-actions @LoopedBard3
@ericstj @MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (dotnet#100595) (d…
ca4f0fe 
…otnet#101145)

* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.

* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency

* Update SourceBuildPrebuiltBaseline.xml

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <[email protected]>
Co-authored-by: Eric StJohn <[email protected]>
Co-authored-by: Michael Simons <[email protected]>
@amanasifkhalid
Merge branch 'release/8.0' into release/8.0
64df88b
@amanasifkhalid amanasifkhalid marked this pull request as ready for review April 18, 2024 01:49
@amanasifkhalid
Copy link
Contributor Author

amanasifkhalid commented Apr 18, 2024 •
edited
Loading

cc @jkoritzinsky @agocke @eduardo-vp -- I ran an official build with this change in dotnet-runtime-official, and it seems to have passed (aside from some timeouts). Let me know if you'd like me to share the link to the build offline. Thanks!

@amanasifkhalid amanasifkhalid removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Apr 18, 2024
@jkoritzinsky
Copy link
Member

@amanasifkhalid you can share the official build links in the PR.

Also, Can you re-target to release/8.0-staging? It's very rare for us to merge into the release branches directly (permissions to merge into them are extremely locked down).

@amanasifkhalid amanasifkhalid changed the base branch from release/8.0 to release/8.0-staging April 19, 2024 02:39
@amanasifkhalid amanasifkhalid changed the title Merge #91634 into release/8.0 Merge #91634 into release/8.0-staging Apr 19, 2024
@amanasifkhalid
Copy link
Contributor Author

amanasifkhalid commented Apr 19, 2024 •
edited
Loading

you can share the official build links in the PR.

Thanks for letting me know! Here's the build link.

Also, Can you re-target to release/8.0-staging? It's very rare for us to merge into the release branches directly (permissions to merge into them are extremely locked down).

Sure thing; done.

jkoritzinsky
jkoritzinsky approved these changes Apr 19, 2024
View reviewed changes
Copy link
Member

@jkoritzinsky jkoritzinsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Official build looks good to me!

@jkoritzinsky jkoritzinsky added the Servicing-consider Issue for next servicing release review label Apr 19, 2024
agocke
agocke approved these changes Apr 19, 2024
View reviewed changes
Copy link
Member

@agocke agocke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@amanasifkhalid
Copy link
Contributor Author

amanasifkhalid commented Apr 19, 2024 •
edited
Loading

@agocke @jkoritzinsky thank you for the reviews! Is there someone I need to ping to get servicing approval?

Edit: Jeremy answered this offline -- thanks!

jeffschwMSFT
jeffschwMSFT approved these changes Apr 19, 2024
View reviewed changes
Copy link
Member

@jeffschwMSFT jeffschwMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved. we will take this as tell mode (infra only change)

cc @ericstj

@jeffschwMSFT jeffschwMSFT added this to the 8.0.x milestone Apr 19, 2024
@amanasifkhalid amanasifkhalid added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Apr 19, 2024
@amanasifkhalid amanasifkhalid merged commit 6c1f1c3 into dotnet:release/8.0-staging Apr 19, 2024
@amanasifkhalid amanasifkhalid deleted the release/8.0 branch April 19, 2024 18:38
@eduardo-vp eduardo-vp mentioned this pull request Apr 19, 2024
Merged
@github-actions github-actions bot locked and limited conversation to collaborators May 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@agocke agocke agocke approved these changes

@jkoritzinsky jkoritzinsky jkoritzinsky approved these changes

@jeffschwMSFT jeffschwMSFT jeffschwMSFT approved these changes

Assignees

@amanasifkhalid amanasifkhalid

Labels

area-Infrastructure Servicing-approved Approved for servicing release

Projects

None yet

Milestone

8.0.x

Development

Successfully merging this pull request may close these issues.

7 participants

@amanasifkhalid @jkoritzinsky @agocke @jeffschwMSFT @dotnet-bot @vseanreesermsft @directhex