[release/9.0-staging] Switch to non-incremental servicing #109316
Conversation
- Remove incremental servicing docs. - Update APICompat baseline. - Remove some mentions of package servicing process. - Remove redundant source build setting of GeneratePackageOnBuild.
carlossanlop
requested review from
ViktorHofer,
ericstj,
pavel-purma and
dkurepa
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries |
|
First Responders has reported that the CI is not actively getting triggered in PRs since early morning Monday 28th and the issue is being investigated. We need to monitor the Teams chat group for an update so we can close + reopen this PR after the issue is fixed. |
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/runtime/actions/runs/11707855525 |
|
@ViktorHofer backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Change pre-release version label to servicing. Bump patch version to 1.
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Change pre-release version label to servicing. Bump patch version to 1.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@ViktorHofer an error occurred while backporting to main, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
The build failure looks related Edit: Fixed |
carlossanlop
force-pushed
the
NonIncrementalServicing
branch
from
a385dcc
to
89accc1
Compare
|
/ba-g All failures have been linked to issues |
carlossanlop
merged commit 824bdd2
into
dotnet:release/9.0-staging
|
@ViktorHofer don't know if you noticed but the backport to main failed. Would you like me to take care of creating the equivalent main PR or are you doing that? |
Customer impact
For .NET 9 and all future versions, we are switching to non-incremental servicing by removing the need to manually bump the package versions every time a change is made in an OOB assembly like we used to do in .NET 8 and older versions.
Regression
No. This is an intended behavior for servicing starting with .NET 9.
Testing
We verified the correct behavior of these changes during the release + servicing readiness exercise.
Risk
Low. These changes are not affecting product behavior, but the way we increment package versioning in servicing