Repository navigation
Merge v17 into v18 (2026-09-30) - #1103
Merged
Merged
Conversation
Forward-ported from v17/main (cherry picked from commit 10e617b). Adapted for v18: the import serializer options start from Jumoo.Json's JsonTextOptions.GetOptions(false), since uSync.Core's own options moved there, and the test passes the IVariationContextAccessor that BlockEditorVarianceHandler now takes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…1101) Forward-ported from v17/main (c12bc72). Umbraco 18.0-18.1 have the same core behaviour as 17.3-17.6; 18.2 brings the 17.7 fixes. - Culture codes are written in standard casing on export (names, values, published and schedule cultures), and normalised before the direct CultureInfos.Add on import. - Property moves go through an internal helper; the tests check the outcome, so they pass before and after 18.2, with save-and-reload coverage in both directions. Adapted for v18: the published and schedule cultures live in PublishableContentBaseSerializer, and the tests use IContentTypeService.CreateAsync/UpdateAsync and don't need the local link composer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…braco 18.2 (#1102) Forward-ported from v17/main (e89bd81). Umbraco 18.0-18.1 have the same two cache bugs as 17.3-17.6 (umbraco/Umbraco-CMS#23433, #23445); 18.2 fixes them and the workarounds do nothing there. - After saving a composition change, refresh the types composed of it. - Clear the property types' stale dirty state when a content type is loaded for import, so a variance-only change is treated as structural. Adapted for v18: the tests use IContentTypeService.CreateAsync and don't need the local link composer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
#1099) Forward-ported from v17/main, written against v18's prerelease.yml. v18/main builds keep the "-prerelease.{date}.{run}" version; any other branch gets "-branch.{name}.{date}.{run}" so it can't be mistaken for a main nightly. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Forward-ported from v17/main. v18's lockfile only has the top-level copy (5.0.9); v17's nested @vue/language-core copy doesn't exist here. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
3 tasks done
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
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
Forward-ports the v17 work landed after the last forward merge (#1086). One commit per v17 PR, re-applied onto v18's code rather than merged. The squashed forward merges left the git merge base back at 17.3.2, so a straight
git mergeconflicts in 45 files.JsonTextOptions.GetOptions(false), since uSync.Core's own options moved there. The test passes theIVariationContextAccessorthatBlockEditorVarianceHandlernow takes.PublishableContentBaseSerializeron v18. Culture codes are written in standard casing on export, and the property move tests check the outcome instead of the core bug.prerelease.yml.v18/mainbuilds keep-prerelease.{date}.{run}; other branches get-branch.{name}.{date}.{run}.Umbraco 18.0–18.1 have the same core behaviour as 17.3–17.6; 18.2 brings the 17.7 fixes. So all three product changes are needed on v18's 18.1 floor, and they have no effect from 18.2 on. Comments say "before 18.2".
Not ported: #1096 (CI parity). It brought v17's workflows up to v18, so there is nothing to take forward.
Test plan
dotnet build ./uSync.slnx -c Release: succeeds, 0 errorsdotnet teston Umbraco 18.1.0: 250/250 passeddotnet testwith the packages bumped to Umbraco 18.2.0 (local only, not committed): 250/250 passedPlease merge with a merge commit, not squash.
🤖 Generated with Claude Code