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
Port changes from 6.0 for future servicing releases into main #62469
Conversation
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries |
<!-- Always update the package version in servicing. --> | ||
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</VersionPrefix> | ||
<Version>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</Version> | ||
<Version Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</Version> |
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.
Weren't this things set in arcade before?
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.
oh, but we are changing the default since we are using the servicing version, makes sense. I'd probably say ideally we should have that in arcade too as that also makes sense for other repos, but I'm fine with keeping as is on this PR.
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.
Yeah, that'd make sense, but I believe other repos don't follow what we do, which is just ship the packages we service, from my understanding other repos ship all the OOB packages, so then this would no longer make sense on arcade.
cc: @mmitche for thoughts.
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.
These are set by arcade in typical scenarios. This may have been related to pkgproj files, which are runtime/mono specific? IIRC the runtime repo had some non-standard behavior that required this be added during the servicing exercise. @Anipik for context.
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.
Yes the reason why we needed to add them is because of the way we calculate the package dependencies and because we don't build all packages as part of the build so the version is different for every package we build. In other repos the versions is always Major.Minor.Patch, no matter if the package has fixes or not, so for us we introduced a ServicingVersion
which is set individually on every serviced package and then the version is Major.Minor.ServicingVersion
. This is specific to the libraries partition as the rest of the repo service all the packages on every build.
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.
Left a few comments but this looks good otherwise
This ports changes that we had to make in release/6.0 for the first servicing release in order to get the correct versions and validation in place.
The original changes were made in: #61500 and #61703