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 50daa79 commit 8070b17
Show file tree
Hide file tree
Showing 74 changed files with 583 additions and 552 deletions.
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="14.2.2" />-->
<PackageReference Include="Umbraco.Cms" Version="[15.0.0,16.0.0)" />
<PackageReference Include="uSync" Version="15.0.1" />
</ItemGroup>

<ItemGroup>
Expand All @@ -26,17 +26,6 @@
<ProjectReference Include="..\UmbracoPackageTemplate\UmbracoPackageTemplate.csproj" />
</ItemGroup>

<ItemGroup>
<_ContentIncludedByDefault Remove="Views\Partials\grid\bootstrap3-fluid.cshtml" />
<_ContentIncludedByDefault Remove="Views\Partials\grid\bootstrap3.cshtml" />
<_ContentIncludedByDefault Remove="Views\Partials\grid\editors\base.cshtml" />
<_ContentIncludedByDefault Remove="Views\Partials\grid\editors\embed.cshtml" />
<_ContentIncludedByDefault Remove="Views\Partials\grid\editors\macro.cshtml" />
<_ContentIncludedByDefault Remove="Views\Partials\grid\editors\media.cshtml" />
<_ContentIncludedByDefault Remove="Views\Partials\grid\editors\rte.cshtml" />
<_ContentIncludedByDefault Remove="Views\Partials\grid\editors\textstring.cshtml" />
</ItemGroup>

<PropertyGroup>
<!-- Razor files are needed for the backoffice to work correctly -->
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,67 +15,109 @@
<Properties>
<gridContent>
<Value><![CDATA[{
"layout": {
"contentData": [
{
"contentTypeKey": "870f5419-2326-4d17-9fc5-77e2216a6c66",
"key": "00000000-0000-0000-0000-000000000000",
"udi": "umb://element/7305d632df054ca58891c543d3e93a00",
"values": [],
"headline": "Welcome \uD83D\uDC4B"
},
{
"contentTypeKey": "e6fe2e86-4f0b-47c1-b4ba-c4beb49943bc",
"key": "00000000-0000-0000-0000-000000000000",
"udi": "umb://element/08b55eaee7494cea880f96b0299602c7",
"values": [],
"richText": "\u003Cp\u003EThis is a test website.\u003C/p\u003E"
},
{
"contentTypeKey": "901f83af-55ea-4687-acde-22a7e99bf52e",
"key": "00000000-0000-0000-0000-000000000000",
"udi": "umb://element/b9b4ff33febf49909e77804b3e4ec6c3",
"values": [],
"image": "[{\u0022key\u0022:\u0022ed1fac46-3ad8-4651-a97a-8c2d67e5bb64\u0022,\u0022mediaKey\u0022:\u0022102b4645-f186-413f-aa26-6a0a3278e001\u0022}]"
},
{
"contentTypeKey": "98b3a50f-1496-4a9d-b863-f150b1032e83",
"key": "00000000-0000-0000-0000-000000000000",
"udi": "umb://element/ca8ed1bd7db64271b39e14249904a729",
"values": []
}
],
"settingsData": [],
"expose": [
{
"contentKey": "00000000-0000-0000-0000-000000000000",
"culture": null,
"segment": null
},
{
"contentKey": "00000000-0000-0000-0000-000000000000",
"culture": null,
"segment": null
},
{
"contentKey": "00000000-0000-0000-0000-000000000000",
"culture": null,
"segment": null
},
{
"contentKey": "00000000-0000-0000-0000-000000000000",
"culture": null,
"segment": null
}
],
"Layout": {
"Umbraco.BlockGrid": [
{
"contentUdi": "umb://element/ca8ed1bd7db64271b39e14249904a729",
"areas": [
{
"key": "b2cb4b71-0b46-4259-b999-811991e2b36d",
"items": [
{
"contentUdi": "umb://element/7305d632df054ca58891c543d3e93a00",
"areas": [],
"columnSpan": 6,
"rowSpan": 1
"contentKey": "7305d632-df05-4ca5-8891-c543d3e93a00",
"contentUdi": null,
"rowSpan": 1,
"settingsKey": null,
"settingsUdi": null
},
{
"contentUdi": "umb://element/08b55eaee7494cea880f96b0299602c7",
"areas": [],
"columnSpan": 6,
"rowSpan": 1
"contentKey": "08b55eae-e749-4cea-880f-96b0299602c7",
"contentUdi": null,
"rowSpan": 1,
"settingsKey": null,
"settingsUdi": null
}
]
],
"key": "b2cb4b71-0b46-4259-b999-811991e2b36d"
},
{
"key": "cf895573-6cf6-4345-89e9-bc68438b03a1",
"items": [
{
"contentUdi": "umb://element/b9b4ff33febf49909e77804b3e4ec6c3",
"areas": [],
"columnSpan": 6,
"rowSpan": 1
"contentKey": "b9b4ff33-febf-4990-9e77-804b3e4ec6c3",
"contentUdi": null,
"rowSpan": 1,
"settingsKey": null,
"settingsUdi": null
}
]
],
"key": "cf895573-6cf6-4345-89e9-bc68438b03a1"
}
],
"columnSpan": 12,
"rowSpan": 1
"contentKey": "ca8ed1bd-7db6-4271-b39e-14249904a729",
"contentUdi": null,
"rowSpan": 1,
"settingsKey": null,
"settingsUdi": null
}
]
},
"contentData": [
{
"contentTypeKey": "870f5419-2326-4d17-9fc5-77e2216a6c66",
"udi": "umb://element/7305d632df054ca58891c543d3e93a00",
"headline": "Welcome \uD83D\uDC4B"
},
{
"contentTypeKey": "e6fe2e86-4f0b-47c1-b4ba-c4beb49943bc",
"udi": "umb://element/08b55eaee7494cea880f96b0299602c7",
"richText": "\u003Cp\u003EThis is a test website.\u003C/p\u003E"
},
{
"contentTypeKey": "901f83af-55ea-4687-acde-22a7e99bf52e",
"udi": "umb://element/b9b4ff33febf49909e77804b3e4ec6c3",
"image": "[{\u0022key\u0022:\u0022ed1fac46-3ad8-4651-a97a-8c2d67e5bb64\u0022,\u0022mediaKey\u0022:\u0022102b4645-f186-413f-aa26-6a0a3278e001\u0022}]"
},
{
"contentTypeKey": "98b3a50f-1496-4a9d-b863-f150b1032e83",
"udi": "umb://element/ca8ed1bd7db64271b39e14249904a729"
}
],
"settingsData": []
}
}]]></Value>
</gridContent>
</Properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9061,7 +9061,7 @@
},
"FontFaceSet": {
"properties": {
"__@toStringTag@1710": {
"__@toStringTag@1713": {
"type": "string"
},
"onloading": {
Expand Down Expand Up @@ -9093,7 +9093,7 @@
}
},
"required": [
"__@toStringTag@1710",
"__@toStringTag@1713",
"onloading",
"onloadingdone",
"onloadingerror",
Expand Down Expand Up @@ -54870,23 +54870,23 @@
},
"Promise<FontFaceSet>": {
"properties": {
"__@toStringTag@1710": {
"__@toStringTag@1713": {
"type": "string"
}
},
"required": [
"__@toStringTag@1710"
"__@toStringTag@1713"
],
"type": "object"
},
"Promise<ServiceWorkerRegistration>": {
"properties": {
"__@toStringTag@1710": {
"__@toStringTag@1713": {
"type": "string"
}
},
"required": [
"__@toStringTag@1710"
"__@toStringTag@1713"
],
"type": "object"
},
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-rc2+ab4364e
// 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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e
// 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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e
// 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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e
// 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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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-rc2+ab4364e")]
[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
Loading

0 comments on commit 8070b17

Please sign in to comment.