Merge v17/main into v18/main (2026-08-26) - #1050
Merged
Merged
Conversation
Template import failures (#1044) reported a generic "Failed to create template" with a null exception, hiding the actual Umbraco status (e.g. duplicate alias) - especially hard to diagnose on IIS/Production where the failure mode differs from local dev. Propagate attempt.Status and wrap it in an exception so the sync result carries enough detail to diagnose. Also removes an unreachable duplicate null check left over from an earlier refactor, and adds coverage for both the failure and success create paths. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
The uSyncCallbacks delegates (Callback, Update, SetRange, IncrementalUpdate, Complete) were void, which forced consumers like uSync.Complete's LocalHubClient/PublisherHubClient to .Wait() on every SignalR send. Add optional async counterparts (CallbackAsync, UpdateAsync, SetRangeAsync, IncrementalUpdateAsync, CompleteAsync) alongside the existing sync delegates, plus Raise*Async helper methods that invoke the sync delegate then await the async one if set. Existing constructors, properties and delegate types are untouched, so this is purely additive. Update the call sites that invoke callbacks directly off a uSyncCallbacks instance (SyncService, SyncService_Single, SyncActionService, SyncHandlerRoot, uSyncManagementService) to await the new Raise*Async helpers. Call sites that extract the raw SyncUpdateCallback delegate to pass into the public ISyncHandler.ExportAllAsync/ReportAsync interface are left untouched, since changing that interface would be a breaking change.
2 tasks
This was referenced Sep 1, 2026
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
1 participant
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.
Summary
Brings the two v17 commits not yet ported to v18 (everything older was already backported via separate PRs):
TemplateOperationStatuswhen template creation fails, plus test coverage (v17a1b3c694)uSyncCallbacks(Add non-breaking async callback surface to uSyncCallbacks #1049) (v1771a56d90)Both cherry-picked cleanly with no conflicts.
Test plan
uSync.BackOffice,uSync.Backoffice.Management.Api,uSync.Testsall build with 0 errorsTemplateSerializerTestspass (2/2)