Sven Geusens
4b9771c0eb
Merge branch 'v13/dev' into v14/dev
...
# Conflicts:
# Directory.Packages.props
# build/azure-pipelines.yml
# src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs
# src/Umbraco.Cms.Persistence.EFCore/Locking/SqlServerEFCoreDistributedLockingMechanism.cs
# src/Umbraco.Core/Configuration/Models/RichTextEditorSettings.cs
# src/Umbraco.Core/EmbeddedResources/Lang/da.xml
# src/Umbraco.Core/EmbeddedResources/Lang/en.xml
# src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs
# src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Trees/StaticFilesTreeController.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js
# src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.less
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html
# src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
# src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js
# src/Umbraco.Web.UI.Client~HEAD
# src/Umbraco.Web.UI.Login/package-lock.json
# src/Umbraco.Web.UI.Login/package.json
# tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorContent.spec.ts
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
# tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs
# version.json
2025-01-21 08:47:38 +01:00
Alex Clark
60e3fa97a9
Lucene Package Update to Address CVE-2024-43383 ( #17942 )
...
* Update Lucene Package to 4.8.0-beta00017
* Add Package Reference
---------
Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com >
2025-01-20 10:04:02 +01:00
Bjarke Berg
b55d484863
Updated NuGet Packages for v13 ( #17704 )
...
* Update nuget packages
* Cherry pick fixes from v15
* Fixed: Projects that use central package version management should not define the version on the PackageReference items but on the PackageVersion items
* rollback update in tool
2024-12-03 08:51:23 +01:00
Sven Geusens
28756d449b
Rectify v13 in v14 merge
2024-11-27 14:35:22 +01:00
Sven Geusens
38a96db369
Merge branch 'v13/dev' into v14/dev
...
# Conflicts:
# src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs
# src/Umbraco.Core/Models/AuditItem.cs
# src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditRepository.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
# src/Umbraco.Web.UI.Client/src/common/services/rte-blockeditor-clipboard.service.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/common/services/user.service.js
# src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
# src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.html
# src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umbimagepreview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js
# src/Umbraco.Web.UI.Client/src/views/templates/edit.html
# src/Umbraco.Web.UI.Client~HEAD
# src/Umbraco.Web.UI.Login/package-lock.json
# src/Umbraco.Web.UI.Login/package.json
# src/Umbraco.Web.UI.Login/src/auth.element.ts
# src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts
# src/Umbraco.Web.UI.Login/src/index.ts
# tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs
2024-11-27 14:04:41 +01:00
Andreas Zerbst
97d74f39e7
Updated version of messagepack ( #17321 )
...
(cherry picked from commit 8a22672c7f
2024-10-21 11:49:13 +02:00
Andreas Zerbst
6399f235f2
Updated version of messagepack ( #17321 )
...
(cherry picked from commit 8a22672c7f
2024-10-21 11:17:50 +02:00
Bjarke Berg
f4f83bccbe
Added an explicit dependency to Microsoft.Extensions.Caching.Memory to force it to use a non-vulnerable version ( #17287 )
2024-10-16 10:25:17 +02:00
Andreas Zerbst
5183391a86
Updated nuget package ( #17286 )
2024-10-16 10:07:25 +02:00
Bjarke Berg
017209c5ba
Updated nuget packages ( #17062 )
2024-09-16 12:15:36 +02:00
Bjarke Berg
3b3c9c57ca
Merge remote-tracking branch 'refs/remotes/origin/v13/dev' into v14/dev
2024-09-04 14:20:43 +02:00
Bjarke Berg
79080ffa93
Updated nuget packages and take a explicit dependency on Microsoft.IdentityModel.JsonWebTokens ( #16935 )
2024-08-21 10:25:39 +02:00
Bjarke Berg
212b2c999f
Updated to lastest nuget minor or patch versions ( #16871 )
2024-08-07 10:17:00 +02:00
Bjarke Berg
4cd2f4637b
Updated nuget packages ( #16861 )
2024-08-05 11:23:21 +02:00
Bjarke Berg
3c34eaf739
Updated nuget packages
2024-06-25 11:20:52 +02:00
Bjarke Berg
3c3d9269ca
Merge remote-tracking branch 'refs/remotes/origin/v13/dev' into v14/dev
...
# Conflicts:
# Directory.Packages.props
2024-06-25 10:34:20 +02:00
Nikolaj Geisle
a686ba2a0e
V13: Update nuget packages ( #16616 )
...
* Update nuget packages
* Fix Imagesharp 2
---------
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2024-06-19 07:50:52 +02:00
Bjarke Berg
aabb5b7c48
Updated nuget packages ( #16349 )
2024-05-23 10:41:28 +02:00
Ronald Barendse
e680be506f
v14: Update ImageSharp and MailKit dependencies ( #16061 )
...
* Remove duplicate PackageReferences
* Update ImageSharp dependencies
* Update MailKit dependency to 4.5.0
2024-04-16 11:12:05 +02:00
Ronald Barendse
80c5d28316
v14: Update .NET dependencies to 8.0.4 ( #16031 )
...
* Update .NET dependencies to 8.0.4
* Update StyleCop.Analyzers to 1.2.0-beta.556
2024-04-10 21:32:58 +02:00
Bjarke Berg
fcda25af50
Premigrations + Updated NuGet Dependencies ( #15987 )
...
* Updated nuget packages + added migrations for OpenIddict - Currently can only be executed using unatttended installs
* Added new Premigration concept - Migrations that always runs unattended before other migrations
* Apply suggestions from code review
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
---------
Co-authored-by: Zeegaan <skrivdetud@gmail.com >
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
2024-04-10 12:30:30 +02:00
Bjarke Berg
1011a2c1a6
Merge
2024-03-15 15:35:08 +01:00
Bjarke Berg
d82e262e13
Update imagesharp 3
2024-03-15 08:22:53 +01:00
Mole
9cb1d66b10
V14: Remove Newtonsoft from packed projects ( #15811 )
...
* Migrate ObjectJsonExtensions
* Use more generic exception to not use Newtonsoft
It should matter if it's a JsonReaderException, if we can't read we can't read
* Remove obsoleted constructors
* Use more generic exception in ContentValueSetBuilder
* Fix constructors
* Remove UdiRangeJsonConverter
* Remove more legacy newtonsoft stuff
* Migrate away from newtonsoft in CacheInstructionService
* Remove unused model binders
* Remove more newtonsoft
* Remove newtonsoft from DatabaseServerMessenger
* Remove now irrelevant benchmark
* Remove the usage of Newtonsoft from ImageCropperTemplateCoreExtensions
The value converter will never return JObject, JsonDocument, or JsonNode
* Remove usages of newtonsoft in ComplexPropertyEditorContentNotificationHandler
JTokens are no longer returned, so we don't need to check for it
* Remove newtonsoft references
* Re-add newtonsoft dependency to Umbraco.Tests.Common
* Fix package references
* move dependency
---------
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2024-03-01 12:51:21 +01:00
Bjarke Berg
3fea1b441c
Removes more old backoffice files + Smidge! ( #15788 )
...
* Removes lots of files used by the old backoffice and that is not needed for the management api
* A little clean-up
---------
Co-authored-by: kjac <kja@umbraco.dk >
2024-02-28 12:27:54 +01:00
Sven Geusens
ed7b4ce44f
Merge branch 'v13/dev' into v14/dev
...
# Conflicts:
# Directory.Packages.props
# src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
# src/Umbraco.Core/Models/Mapping/ContentPropertyDisplayMapper.cs
# src/Umbraco.Core/Services/DataTypeService.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
# src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
2024-02-21 14:39:41 +01:00
Sven Geusens
129adf2699
Fix excessive datatype load times in propertyValueEditors and backoffice mapping ( #15731 )
...
* Introduced IDataTypeConfigurationCache
* Applied IDataTypeConfigurationCache to Property Editors and display mapping
* Invalidate new cache trough DataTypeConfigurationCacheRefresher
* Improve IDatatype service to use cached int path when fetching by guid (using idkeymap)
---------
Co-authored-by: Sven Geusens <sge@umbraco.dk >
Co-authored-by: Ronald Barendse <ronald@barend.se >
2024-02-21 09:05:44 +01:00
Bjarke Berg
3a71eab1ce
Merge remote-tracking branch 'origin/v14/dev' into v14/dev
2024-02-01 12:17:50 +01:00
Bjarke Berg
9eb36c0234
Merge remote-tracking branch 'origin/v13/dev' into v14/dev
...
# Conflicts:
# Directory.Packages.props
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_0_0/AddMemberPropertiesAsColumns.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_2_0/AddHasAccessToAllLanguagesColumn.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_2_0/AddUserGroup2LanguageTable.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_3_0/AddBlockGridPartialViews.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_4_0/AddBlockGridPartialViews.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_5_0/AddPrimaryKeyConstrainToContentVersionCleanupDtos.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_7_0/MigrateTagsFromNVarcharToNText.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_11_3_0/AddDomainSortOrder.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_11_4_0/AlterKeyValueDataType.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_12_0_0/ResetCache.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_12_0_0/UseNvarcharInsteadOfNText.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_12_1_0/AddOpenIddict.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_12_1_0/TablesIndexesImprovement.cs
# src/Umbraco.Web.UI.Docs/README.md
# src/Umbraco.Web.UI.Docs/gulpfile.js
2024-02-01 11:24:43 +01:00
Bjarke Berg
5940a54585
Updated minor and patch dependencies. ( #15619 )
2024-01-22 15:40:26 +01:00
Bjarke Berg
9811eaebeb
Post merge fix
2024-01-13 20:47:16 +01:00
Bjarke Berg
baf29649c9
Move package to central
2023-12-14 08:42:20 +01:00
Bjarke Berg
f8dda5a7b5
Post merge fixes
2023-12-13 16:25:28 +01:00
Bjarke Berg
95094361cc
Merge remote-tracking branch 'origin/v13/dev' into v14/dev
...
# Conflicts:
# Directory.Packages.props
# build/azure-pipelines.yml
# src/Umbraco.Cms.Api.Delivery/Handlers/InitializeMemberApplicationNotificationHandler.cs
# src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
# src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Models/Blocks/BlockListEditorDataConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockListPropertyEditorBase.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueCreator.cs
# tests/Directory.Packages.props
# tests/Umbraco.Tests.AcceptanceTest/package.json
# tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts
# tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/helpLinks.spec.ts
# tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs
# version.json
2023-12-13 15:34:22 +01:00
Ronald Barendse
9e96bba9bc
Disable transitive package version pinning ( #15406 )
...
* Disable transitive package version pinning
* Take top-level dependencies on Azure.Identity and System.Net.Http
* Take top-level dependencies on System.Security.Cryptography.Xml and System.Text.RegularExpressions
2023-12-08 15:00:18 +01:00
Ronald Barendse
8fefca557f
Improve Central Package Management, update dependencies and fix package validation/MSBuild warnings ( #15362 )
...
* Use version overrides for ImageSharp 2
* Move Directory.Packages.props to root, use GlobalPackageReference and replace Microsoft.CSharp with Microsoft.CodeAnalysis.CSharp
* Replace NPoco.SqlServer with NPoco and remove unused System dependencies
* Fix package validation and MSBuild warnings
* Add nuget.config and enable package source mapping
* Remove explicitly set C# language version
* Add empty Directory.Packages.props file for acceptance test
* Downgrade SixLabors.ImageSharp back to 3.0.2 because of breaking changes
* Update ImageSharp/ImageSharp.Web to 3.1.0 and use ComputeHMAC
2023-12-06 08:19:46 +01:00
