Skip to content

Fix load order of ProjectStaging and restrict package version validation to only official builds - #6041

Merged
RussKie merged 10 commits into
dotnet:mainfrom
RussKie:fix_validation
Mar 26, 2025
Merged

Fix load order of ProjectStaging and restrict package version validation to only official builds#6041
RussKie merged 10 commits into
dotnet:mainfrom
RussKie:fix_validation

Conversation

@RussKie

@RussKieRussKie commented Mar 5, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

Reinstate #5864.

@RussKie
RussKie requested a review from a team as a code ownerMarch 5, 2025 22:48
@RussKieRussKie changed the title Fix load order of ProjectStaging and restrict package version validat…Fix load order of ProjectStaging and restrict package version validation to only official buildsMar 5, 2025
@RussKie
RussKie requested a review from joperezrMarch 5, 2025 22:48
@RussKie

RussKie commented Mar 5, 2025

Copy link
Copy Markdown
ContributorAuthor

Tested in in the internal CI leg as a normal and a release branches.

@RussKie
RussKie requested review from a team as code ownersMarch 11, 2025 23:42
@RussKie

RussKie commented Mar 11, 2025

Copy link
Copy Markdown
ContributorAuthor

Tested in https://dev.azure.com/dnceng/internal/_build/results?buildId=2660769 and compared artifacts to the latest release (9.3).

joperezr
joperezr reviewed Mar 12, 2025
View reviewed changes
Comment threadeng/MSBuild/ProjectStaging.props Outdated
@RussKie
RussKieforce-pushed the fix_validation branch 3 times, most recently from a37fef3 to 0804d78CompareMarch 12, 2025 23:02
joperezr
joperezr reviewed Mar 12, 2025
View reviewed changes
Comment threadeng/MSBuild/ProjectStaging.props Outdated
joperezr
joperezr reviewed Mar 12, 2025
View reviewed changes

@joperezrjoperezr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Other than the above comments, the rest of the changes look good to me. I'm assuming you've ran a stable build with this and validated that the right packages are still marked as prerelease?

@RussKie

RussKie commented Mar 12, 2025

Copy link
Copy Markdown
ContributorAuthor

Other than the above comments, the rest of the changes look good to me. I'm assuming you've ran a stable build with this and validated that the right packages are still marked as prerelease?

I'm running tests now.

@RussKieRussKie mentioned this pull request Mar 13, 2025
Merged
joperezr
joperezr reviewed Mar 14, 2025
View reviewed changes
Comment threadeng/MSBuild/ProjectStaging.props
joperezr
joperezr reviewed Mar 14, 2025
View reviewed changes
Comment threadeng/MSBuild/ProjectStaging.props
RussKie
RussKie commented Mar 17, 2025
View reviewed changes
Comment threadeng/MSBuild/ProjectStaging.props Outdated
@RussKie
RussKie requested a review from a team as a code ownerMarch 18, 2025 00:58
RussKie
RussKie commented Mar 18, 2025
View reviewed changes
Comment threadeng/Versions.props
evgenyfedorov2
evgenyfedorov2 reviewed Mar 26, 2025
View reviewed changes
Comment threadsrc/Libraries/Microsoft.AspNetCore.Testing/Microsoft.AspNetCore.Testing.csproj
Comment thread...aries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj
Comment threadsrc/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj
Comment thread...aries/Microsoft.Extensions.Options.Contextual/Microsoft.Extensions.Options.Contextual.csproj
joperezr
joperezr reviewed Mar 26, 2025
View reviewed changes
Comment threadeng/MSBuild/ProjectStaging.targets
joperezr
joperezr reviewed Mar 26, 2025
View reviewed changes
Comment threadDirectory.Build.props
joperezr
joperezr reviewed Mar 26, 2025
View reviewed changes
Comment threadazure-pipelines.yml Outdated
joperezr
joperezr approved these changes Mar 26, 2025
View reviewed changes

@joperezrjoperezr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Left a couple of super minor comments, but this looks good to go otherwise. Thanks a lot for the hard work on this and on getting it back and enabled.

RussKie added 10 commits March 27, 2025 09:36
@RussKie
Fix load order of ProjectStaging and restrict package version validat…
aeffae8
…ion to only official builds
@RussKie
Add "validation" branch which mirrors "release" but can be deleted
9b78c04
@RussKie
Revert "Merged PR 48132: Flowing dependencies and getting ready for 9…
9bb4a45
….3 release"
This reverts commit 092d941.
@RussKie
fixup! Fix load order of ProjectStaging and restrict package version …
bdd9169
…validation to only official builds
@RussKie
fixup! Fix load order of ProjectStaging and restrict package version …
ee25781
…validation to only official builds
@RussKie
fixup! Fix load order of ProjectStaging and restrict package version …
b498b3c
…validation to only official builds
@RussKie
fixup! Fix load order of ProjectStaging and restrict package version …
f5a07af
…validation to only official builds
@RussKie
Revert "fixup! Fix load order of ProjectStaging and restrict package …
c7826a7
…version validation to only official builds"
This reverts commit d953d0a.
@RussKie
fixup! Fix load order of ProjectStaging and restrict package version …
2a429da
…validation to only official builds
@RussKie
fixup! Fix load order of ProjectStaging and restrict package version …
751d1ec
…validation to only official builds
@RussKie
RussKie enabled auto-merge (squash) March 26, 2025 22:41
@RussKie

RussKie commented Mar 26, 2025

Copy link
Copy Markdown
ContributorAuthor

Ok, the build is green, merging.

@RussKie
RussKie merged commit dc5d2f4 into dotnet:mainMar 26, 2025
@RussKie
RussKie deleted the fix_validation branch March 26, 2025 23:31
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Apr 26, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@evgenyfedorov2evgenyfedorov2evgenyfedorov2 approved these changes
@MackinnonBuckMackinnonBuckMackinnonBuck approved these changes
@joperezrjoperezrjoperezr approved these changes

Assignees

@RussKieRussKie

Labels

area-infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@RussKie@MackinnonBuck@joperezr@evgenyfedorov2