From ba12d60440b42f8c5da395c4f3aef522565acc1e Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Fri, 13 Sep 2024 14:44:13 +0200 Subject: [PATCH 1/3] Updated package and .NET version, CMS and Deploy dependencies to 15 previews. --- Directory.Build.props | 7 ++++--- Directory.Packages.props | 6 +++--- azure-pipelines.yml | 1 + global.json | 7 ++++--- version.json | 4 ++-- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8c823c5..6edf8b1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net8.0 + net9.0 Umbraco HQ Umbraco Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy')) @@ -27,8 +27,9 @@ false - true - 14.0.0 + + false + 15.0.0 true true diff --git a/Directory.Packages.props b/Directory.Packages.props index fefe33c..e37071e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,12 +7,12 @@ - + - - + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2708202..f406cdc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -61,6 +61,7 @@ stages: displayName: Use .NET SDK from global.json inputs: useGlobalJson: true + includePreviewVersions: true # Cache and restore NuGet packages - task: Cache@2 diff --git a/global.json b/global.json index 501e79a..9c2a135 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "8.0.100", - "rollForward": "latestFeature" + "version": "9.0.100-rc.1.24452.12", + "rollForward": "latestFeature", + "allowPrerelease": true } -} \ No newline at end of file +} diff --git a/version.json b/version.json index 8da3830..d31fdbb 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.2.0-alpha", + "version": "15.0.0-rc1", "assemblyVersion": { "precision": "build" }, @@ -22,4 +22,4 @@ "tagName": "release-{version}", "branchName": "release/{version}" } -} \ No newline at end of file +} From 8ed8be1352632665924c56c8879212fe6c568a0a Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Mon, 7 Oct 2024 08:10:46 +0200 Subject: [PATCH 2/3] Update to CMS RC1. --- Directory.Packages.props | 4 ++-- azure-pipelines.yml | 1 - tests/Directory.Packages.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e37071e..130f9b1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,7 +12,7 @@ - - + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f406cdc..2708202 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -61,7 +61,6 @@ stages: displayName: Use .NET SDK from global.json inputs: useGlobalJson: true - includePreviewVersions: true # Cache and restore NuGet packages - task: Cache@2 diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index f4e046c..8e45e0e 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -4,7 +4,7 @@ - + From df822b5d9004f61ea3a0fc5848eae732f9e4be5a Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Mon, 14 Oct 2024 10:44:15 +0200 Subject: [PATCH 3/3] Update to Deploy 15.0.0-rc1 and fix breaking changes --- Directory.Packages.props | 6 +- .../DocTypeGridEditorPropertyTypeMigrator.cs | 14 +++-- ...eckBoxListPropertyValueArtifactMigrator.cs | 29 ---------- ...stFlexiblePropertyValueArtifactMigrator.cs | 29 ---------- .../PrevaluePropertyTypeMigratorBase.cs | 13 +++-- ...evaluePropertyValueArtifactMigratorBase.cs | 58 ------------------- ...ButtonListPropertyValueArtifactMigrator.cs | 29 ---------- .../MediaPickerDataTypeArtifactMigrator.cs | 32 ---------- ...NodeTreePicker2DataTypeArtifactMigrator.cs | 18 ------ ...iNodeTreePickerDataTypeArtifactMigrator.cs | 30 ---------- tests/Directory.Packages.props | 6 +- .../Umbraco.Deploy.Contrib.Tests.csproj | 3 - 12 files changed, 23 insertions(+), 244 deletions(-) delete mode 100644 src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyValueArtifactMigrator.cs delete mode 100644 src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyValueArtifactMigrator.cs delete mode 100644 src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyValueArtifactMigratorBase.cs delete mode 100644 src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyValueArtifactMigrator.cs delete mode 100644 src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MediaPickerDataTypeArtifactMigrator.cs delete mode 100644 src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePickerDataTypeArtifactMigrator.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 130f9b1..0b7a029 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,14 +5,14 @@ - + - - + + diff --git a/src/Umbraco.Deploy.Contrib/Migrators/DocTypeGridEditorPropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/DocTypeGridEditorPropertyTypeMigrator.cs index 298b41a..ea890ae 100644 --- a/src/Umbraco.Deploy.Contrib/Migrators/DocTypeGridEditorPropertyTypeMigrator.cs +++ b/src/Umbraco.Deploy.Contrib/Migrators/DocTypeGridEditorPropertyTypeMigrator.cs @@ -4,6 +4,8 @@ using System.Text.Json; using System.Text.Json.Nodes; using System.Text.Json.Serialization; +using System.Threading; +using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Umbraco.Cms.Core; @@ -40,14 +42,14 @@ public DocTypeGridEditorPropertyTypeMigrator(ILogger l => _jsonSerializer = jsonSerializer; /// - protected override BlockItemData? MigrateGridControl(GridValue.GridControl gridControl, BlockGridConfiguration configuration, IContextCache contextCache) + protected override async Task MigrateGridControlAsync(GridValue.GridControl gridControl, BlockGridConfiguration configuration, IContextCache contextCache, CancellationToken cancellationToken = default) { if (TryDeserialize(gridControl.Value, out DocTypeGridEditorValue? value)) { - return MigrateGridControl(value, configuration, contextCache); + return await MigrateGridControlAsync(value, configuration, contextCache).ConfigureAwait(false); } - return base.MigrateGridControl(gridControl, configuration, contextCache); + return await base.MigrateGridControlAsync(gridControl, configuration, contextCache, cancellationToken).ConfigureAwait(false); } /// @@ -57,11 +59,11 @@ public DocTypeGridEditorPropertyTypeMigrator(ILogger l /// The configuration. /// The context cache. /// - /// The block item data, or null if migration should be skipped. + /// A task that represents the asynchronous operation. The task result contains the block item data, or null if migration should be skipped. /// - protected virtual BlockItemData? MigrateGridControl(DocTypeGridEditorValue value, BlockGridConfiguration configuration, IContextCache contextCache) + protected virtual async Task MigrateGridControlAsync(DocTypeGridEditorValue value, BlockGridConfiguration configuration, IContextCache contextCache) { - IContentType contentType = GetContentType(value.ContentTypeAlias, configuration, contextCache) + IContentType contentType = await GetContentTypeAsync(value.ContentTypeAlias, configuration, contextCache).ConfigureAwait(false) ?? throw new InvalidOperationException($"Migrating legacy grid failed, because content type with alias '{value.ContentTypeAlias}' could not be found (in the Block Grid configuration)."); return new BlockItemData() diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyValueArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyValueArtifactMigrator.cs deleted file mode 100644 index b430ea0..0000000 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/CheckBoxListPropertyValueArtifactMigrator.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Serialization; -using Umbraco.Cms.Core.Services; -using Umbraco.Deploy.Core.Connectors.ServiceConnectors.Wrappers; -using Umbraco.Deploy.Infrastructure.Artifacts.Content; - -namespace Umbraco.Deploy.Contrib.Migrators.Legacy; - -/// -/// Migrates the using the editor from the containing prevalues (seperated by ) from Umbraco 7 to a JSON array. -/// -[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and CheckBoxListPropertyTypeMigrator instead. This class will be removed in a future version.")] -public class CheckBoxListPropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase -{ - /// - protected override bool Multiple => true; - - /// - /// Initializes a new instance of the class. - /// - /// The content type service. - /// The media type service. - /// The member type service. - /// The JSON serializer. - public CheckBoxListPropertyValueArtifactMigrator(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, IJsonSerializer jsonSerializer) - : base(Constants.PropertyEditors.Aliases.CheckBoxList, contentTypeService, mediaTypeService, memberTypeService, jsonSerializer) - { } -} diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyValueArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyValueArtifactMigrator.cs deleted file mode 100644 index 1395f7d..0000000 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/DropDownListFlexiblePropertyValueArtifactMigrator.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Serialization; -using Umbraco.Cms.Core.Services; -using Umbraco.Deploy.Core.Connectors.ServiceConnectors.Wrappers; -using Umbraco.Deploy.Infrastructure.Artifacts.Content; - -namespace Umbraco.Deploy.Contrib.Migrators.Legacy; - -/// -/// Migrates the using the editor from the containing prevalues (seperated by ) from Umbraco 7 to a JSON array. -/// -[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and DropDownListFlexiblePropertyTypeMigrator instead. This class will be removed in a future version.")] -public class DropDownListFlexiblePropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase -{ - /// - protected override bool Multiple => true; - - /// - /// Initializes a new instance of the class. - /// - /// The content type service. - /// The media type service. - /// The member type service. - /// The JSON serializer. - public DropDownListFlexiblePropertyValueArtifactMigrator(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, IJsonSerializer jsonSerializer) - : base(Constants.PropertyEditors.Aliases.DropDownListFlexible, contentTypeService, mediaTypeService, memberTypeService, jsonSerializer) - { } -} diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyTypeMigratorBase.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyTypeMigratorBase.cs index 6341912..14d0dae 100644 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyTypeMigratorBase.cs +++ b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyTypeMigratorBase.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; using Umbraco.Cms.Core.Deploy; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Serialization; @@ -8,7 +10,7 @@ namespace Umbraco.Deploy.Contrib.Migrators.Legacy; /// -/// Migrates the property value containing prevalues (seperated by ) from Umbraco 7 to a single value or JSON array. +/// Migrates the property value containing pre-values (separated by ) from Umbraco 7 to a single value or JSON array. /// public abstract class PrevaluePropertyTypeMigratorBase : PropertyTypeMigratorBase { @@ -18,10 +20,10 @@ public abstract class PrevaluePropertyTypeMigratorBase : PropertyTypeMigratorBas private readonly IJsonSerializer _jsonSerializer; /// - /// Gets a value indicating whether the property type stores multiple prevalues as a JSON array or single value. + /// Gets a value indicating whether the property type stores multiple pre-values as a JSON array or single value. /// /// - /// true if multiple prevalues are stored as a JSON array; otherwise, false. + /// true if multiple pre-values are stored as a JSON array; otherwise, false. /// protected abstract bool Multiple { get; } @@ -45,7 +47,10 @@ protected PrevaluePropertyTypeMigratorBase(string fromEditorAlias, string toEdit => _jsonSerializer = jsonSerializer; /// - public override object? Migrate(IPropertyType propertyType, object? value, IDictionary propertyEditorAliases, IContextCache contextCache) + public override Task MigrateAsync(IPropertyType propertyType, object? value, IDictionary propertyEditorAliases, IContextCache contextCache, CancellationToken cancellationToken = default) + => Task.FromResult(Migrate(propertyType)); + + private object? Migrate(object? value) { if (value is not string stringValue) { diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyValueArtifactMigratorBase.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyValueArtifactMigratorBase.cs deleted file mode 100644 index 807c762..0000000 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/PrevaluePropertyValueArtifactMigratorBase.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using Umbraco.Cms.Core.Semver; -using Umbraco.Cms.Core.Serialization; -using Umbraco.Cms.Core.Services; -using Umbraco.Deploy.Core.Connectors.ServiceConnectors.Wrappers; -using Umbraco.Deploy.Infrastructure.Artifacts.Content; -using Umbraco.Deploy.Infrastructure.Migrators; - -namespace Umbraco.Deploy.Contrib.Migrators.Legacy; - -/// -/// Migrates the using the specified editor alias from the containing prevalues (seperated by ) from Umbraco 7 to a single value or JSON array. -/// -[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and property type migrators instead. This class will be removed in a future version.")] -public abstract class PrevaluePropertyValueArtifactMigratorBase : PropertyValueArtifactMigratorBase -{ - private const string Delimiter = ";;"; - - private readonly IJsonSerializer _jsonSerializer; - - /// - /// Gets a value indicating whether the property stored multiple prevalues as a JSON array or single value. - /// - /// - /// true if multiple prevalues are stored as a JSON array; otherwise, false. - /// - protected abstract bool Multiple { get; } - - /// - /// Initializes a new instance of the class. - /// - /// The editor alias. - /// The content type service. - /// The media type service. - /// The member type service. - /// The JSON serializer. - public PrevaluePropertyValueArtifactMigratorBase(string editorAlias, IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, IJsonSerializer jsonSerializer) - : base(editorAlias, contentTypeService, mediaTypeService, memberTypeService) - { - _jsonSerializer = jsonSerializer; - - MaxVersion = new SemVersion(3, 0, 0); - } - - /// - protected override string? Migrate(string? value) - { - var values = value?.Split(new[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries); - if (values is null || values.Length == 0) - { - return null; - } - - return Multiple - ? _jsonSerializer.Serialize(values) - : values[0]; - } -} diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyValueArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyValueArtifactMigrator.cs deleted file mode 100644 index 34f856d..0000000 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/Content/RadioButtonListPropertyValueArtifactMigrator.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Serialization; -using Umbraco.Cms.Core.Services; -using Umbraco.Deploy.Core.Connectors.ServiceConnectors.Wrappers; -using Umbraco.Deploy.Infrastructure.Artifacts.Content; - -namespace Umbraco.Deploy.Contrib.Migrators.Legacy; - -/// -/// Migrates the using the editor from the containing prevalues (seperated by ) from Umbraco 7 to a single value. -/// -[Obsolete("Migrating property values in an artifact migrator does not support nested/recursive properties. Use the PrevalueArtifactMigrator and RadioButtonListPropertyTypeMigrator instead. This class will be removed in a future version.")] -public class RadioButtonListPropertyValueArtifactMigrator : PrevaluePropertyValueArtifactMigratorBase -{ - /// - protected override bool Multiple => false; - - /// - /// Initializes a new instance of the class. - /// - /// The content type service. - /// The media type service. - /// The member type service. - /// The JSON serializer. - public RadioButtonListPropertyValueArtifactMigrator(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, IJsonSerializer jsonSerializer) - : base(Constants.PropertyEditors.Aliases.RadioButtonList, contentTypeService, mediaTypeService, memberTypeService, jsonSerializer) - { } -} diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MediaPickerDataTypeArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MediaPickerDataTypeArtifactMigrator.cs deleted file mode 100644 index c952174..0000000 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MediaPickerDataTypeArtifactMigrator.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Cms.Core.Semver; -using Umbraco.Cms.Core.Serialization; -using Umbraco.Deploy.Core; -using Umbraco.Deploy.Infrastructure.Artifacts; -using Umbraco.Deploy.Infrastructure.Migrators; - -namespace Umbraco.Deploy.Contrib.Migrators.Legacy; - -/// -/// Migrates the to update the editor configuration. -/// -[Obsolete("This has been replaced by ReplaceMediaPickerDataTypeArtifactMigrator and DefaultLegacyDataTypeConfigurationArtifactMigrator in Deploy.")] -public class MediaPickerDataTypeArtifactMigrator : DataTypeConfigurationArtifactMigratorBase -{ - private const string EditorAlias = DeployConstants.PropertyEditors.Legacy.Aliases.MediaPicker; - - /// - /// Initializes a new instance of the class. - /// - /// The property editors. - /// The configuration editor JSON serializer. - public MediaPickerDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer) - : base(EditorAlias, propertyEditors, configurationEditorJsonSerializer) - => MaxVersion = new SemVersion(3, 0, 0); - - /// - protected override IDictionary? MigrateConfiguration(IDictionary fromConfiguration) - => fromConfiguration; -} diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePicker2DataTypeArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePicker2DataTypeArtifactMigrator.cs index 82baa03..660f811 100644 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePicker2DataTypeArtifactMigrator.cs +++ b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePicker2DataTypeArtifactMigrator.cs @@ -1,8 +1,5 @@ -using System; using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core; -using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Serialization; @@ -23,21 +20,6 @@ public class MultiNodeTreePicker2DataTypeArtifactMigrator : LegacyReplaceDataTyp private readonly IMediaTypeService _mediaTypeService; private readonly IMemberTypeService _memberTypeService; - /// - /// Initializes a new instance of the class. - /// - /// The property editors. - /// The configuration editor JSON serializer. - [Obsolete("Please use the constructor taking all parameters. This constructor will be removed in a future version.")] - public MultiNodeTreePicker2DataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer) - : this( - propertyEditors, - configurationEditorJsonSerializer, - StaticServiceProvider.Instance.GetRequiredService(), - StaticServiceProvider.Instance.GetRequiredService(), - StaticServiceProvider.Instance.GetRequiredService()) - { } - /// /// Initializes a new instance of the class. /// diff --git a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePickerDataTypeArtifactMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePickerDataTypeArtifactMigrator.cs deleted file mode 100644 index ac0f369..0000000 --- a/src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MultiNodeTreePickerDataTypeArtifactMigrator.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using Umbraco.Cms.Core; -using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Cms.Core.Semver; -using Umbraco.Cms.Core.Serialization; -using Umbraco.Deploy.Infrastructure.Artifacts; -using Umbraco.Deploy.Infrastructure.Migrators; - -namespace Umbraco.Deploy.Contrib.Migrators.Legacy; - -/// -/// Migrates the to update the editor configuration. -/// -[Obsolete("This has been replaced by DefaultLegacyDataTypeConfigurationArtifactMigrator in Deploy 14.1.0.")] -public class MultiNodeTreePickerDataTypeArtifactMigrator : DataTypeConfigurationArtifactMigratorBase -{ - /// - /// Initializes a new instance of the class. - /// - /// The property editors. - /// The configuration editor JSON serializer. - public MultiNodeTreePickerDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer) - : base(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, propertyEditors, configurationEditorJsonSerializer) - => MaxVersion = new SemVersion(3, 0, 0); - - /// - protected override IDictionary? MigrateConfiguration(IDictionary fromConfiguration) - => fromConfiguration; -} diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index 8e45e0e..df351be 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -9,7 +9,7 @@ - - + + - + \ No newline at end of file diff --git a/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj b/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj index 394b31b..0555307 100644 --- a/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj +++ b/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj @@ -1,9 +1,6 @@ - Major true - false - false