Skip to content

Commit

Permalink
Update to Deploy 14.0.0-beta002 and fix breaking changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ronaldbarendse committed May 24, 2024
1 parent d053b44 commit 275c2ec
Show file tree
Hide file tree
Showing 15 changed files with 169 additions and 127 deletions.
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>
<!-- Umbraco packages -->
<ItemGroup>
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="[14.0.0-rc3, 15)" />
<PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[14.0.0-beta001, 15)" />
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="[14.0.0-rc4, 15)" />
<PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[14.0.0-beta002, 15)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected ContentPickerReplaceDataTypeArtifactMigratorBase(string fromEditorAlia
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object?>? MigrateConfiguration(IDictionary<string, object?> configuration)
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
{
if (configuration.TryGetValue("startNodeId", out var startNodeIdValue) &&
(startNodeIdValue?.ToString() is not string startNodeIdString || !UdiParser.TryParse(startNodeIdString, out _)))
Expand All @@ -33,6 +33,6 @@ protected ContentPickerReplaceDataTypeArtifactMigratorBase(string fromEditorAlia
configuration.Remove("startNodeId");
}

return base.MigrateConfiguration(configuration);
return configuration;
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Semver;
Expand All @@ -22,4 +23,8 @@ public class DateDataTypeArtifactMigrator : ReplaceDataTypeArtifactMigratorBase
public DateDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, Constants.PropertyEditors.Aliases.DateTime, propertyEditors, configurationEditorJsonSerializer)
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Semver;
Expand All @@ -22,4 +23,8 @@ public class MemberPicker2DataTypeArtifactMigrator : ReplaceDataTypeArtifactMigr
public MemberPicker2DataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, Constants.PropertyEditors.Aliases.MemberPicker, propertyEditors, configurationEditorJsonSerializer)
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public MultiNodeTreePicker2DataTypeArtifactMigrator(PropertyEditorCollection pro
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object?>? MigrateConfiguration(IDictionary<string, object?> configuration)
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
{
if (configuration.TryGetValue("startNode", out var startNodeValue) &&
startNodeValue is JsonObject startNode &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Text.Json.Nodes;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Semver;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Deploy.Infrastructure.Artifacts;
Expand All @@ -16,13 +17,14 @@ public class MultiNodeTreePickerDataTypeArtifactMigrator : DataTypeConfiguration
/// <summary>
/// Initializes a new instance of the <see cref="MultiNodeTreePickerDataTypeArtifactMigrator" /> class.
/// </summary>
/// <param name="propertyEditors">The property editors.</param>
/// <param name="configurationEditorJsonSerializer">The configuration editor JSON serializer.</param>
public MultiNodeTreePickerDataTypeArtifactMigrator(IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, configurationEditorJsonSerializer)
public MultiNodeTreePickerDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, propertyEditors, configurationEditorJsonSerializer)
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object?>? MigrateConfiguration(IDictionary<string, object?> fromConfiguration)
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> fromConfiguration)
{
if (fromConfiguration.TryGetValue("startNode", out var startNodeValue) &&
startNodeValue is JsonObject startNode &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Semver;
Expand All @@ -22,4 +23,8 @@ public class NoEditDataTypeArtifactMigrator : ReplaceDataTypeArtifactMigratorBas
public NoEditDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, Constants.PropertyEditors.Aliases.Label, propertyEditors, configurationEditorJsonSerializer)
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
Expand All @@ -20,4 +21,8 @@ public class RelatedLinks2DataTypeArtifactMigrator : MultiUrlPickerReplaceDataTy
public RelatedLinks2DataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, propertyEditors, configurationEditorJsonSerializer)
{ }

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
Expand All @@ -20,4 +21,8 @@ public class RelatedLinksDataTypeArtifactMigrator : MultiUrlPickerReplaceDataTyp
public RelatedLinksDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, propertyEditors, configurationEditorJsonSerializer)
{ }

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Semver;
Expand All @@ -22,4 +23,8 @@ public class TextboxDataTypeArtifactMigrator : ReplaceDataTypeArtifactMigratorBa
public TextboxDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, Constants.PropertyEditors.Aliases.TextBox, propertyEditors, configurationEditorJsonSerializer)
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Semver;
Expand All @@ -22,4 +23,8 @@ public class TextboxMultipleDataTypeArtifactMigrator : ReplaceDataTypeArtifactMi
public TextboxMultipleDataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, Constants.PropertyEditors.Aliases.TextArea, propertyEditors, configurationEditorJsonSerializer)
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Semver;
Expand All @@ -20,6 +21,10 @@ public class TinyMCEv3DataTypeArtifactMigrator : ReplaceDataTypeArtifactMigrator
/// <param name="propertyEditors">The property editors.</param>
/// <param name="configurationEditorJsonSerializer">The configuration editor JSON serializer.</param>
public TinyMCEv3DataTypeArtifactMigrator(PropertyEditorCollection propertyEditors, IConfigurationEditorJsonSerializer configurationEditorJsonSerializer)
: base(FromEditorAlias, Constants.PropertyEditors.Aliases.TinyMce, propertyEditors, configurationEditorJsonSerializer)
: base(FromEditorAlias, Constants.PropertyEditors.Aliases.RichText, propertyEditors, configurationEditorJsonSerializer)
=> MaxVersion = new SemVersion(3, 0, 0);

/// <inheritdoc />
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
=> configuration;
}
68 changes: 34 additions & 34 deletions src/Umbraco.Deploy.Contrib/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
"Umbraco.Cms.Web.Common": {
"type": "Direct",
"requested": "[14.0.0-rc3, 15.0.0)",
"resolved": "14.0.0-rc3",
"contentHash": "ffzPrl+BsXtoDMKbs/mZ3glL0lBBlVx9VOq6uasD/3TPSamFvsBuNNCKO+5SLDcpHcuxgBFdvdqc/8PT0tJILQ==",
"requested": "[14.0.0-rc4, 15.0.0)",
"resolved": "14.0.0-rc4",
"contentHash": "RDLQfT7xFKLDlrIuY/glqZun/5sv7ousypNu7pMYAZUOw0GyDmcU4id/m5PwaUcvT3n37/UD/GYankVXiXxWsg==",
"dependencies": {
"Asp.Versioning.Mvc": "8.1.0",
"Asp.Versioning.Mvc.ApiExplorer": "8.1.0",
Expand All @@ -31,8 +31,8 @@
"Serilog.AspNetCore": "8.0.1",
"System.Net.Http": "4.3.4",
"System.Text.RegularExpressions": "4.3.1",
"Umbraco.Cms.Examine.Lucene": "[14.0.0-rc3, 15.0.0)",
"Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-rc3, 15.0.0)"
"Umbraco.Cms.Examine.Lucene": "[14.0.0-rc4, 15.0.0)",
"Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-rc4, 15.0.0)"
}
},
"Umbraco.Code": {
Expand All @@ -46,14 +46,14 @@
},
"Umbraco.Deploy.Infrastructure": {
"type": "Direct",
"requested": "[14.0.0-beta001, 15.0.0)",
"resolved": "14.0.0-beta001",
"contentHash": "rHwuzxM6VzGCr5zY24qdwnil0SWUWhoZD9TxKzaweu3Cj8PIxXVgoMwxiEjPDcA80GHpxIJC+6YmTntf9Pclnw==",
"requested": "[14.0.0-beta002, 15.0.0)",
"resolved": "14.0.0-beta002",
"contentHash": "RTLUNW1x520J4mK8doHkjnmyCpWV4JJIL2ZDBbbQsQwwqdZuaWDz7znDHlstk+9asq+7xtTdvMlAH3xzL/4lxg==",
"dependencies": {
"Umbraco.Cms.Api.Common": "[14.0.0-rc3, 15.0.0)",
"Umbraco.Cms.Api.Management": "[14.0.0-rc3, 15.0.0)",
"Umbraco.Cms.Web.Common": "[14.0.0-rc3, 15.0.0)",
"Umbraco.Deploy.Core": "[14.0.0-beta001, 15.0.0)"
"Umbraco.Cms.Api.Common": "[14.0.0-rc4, 15.0.0)",
"Umbraco.Cms.Api.Management": "[14.0.0-rc4, 15.0.0)",
"Umbraco.Cms.Web.Common": "[14.0.0-rc4, 15.0.0)",
"Umbraco.Deploy.Core": "[14.0.0-beta002, 15.0.0)"
}
},
"Umbraco.GitVersioning.Extensions": {
Expand Down Expand Up @@ -2531,33 +2531,33 @@
},
"Umbraco.Cms.Api.Common": {
"type": "Transitive",
"resolved": "14.0.0-rc3",
"contentHash": "d7DL7vqQpiof9hBwTFo0QLhXSfcwOZA6/uvtMPV4OoCa9oMO1Bi5VgiMcNlT5H9LOSxHsyEQturXJ6HB07rb4w==",
"resolved": "14.0.0-rc4",
"contentHash": "jepdicBoU3v0pPwcApJZkgrQ2dx5xX2h+6d2xc76t4th2Oala7Tje5NGRULC80jyhpOliVqceEAXvWw7exJBbg==",
"dependencies": {
"Asp.Versioning.Mvc": "8.1.0",
"Asp.Versioning.Mvc.ApiExplorer": "8.1.0",
"OpenIddict.Abstractions": "5.4.0",
"OpenIddict.AspNetCore": "5.4.0",
"Swashbuckle.AspNetCore": "6.5.0",
"Umbraco.Cms.Core": "[14.0.0-rc3, 15.0.0)",
"Umbraco.Cms.Web.Common": "[14.0.0-rc3, 15.0.0)"
"Umbraco.Cms.Core": "[14.0.0-rc4, 15.0.0)",
"Umbraco.Cms.Web.Common": "[14.0.0-rc4, 15.0.0)"
}
},
"Umbraco.Cms.Api.Management": {
"type": "Transitive",
"resolved": "14.0.0-rc3",
"contentHash": "+PhHb0o1saQBhzGPtW5MtsMHDzyAmrfENbNqUpCW1aJdG9N922BHmg3io0DkNefzEV258wVwBAP9BrFt6DZbZw==",
"resolved": "14.0.0-rc4",
"contentHash": "2gv40HikYvmSSD9wMrfx+sxEkXbuk5QQakkDHBWuYvGgPJ8rTSnKVfi939zZEyIN2lF7q6Udnh+pzbgaf0Vgww==",
"dependencies": {
"JsonPatch.Net": "3.0.0",
"Swashbuckle.AspNetCore": "6.5.0",
"Umbraco.Cms.Api.Common": "[14.0.0-rc3, 15.0.0)",
"Umbraco.Cms.Infrastructure": "[14.0.0-rc3, 15.0.0)"
"Umbraco.Cms.Api.Common": "[14.0.0-rc4, 15.0.0)",
"Umbraco.Cms.Infrastructure": "[14.0.0-rc4, 15.0.0)"
}
},
"Umbraco.Cms.Core": {
"type": "Transitive",
"resolved": "14.0.0-rc3",
"contentHash": "Ap1fQDnUigRRxyD5uN9VPGWPZwv1i8HNp0NeHLwbQ8jvnwmvBhAgq+xxeOiruMOpu8SbYE3+AIDG3BGUTydBlg==",
"resolved": "14.0.0-rc4",
"contentHash": "pbRM2noejUR6UtxAt06zvmdILUYCxuGT58AdHgVa8WLDFG83C6LD0PGjWY1ehZlxZ/jbC9MSSllZxXYark3wow==",
"dependencies": {
"Microsoft.Extensions.Caching.Abstractions": "8.0.0",
"Microsoft.Extensions.Caching.Memory": "8.0.0",
Expand All @@ -2574,18 +2574,18 @@
},
"Umbraco.Cms.Examine.Lucene": {
"type": "Transitive",
"resolved": "14.0.0-rc3",
"contentHash": "SPjeiGjg7b+vJsCuOkUNt41Fhz3qXaE2Xeb45mrYMjlxi0FzmH/WTydLeeK0dfF08SsI7Luo8rLHwBGlN17nKg==",
"resolved": "14.0.0-rc4",
"contentHash": "ikgT77JGFoYAF5hnfeeyVjVYLfy7l8GXT6KW8FkOBgQkDMsn0vUd7UOnckpueDb2Y9bwDjxCmgdYC6KBrx/GKQ==",
"dependencies": {
"Examine": "3.2.0",
"System.Security.Cryptography.Xml": "8.0.0",
"Umbraco.Cms.Infrastructure": "[14.0.0-rc3, 15.0.0)"
"Umbraco.Cms.Infrastructure": "[14.0.0-rc4, 15.0.0)"
}
},
"Umbraco.Cms.Infrastructure": {
"type": "Transitive",
"resolved": "14.0.0-rc3",
"contentHash": "Ck43bLAE/IYZXD5EuCYCfN+knNtE0Q7Pk+O/xAt8DpSVQ05QRpnkJJeeHLwyAHRld/6jEfDT8zFUemKsA1mKnw==",
"resolved": "14.0.0-rc4",
"contentHash": "+9klhvBCQhqFgH6ZI6nrsicNwTuz0vb+eMquhLVXj/XTsHCYKxuu33yCDTLdN/1mAkCYpQfx/asGQbyPRxXBRw==",
"dependencies": {
"Examine.Core": "3.2.0",
"HtmlAgilityPack": "1.11.60",
Expand All @@ -2611,19 +2611,19 @@
"Serilog.Sinks.Async": "1.5.0",
"Serilog.Sinks.File": "5.0.0",
"Serilog.Sinks.Map": "1.0.2",
"Umbraco.Cms.Core": "[14.0.0-rc3, 15.0.0)",
"Umbraco.Cms.Core": "[14.0.0-rc4, 15.0.0)",
"ncrontab": "3.3.3"
}
},
"Umbraco.Cms.PublishedCache.NuCache": {
"type": "Transitive",
"resolved": "14.0.0-rc3",
"contentHash": "PJKsklf1aPlmNc78dkyfqC58GY95SCGfv70bR9p48ZMSsKYmAL5YP/cH9ORInok5OHmW1SRRZYLBTXpRi2KDyw==",
"resolved": "14.0.0-rc4",
"contentHash": "No3P5+vQSrx0wu5UGJbgEETrNHlEsoUu30b34eYthRzPuiSwNptvy/xtea+B8Ju789Wz52xQNdceseHrS5scQg==",
"dependencies": {
"K4os.Compression.LZ4": "1.3.8",
"MessagePack": "2.5.140",
"Umbraco.CSharpTest.Net.Collections": "15.0.0",
"Umbraco.Cms.Infrastructure": "[14.0.0-rc3, 15.0.0)"
"Umbraco.Cms.Infrastructure": "[14.0.0-rc4, 15.0.0)"
}
},
"Umbraco.CSharpTest.Net.Collections": {
Expand All @@ -2633,10 +2633,10 @@
},
"Umbraco.Deploy.Core": {
"type": "Transitive",
"resolved": "14.0.0-beta001",
"contentHash": "1UiZY2SC6/g0iOF8cOBmy1JgqYIsb443isbwxF5QCeCfa6S+qkLer0Eyy54mIV8VrgCpV0Ewq6kqPx6EI7IBFA==",
"resolved": "14.0.0-beta002",
"contentHash": "RhKy7eWZh7MN9S5Fu5cQcqUr3R6ghaBCeFeGnXRsEFv2iere5+L4T5LgWaQcrWX7df4IYsiXf5ziQ70uauwA7w==",
"dependencies": {
"Umbraco.Cms.Core": "[14.0.0-rc3, 15.0.0)"
"Umbraco.Cms.Core": "[14.0.0-rc4, 15.0.0)"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
<!-- Umbraco packages -->
<ItemGroup>
<PackageVersion Include="Umbraco.Cms.Tests" Version="14.0.0-rc3" />
<PackageVersion Include="Umbraco.Cms.Tests" Version="14.0.0-rc4" />
</ItemGroup>
<!-- Third-party packages -->
<ItemGroup>
Expand Down
Loading

0 comments on commit 275c2ec

Please sign in to comment.