Skip to content

Commit

Permalink
feature: Umbraco v15 support
Browse files Browse the repository at this point in the history
  • Loading branch information
jcdcdev committed Nov 17, 2024
1 parent 33ecd69 commit a0de97b
Show file tree
Hide file tree
Showing 80 changed files with 974 additions and 838 deletions.
3 changes: 1 addition & 2 deletions src/Umbraco.Community.DataProtection.TestSite/Composer.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Community.DataProtection.Composing;

namespace TestSite;
namespace Umbraco.Community.DataProtection.TestSite;

public class Composer : IComposer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="15.0.0-rc3" />
<!-- <PackageReference Include="uSync" Version="15.0.0"/>-->
<PackageReference Include="Umbraco.Cms" Version="[15.0.0,16.0.0)" />
<PackageReference Include="uSync" Version="15.0.1"/>
</ItemGroup>

<ItemGroup>
Expand Down
1,151 changes: 633 additions & 518 deletions src/Umbraco.Community.DataProtection.TestSite/packages.lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,30 @@
"contentData": [
{
"contentTypeKey": "870f5419-2326-4d17-9fc5-77e2216a6c66",
"key": "00000000-0000-0000-0000-000000000000",
"udi": "umb://element/ee9c2d2c06034660a89a5998ada048cc",
"values": [],
"headline": "Hello"
}
],
"settingsData": [],
"expose": [
{
"contentKey": "00000000-0000-0000-0000-000000000000",
"culture": null,
"segment": null
}
],
"Layout": {
"Umbraco.BlockGrid": [
{
"contentUdi": "umb://element/ee9c2d2c06034660a89a5998ada048cc",
"settingsUdi": null,
"areas": [],
"columnSpan": 12,
"contentKey": "ee9c2d2c-0603-4660-a89a-5998ada048cc",
"contentUdi": null,
"rowSpan": 1,
"areas": []
"settingsKey": null,
"settingsUdi": null
}
]
}
Expand All @@ -45,19 +56,30 @@
"contentData": [
{
"contentTypeKey": "870f5419-2326-4d17-9fc5-77e2216a6c66",
"key": "00000000-0000-0000-0000-000000000000",
"udi": "umb://element/fa032696b38a4d388e7c27575e680c38",
"values": [],
"headline": "Hello"
}
],
"settingsData": [],
"expose": [
{
"contentKey": "00000000-0000-0000-0000-000000000000",
"culture": null,
"segment": null
}
],
"Layout": {
"Umbraco.BlockGrid": [
{
"contentUdi": "umb://element/fa032696b38a4d388e7c27575e680c38",
"settingsUdi": null,
"areas": [],
"columnSpan": 12,
"contentKey": "fa032696-b38a-4d38-8e7c-27575e680c38",
"contentUdi": null,
"rowSpan": 1,
"areas": []
"settingsKey": null,
"settingsUdi": null
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+1180296
// Umbraco.ModelsBuilder.Embedded v15.0.0+76ed170
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
Expand All @@ -23,7 +23,7 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
public partial interface IBasePage : IPublishedElement
{
/// <summary>Grid Content</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GridContent { get; }
}
Expand All @@ -34,15 +34,15 @@ public partial class BasePage : PublishedElementModel, IBasePage
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const string ModelTypeAlias = "basePage";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<BasePage, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
Expand All @@ -62,13 +62,13 @@ public BasePage(IPublishedElement content, IPublishedValueFallback publishedValu
///<summary>
/// Grid Content
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("gridContent")]
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GridContent => GetGridContent(this, _publishedValueFallback);

/// <summary>Static getter for Grid Content</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GetGridContent(IBasePage that, IPublishedValueFallback publishedValueFallback) => that.Value<global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel>(publishedValueFallback, "gridContent");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+1180296
// Umbraco.ModelsBuilder.Embedded v15.0.0+76ed170
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
Expand All @@ -24,15 +24,15 @@ public partial class File : PublishedContentModel
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const string ModelTypeAlias = "File";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const PublishedItemType ModelItemType = PublishedItemType.Media;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<File, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
Expand All @@ -52,23 +52,23 @@ public File(IPublishedContent content, IPublishedValueFallback publishedValueFal
///<summary>
/// Size: in bytes
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoBytes")]
public virtual string UmbracoBytes => this.Value<string>(_publishedValueFallback, "umbracoBytes");

///<summary>
/// Type
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoExtension")]
public virtual string UmbracoExtension => this.Value<string>(_publishedValueFallback, "umbracoExtension");

///<summary>
/// File
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoFile")]
public virtual string UmbracoFile => this.Value<string>(_publishedValueFallback, "umbracoFile");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+1180296
// Umbraco.ModelsBuilder.Embedded v15.0.0+76ed170
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
Expand All @@ -24,15 +24,15 @@ public partial class Folder : PublishedContentModel
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const string ModelTypeAlias = "Folder";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const PublishedItemType ModelItemType = PublishedItemType.Media;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<Folder, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+1180296
// Umbraco.ModelsBuilder.Embedded v15.0.0+76ed170
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
Expand All @@ -24,15 +24,15 @@ public partial class Home : PublishedContentModel, IBasePage
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const string ModelTypeAlias = "home";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<Home, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
Expand All @@ -52,7 +52,7 @@ public Home(IPublishedContent content, IPublishedValueFallback publishedValueFal
///<summary>
/// Grid Content
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("gridContent")]
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GridContent => global::Umbraco.Cms.Web.Common.PublishedModels.BasePage.GetGridContent(this, _publishedValueFallback);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// <auto-generated>
// This code was generated by a tool.
//
// Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+1180296
// Umbraco.ModelsBuilder.Embedded v15.0.0+76ed170
//
// Changes to this file will be lost if the code is regenerated.
// </auto-generated>
Expand All @@ -24,15 +24,15 @@ public partial class Image : PublishedContentModel
{
// helpers
#pragma warning disable 0109 // new is redundant
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const string ModelTypeAlias = "Image";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
public new const PublishedItemType ModelItemType = PublishedItemType.Media;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<Image, TValue>> selector)
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
Expand All @@ -52,39 +52,39 @@ public Image(IPublishedContent content, IPublishedValueFallback publishedValueFa
///<summary>
/// Size: in bytes
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoBytes")]
public virtual string UmbracoBytes => this.Value<string>(_publishedValueFallback, "umbracoBytes");

///<summary>
/// Type
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoExtension")]
public virtual string UmbracoExtension => this.Value<string>(_publishedValueFallback, "umbracoExtension");

///<summary>
/// Image
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoFile")]
public virtual global::Umbraco.Cms.Core.PropertyEditors.ValueConverters.ImageCropperValue UmbracoFile => this.Value<global::Umbraco.Cms.Core.PropertyEditors.ValueConverters.ImageCropperValue>(_publishedValueFallback, "umbracoFile");

///<summary>
/// Height: in pixels
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoHeight")]
public virtual string UmbracoHeight => this.Value<string>(_publishedValueFallback, "umbracoHeight");

///<summary>
/// Width: in pixels
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+1180296")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0+76ed170")]
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
[ImplementPropertyType("umbracoWidth")]
public virtual string UmbracoWidth => this.Value<string>(_publishedValueFallback, "umbracoWidth");
Expand Down
Loading

0 comments on commit a0de97b

Please sign in to comment.