Skip to content

Merged v15 dev to release 16#19368

Merged
andr317c merged 26 commits intorelease/16.0from
v16/merge-15-to-16-release
May 20, 2025
Merged

Merged v15 dev to release 16#19368
andr317c merged 26 commits intorelease/16.0from
v16/merge-15-to-16-release

Conversation

@andr317c
Copy link
Contributor

This PR handles the merge of changes from v15/dev to release/16.0

LottePitcher and others added 25 commits April 22, 2025 06:51
* Added tests for bulk trash content dialog

* Updated tests for trash content dialog

* Added tests for trash and bulk trash media dialog

* Moved trash content tests into a folder

* Bumped version

* Make trash tests run in the pipeline

* Make trash tests run in the pipeline

* Fixed comments

* Reverted npm command
* Updated tests for tiptap RTE

* Moved tests for titptap toolbar to another class

* Added tests for titptap toolbar

* Added tests for tiptap statusbar

* Bumped version

* Make tiptap tests run in the pipeline

* Bumped version

* Reverted npm command
…sets (#19189)

In v13, the StaticAssets build was only triggered based on the existence of either the output folder or a preserve.* marker file. Here, we also additionally check for the node_modules/.package-lock.json file before reinstalling npm dependencies. We also now only run `npm install` rather than `npm ci` to optimise the build.
* Clear usernamekey

* Odd explaining comment

* Update src/Umbraco.Core/Cache/Refreshers/Implement/MemberCacheRefresher.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Make UserNameCachePrefix readonly for better immutabilityly

* Move prefix to CacheKeys constants

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
# Conflicts:
#	src/Umbraco.Core/Cache/CacheKeys.cs
# Conflicts:
#	version.json
* Restore interface methods on obsolete IBackgroundTaskQueue.

* Fixed typos in comment.
# Conflicts:
#	version.json
…'t block critical operations following an incompatible data type change (#18576)

* Added logging and try/catch around retrieval of references, so we don't block critical operations following an incompatible data type change.

* Added a little more detail to the log message.

* Added a little more detail to the log message.

* Fix unittest mock dependency

---------

Co-authored-by: Migaroez <geusens@gmail.com>
…-release

# Conflicts:
#	Directory.Packages.props
#	build/nightly-E2E-test-pipelines.yml
#	src/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
#	version.json
Copilot AI review requested due to automatic review settings May 20, 2025 08:06
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR merges the changes from v15/dev into release/16.0, updating a variety of tests (both integration and acceptance) as well as several core components and build configurations. Key changes include updating logging and error‐handling in the data value reference retrieval code, adding new tests for Tiptap and related content editors, and modifying database connection strings and pipeline scripts for enhanced security and reliability.

Reviewed Changes

Copilot reviewed 25 out of 25 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
tests/Umbraco.Tests.Integration/Repositories/* Updated logger usage via NullLogger, ensuring consistency in repository initialization.
tests/Umbraco.Tests.AcceptanceTest/**/* Added and modified numerous tests for media, document, and rich text editor scenarios including Tiptap feature updates.
src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs Replaced ambiguous variable name “districtValues” with “distinctValues” for clarity when processing block values.
src/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollection.cs Enhanced factory collection to support a new logging parameter and added more detailed error reporting in reference lookup.
build/nightly-E2E-test-pipelines.yml & build/azure-pipelines.yml Updated connection string parameters (e.g., adding Encrypt=True) and added a wait loop script to ensure SQL Server readiness.
.github/README.md and .github/ISSUE_TEMPLATE/config.yml Minor documentation and configuration updates for improved clarity and support links.

@andr317c andr317c enabled auto-merge (squash) May 20, 2025 08:09
@AndyButland AndyButland disabled auto-merge May 20, 2025 08:10
@andr317c andr317c enabled auto-merge May 20, 2025 08:13
@andr317c andr317c disabled auto-merge May 20, 2025 09:20
@andr317c andr317c merged commit e5d3927 into release/16.0 May 20, 2025
21 checks passed
@andr317c andr317c deleted the v16/merge-15-to-16-release branch May 20, 2025 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants