Auto-merge forward rel-10.7 → dev - #26159
Merged
Merged
Conversation
Extend `switch-to-nightly` with `--include` and `--exclude-packages` options to optionally update Central Package Management files (like `Directory.Packages.props`) alongside regular project/package updates. The updater now resolves the nightly ABP version once, updates `PackageVersion Include="Volo.*"` entries with exclusion and LeptonX/Studio safeguards, and logs/continues on MyGet or file-write failures. Also fixes `.npmrc` registry appending to insert a newline before the added registry entry.
Improve CLI package update behavior when resolving the latest `Volo.Abp.Core` nightly version fails or returns empty: the `--include` pass is now skipped explicitly with a warning while normal project updates continue. Also switch file reading in `VoloNugetPackagesVersionUpdater` to use the shared `DefaultEncoding` instead of `Encoding.Default` for consistent encoding handling.
Keep the original project file encoding when rewriting updated NuGet package versions. This avoids forcing the default encoding during XML writes and stores the XML output before truncating the file stream.
Write the updated Directory.Packages.props content to a temp file in the same directory and swap it in with File.Replace instead of truncating the original file in place. A mid-write failure (disk full, process killed) now leaves the original file completely untouched instead of empty or partially written.
CPM Support to switch-to-nightly
…d/rel-10.6-to-rel-10.7-40
….6-to-rel-10.7-40 Auto-merge forward rel-10.6 → rel-10.7
Contributor
Author
|
Merge conflict forwarding Please resolve conflicts against |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #26159 +/- ##
==========================================
- Coverage 49.80% 49.80% -0.01%
==========================================
Files 3835 3835
Lines 134320 134329 +9
Branches 10199 10201 +2
==========================================
+ Hits 66897 66898 +1
- Misses 65397 65417 +20
+ Partials 2026 2014 -12 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
yagmurcelk
enabled auto-merge
September 11, 2026 10:08
voloagent
disabled auto-merge
September 11, 2026 11:00
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Automated forward merge of
rel-10.7intodev.Merge conflict: this branch is `${SOURCE}` as-is. Resolve against `${TARGET}` before merging.