-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
[release/9.0] Stable branding for GA #108899
Merged
carlossanlop
merged 5 commits into
dotnet:release/9.0
from
carlossanlop:StableBranding9
Oct 16, 2024
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c8b2715
[release/9.0] Stable branding for GA
carlossanlop 1d36cdb
Merge remote-tracking branch 'dotnet/release/9.0' into StableBranding9
carlossanlop 2dd6cd4
Make VerifyFrameworkDescriptionContainsCorrectVersion test more speci…
carlossanlop 19f895d
Revert "Make VerifyFrameworkDescriptionContainsCorrectVersion test mo…
akoeplinger ee99d7c
Fix InformationalVersion in corelib generators
akoeplinger File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not correct. The FrameworkDescription should always contain the stabilized version irrespective of the build environment.
This is a regression caused by #102164. Before it was reading the AssemblyInformationalVersion from System.Private.CoreLib.dll which is
9.0.0
*, now it's reading it from the generators assembly and that contains9.0.0-dev
(basically what Stephen noticed in #102164 (comment))* this is because we override it here:
runtime/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
Lines 46 to 48 in 588bc45
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I pushed a fix. There is potential to clean up overriding the version in SPC.dll now I think but that can be done separately.