Skip to content

Conversation

@crummel
Copy link

@crummel crummel commented Dec 12, 2022

Fixes dotnet/source-build#3146.

ASP.NET backport PR: dotnet/aspnetcore#46299.

@crummel crummel force-pushed the fixVersioningSplit branch from 6967049 to 9dc83cb Compare January 5, 2023 16:06
@crummel crummel force-pushed the fixVersioningSplit branch 2 times, most recently from 680e32d to 1bea560 Compare January 24, 2023 21:50
@crummel crummel marked this pull request as ready for review January 27, 2023 20:40
@crummel crummel requested a review from a team as a code owner January 27, 2023 20:40
Copy link
Member

@MichaelSimons MichaelSimons left a comment

Choose a reason for hiding this comment

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

What is the impact of this in regards to the OverrideBootstrapVersions.props file? Does this file remain until the next release where the correct versions will be produced? If that's the case have you validated the file can be removed with these changes?

@MichaelSimons
Copy link
Member

I approved but then noticed the CI failure. The CI failure seems related to the patch.

@MichaelSimons MichaelSimons self-requested a review January 31, 2023 15:47
@crummel crummel force-pushed the fixVersioningSplit branch from 2796175 to 64974af Compare February 3, 2023 13:09
@crummel
Copy link
Author

crummel commented Feb 3, 2023

What is the impact of this in regards to the OverrideBootstrapVersions.props file? Does this file remain until the next release where the correct versions will be produced? If that's the case have you validated the file can be removed with these changes?

Yes, removing the OverrideBootstrapVersions.props will have to wait until we have a PSB with the correct versions in it. I verified that the artifacts and PVP in the PSB produced by this build is the expected 7.0.2 version and I'll try to kick off a build with this same change using those artifacts.

The OSX failure is unrelated; it's the same one we've been seeing everywhere.

@crummel
Copy link
Author

crummel commented Feb 3, 2023

Building with the artifacts failed - I removed the ExtraVersionProps but they are needed; they just need to be set to the correct version rather than the runtimeOutputVersion we construct. Kicking off another try at this.

@crummel
Copy link
Author

crummel commented Feb 3, 2023

Added a note to dotnet/source-build#3129 that the OverrideBootstrapProps removal will also involve a fix in buildBootstrapPreviouslySB.csproj - OverrideBootstrapProps is used unconditionally there. Other than that it all looks good, I have a build working using the artifacts from the CI bulid as input for a ./prep.sh --bootstrap build of the same changes.

These are expected to be the same version number and cause fewer problems for people who are building on RIDs that do not match our PSB RID.
@crummel
Copy link
Author

crummel commented Feb 3, 2023

I also updated dotnet/source-build#3231 as we discussed to be about eliminating the RID-specific variables throughout the product.

@crummel
Copy link
Author

crummel commented Feb 6, 2023

Merging past the OSX failure - this is the persistent one we've been seeing everywhere.

@crummel crummel merged commit 40dd360 into dotnet:release/7.0.1xx Feb 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants