feature Umbraco 15 support

jcdcdev · Oct 8, 2024 · 17b77bf · 17b77bf
1 parent 5921095
commit 17b77bf
Show file tree

Hide file tree

Showing 101 changed files with 1,153 additions and 1,336 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,4 +13,5 @@ jobs:
           project-path: src/jcdcdev.Umbraco.ExtendedMarkdownEditor/jcdcdev.Umbraco.ExtendedMarkdownEditor.csproj
           npm-working-dir: src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client
           npm-enabled: true
-          umbraco-version: 14
+          umbraco-version: 15
+          dotnet-version: "9"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,8 @@ jobs:
           project-path: src/jcdcdev.Umbraco.ExtendedMarkdownEditor/jcdcdev.Umbraco.ExtendedMarkdownEditor.csproj
           npm-working-dir: src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client
           npm-enabled: true
-          umbraco-version: 14
+          umbraco-version: 15
+          dotnet-version: "9"
       - name: Release
         uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main
         with:

diff --git a/src/TestSite.14/.gitignore → src/TestSite/.gitignore b/src/TestSite.14/.gitignore → src/TestSite/.gitignore
diff --git a/src/TestSite.14/Program.cs → src/TestSite/Program.cs b/src/TestSite.14/Program.cs → src/TestSite/Program.cs
diff --git a/...estSite.14/Properties/launchSettings.json → src/TestSite/Properties/launchSettings.json b/...estSite.14/Properties/launchSettings.json → src/TestSite/Properties/launchSettings.json
diff --git a/src/TestSite.14/TestSite.14.csproj → src/TestSite/TestSite.csproj b/src/TestSite.14/TestSite.14.csproj → src/TestSite/TestSite.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>TestSite.Fourteen</RootNamespace>
+        <RootNamespace>TestSite</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms" Version="14.2.0"/>
-        <PackageReference Include="uSync" Version="14.0.0-rc4"/>
+        <PackageReference Include="Umbraco.Cms" Version="15.0.0-rc1"/>
+        <!--        <PackageReference Include="uSync" Version="15.0.0"/>-->
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...blockgrid/Components/markdownBlock.cshtml → ...blockgrid/Components/markdownBlock.cshtml b/...blockgrid/Components/markdownBlock.cshtml → ...blockgrid/Components/markdownBlock.cshtml
diff --git a/...ents/umbBlockGridDemoHeadlineBlock.cshtml → ...ents/umbBlockGridDemoHeadlineBlock.cshtml b/...ents/umbBlockGridDemoHeadlineBlock.cshtml → ...ents/umbBlockGridDemoHeadlineBlock.cshtml
diff --git a/...ponents/umbBlockGridDemoImageBlock.cshtml → ...ponents/umbBlockGridDemoImageBlock.cshtml b/...ponents/umbBlockGridDemoImageBlock.cshtml → ...ponents/umbBlockGridDemoImageBlock.cshtml
diff --git a/...ents/umbBlockGridDemoRichTextBlock.cshtml → ...ents/umbBlockGridDemoRichTextBlock.cshtml b/...ents/umbBlockGridDemoRichTextBlock.cshtml → ...ents/umbBlockGridDemoRichTextBlock.cshtml
diff --git a/...bBlockGridDemoTwoColumnLayoutBlock.cshtml → ...bBlockGridDemoTwoColumnLayoutBlock.cshtml b/...bBlockGridDemoTwoColumnLayoutBlock.cshtml → ...bBlockGridDemoTwoColumnLayoutBlock.cshtml
diff --git a/...e.14/Views/Partials/blockgrid/area.cshtml → ...Site/Views/Partials/blockgrid/area.cshtml b/...e.14/Views/Partials/blockgrid/area.cshtml → ...Site/Views/Partials/blockgrid/area.cshtml
diff --git a/....14/Views/Partials/blockgrid/areas.cshtml → ...ite/Views/Partials/blockgrid/areas.cshtml b/....14/Views/Partials/blockgrid/areas.cshtml → ...ite/Views/Partials/blockgrid/areas.cshtml
diff --git a/...4/Views/Partials/blockgrid/default.cshtml → ...e/Views/Partials/blockgrid/default.cshtml b/...4/Views/Partials/blockgrid/default.cshtml → ...e/Views/Partials/blockgrid/default.cshtml
diff --git a/....14/Views/Partials/blockgrid/items.cshtml → ...ite/Views/Partials/blockgrid/items.cshtml b/....14/Views/Partials/blockgrid/items.cshtml → ...ite/Views/Partials/blockgrid/items.cshtml
diff --git a/...4/Views/Partials/blocklist/default.cshtml → ...e/Views/Partials/blocklist/default.cshtml b/...4/Views/Partials/blocklist/default.cshtml → ...e/Views/Partials/blocklist/default.cshtml
diff --git a/src/TestSite.14/Views/Shared/_Layout.cshtml → src/TestSite/Views/Shared/_Layout.cshtml b/src/TestSite.14/Views/Shared/_Layout.cshtml → src/TestSite/Views/Shared/_Layout.cshtml
diff --git a/src/TestSite.14/Views/_ViewImports.cshtml → src/TestSite/Views/_ViewImports.cshtml b/src/TestSite.14/Views/_ViewImports.cshtml → src/TestSite/Views/_ViewImports.cshtml
diff --git a/src/TestSite.14/Views/home.cshtml → src/TestSite/Views/home.cshtml b/src/TestSite.14/Views/home.cshtml → src/TestSite/Views/home.cshtml
diff --git a/src/TestSite.14/appsettings.Development.json → src/TestSite/appsettings.Development.json b/src/TestSite.14/appsettings.Development.json → src/TestSite/appsettings.Development.json
diff --git a/src/TestSite.14/appsettings.json → src/TestSite/appsettings.json b/src/TestSite.14/appsettings.json → src/TestSite/appsettings.json
diff --git a/src/TestSite.14/packages.lock.json → src/TestSite/packages.lock.json b/src/TestSite.14/packages.lock.json → src/TestSite/packages.lock.json
diff --git a/...TestSite.14/uSync/v14/Content/home.config → src/TestSite/uSync/v14/Content/home.config b/...TestSite.14/uSync/v14/Content/home.config → src/TestSite/uSync/v14/Content/home.config
diff --git a/...14/uSync/v14/ContentTypes/basepage.config → ...te/uSync/v14/ContentTypes/basepage.config b/...14/uSync/v14/ContentTypes/basepage.config → ...te/uSync/v14/ContentTypes/basepage.config
diff --git a/...ite.14/uSync/v14/ContentTypes/home.config → ...stSite/uSync/v14/ContentTypes/home.config b/...ite.14/uSync/v14/ContentTypes/home.config → ...stSite/uSync/v14/ContentTypes/home.config
diff --git a/...ync/v14/ContentTypes/markdownblock.config → ...ync/v14/ContentTypes/markdownblock.config b/...ync/v14/ContentTypes/markdownblock.config → ...ync/v14/ContentTypes/markdownblock.config
diff --git a/...ypes/umbblockgriddemoheadlineblock.config → ...ypes/umbblockgriddemoheadlineblock.config b/...ypes/umbblockgriddemoheadlineblock.config → ...ypes/umbblockgriddemoheadlineblock.config
diff --git a/...ntTypes/umbblockgriddemoimageblock.config → ...ntTypes/umbblockgriddemoimageblock.config b/...ntTypes/umbblockgriddemoimageblock.config → ...ntTypes/umbblockgriddemoimageblock.config
diff --git a/...ypes/umbblockgriddemorichtextblock.config → ...ypes/umbblockgriddemorichtextblock.config b/...ypes/umbblockgriddemorichtextblock.config → ...ypes/umbblockgriddemorichtextblock.config
diff --git a/...bblockgriddemotwocolumnlayoutblock.config → ...bblockgriddemotwocolumnlayoutblock.config b/...bblockgriddemotwocolumnlayoutblock.config → ...bblockgriddemotwocolumnlayoutblock.config
diff --git a/.../uSync/v14/DataTypes/ApprovedColor.config → .../uSync/v14/DataTypes/ApprovedColor.config b/.../uSync/v14/DataTypes/ApprovedColor.config → .../uSync/v14/DataTypes/ApprovedColor.config
diff --git a/...Types/BasePageGridContentBlockGrid.config → ...Types/BasePageGridContentBlockGrid.config b/...Types/BasePageGridContentBlockGrid.config → ...Types/BasePageGridContentBlockGrid.config
diff --git a/...4/uSync/v14/DataTypes/CheckboxList.config → ...e/uSync/v14/DataTypes/CheckboxList.config b/...4/uSync/v14/DataTypes/CheckboxList.config → ...e/uSync/v14/DataTypes/CheckboxList.config
diff --git a/.../uSync/v14/DataTypes/ContentPicker.config → .../uSync/v14/DataTypes/ContentPicker.config b/.../uSync/v14/DataTypes/ContentPicker.config → .../uSync/v14/DataTypes/ContentPicker.config
diff --git a/....14/uSync/v14/DataTypes/DatePicker.config → ...ite/uSync/v14/DataTypes/DatePicker.config b/....14/uSync/v14/DataTypes/DatePicker.config → ...ite/uSync/v14/DataTypes/DatePicker.config
diff --git a/...c/v14/DataTypes/DatePickerWithTime.config → ...c/v14/DataTypes/DatePickerWithTime.config b/...c/v14/DataTypes/DatePickerWithTime.config → ...c/v14/DataTypes/DatePickerWithTime.config
diff --git a/...te.14/uSync/v14/DataTypes/Dropdown.config → ...tSite/uSync/v14/DataTypes/Dropdown.config b/...te.14/uSync/v14/DataTypes/Dropdown.config → ...tSite/uSync/v14/DataTypes/Dropdown.config
diff --git a/...ync/v14/DataTypes/DropdownMultiple.config → ...ync/v14/DataTypes/DropdownMultiple.config b/...ync/v14/DataTypes/DropdownMultiple.config → ...ync/v14/DataTypes/DropdownMultiple.config
diff --git a/...4/uSync/v14/DataTypes/ImageCropper.config → ...e/uSync/v14/DataTypes/ImageCropper.config b/...4/uSync/v14/DataTypes/ImageCropper.config → ...e/uSync/v14/DataTypes/ImageCropper.config
diff --git a/...ync/v14/DataTypes/ImageMediaPicker.config → ...ync/v14/DataTypes/ImageMediaPicker.config b/...ync/v14/DataTypes/ImageMediaPicker.config → ...ync/v14/DataTypes/ImageMediaPicker.config
diff --git a/...14/uSync/v14/DataTypes/LabelBigint.config → ...te/uSync/v14/DataTypes/LabelBigint.config b/...14/uSync/v14/DataTypes/LabelBigint.config → ...te/uSync/v14/DataTypes/LabelBigint.config
diff --git a/.../uSync/v14/DataTypes/LabelDatetime.config → .../uSync/v14/DataTypes/LabelDatetime.config b/.../uSync/v14/DataTypes/LabelDatetime.config → .../uSync/v14/DataTypes/LabelDatetime.config
diff --git a/...4/uSync/v14/DataTypes/LabelDecimal.config → ...e/uSync/v14/DataTypes/LabelDecimal.config b/...4/uSync/v14/DataTypes/LabelDecimal.config → ...e/uSync/v14/DataTypes/LabelDecimal.config
diff --git a/...4/uSync/v14/DataTypes/LabelInteger.config → ...e/uSync/v14/DataTypes/LabelInteger.config b/...4/uSync/v14/DataTypes/LabelInteger.config → ...e/uSync/v14/DataTypes/LabelInteger.config
diff --git a/...14/uSync/v14/DataTypes/LabelString.config → ...te/uSync/v14/DataTypes/LabelString.config b/...14/uSync/v14/DataTypes/LabelString.config → ...te/uSync/v14/DataTypes/LabelString.config
diff --git a/...e.14/uSync/v14/DataTypes/LabelTime.config → ...Site/uSync/v14/DataTypes/LabelTime.config b/...e.14/uSync/v14/DataTypes/LabelTime.config → ...Site/uSync/v14/DataTypes/LabelTime.config
diff --git a/...Sync/v14/DataTypes/ListViewContent.config → ...Sync/v14/DataTypes/ListViewContent.config b/...Sync/v14/DataTypes/ListViewContent.config → ...Sync/v14/DataTypes/ListViewContent.config
diff --git a/.../uSync/v14/DataTypes/ListViewMedia.config → .../uSync/v14/DataTypes/ListViewMedia.config b/.../uSync/v14/DataTypes/ListViewMedia.config → .../uSync/v14/DataTypes/ListViewMedia.config
diff --git a/...Sync/v14/DataTypes/ListViewMembers.config → ...Sync/v14/DataTypes/ListViewMembers.config b/...Sync/v14/DataTypes/ListViewMembers.config → ...Sync/v14/DataTypes/ListViewMembers.config
diff --git a/...downMarkdownEditorPropertyEditorUI.config → ...downMarkdownEditorPropertyEditorUI.config b/...downMarkdownEditorPropertyEditorUI.config → ...downMarkdownEditorPropertyEditorUI.config
diff --git a/...14/uSync/v14/DataTypes/MediaPicker.config → ...te/uSync/v14/DataTypes/MediaPicker.config b/...14/uSync/v14/DataTypes/MediaPicker.config → ...te/uSync/v14/DataTypes/MediaPicker.config
diff --git a/...4/uSync/v14/DataTypes/MemberPicker.config → ...e/uSync/v14/DataTypes/MemberPicker.config b/...4/uSync/v14/DataTypes/MemberPicker.config → ...e/uSync/v14/DataTypes/MemberPicker.config
diff --git a/...uSync/v14/DataTypes/MultiURLPicker.config → ...uSync/v14/DataTypes/MultiURLPicker.config b/...uSync/v14/DataTypes/MultiURLPicker.config → ...uSync/v14/DataTypes/MultiURLPicker.config
diff --git a/...DataTypes/MultipleImageMediaPicker.config → ...DataTypes/MultipleImageMediaPicker.config b/...DataTypes/MultipleImageMediaPicker.config → ...DataTypes/MultipleImageMediaPicker.config
diff --git a/.../v14/DataTypes/MultipleMediaPicker.config → .../v14/DataTypes/MultipleMediaPicker.config b/.../v14/DataTypes/MultipleMediaPicker.config → .../v14/DataTypes/MultipleMediaPicker.config
diff --git a/...ite.14/uSync/v14/DataTypes/Numeric.config → ...stSite/uSync/v14/DataTypes/Numeric.config b/...ite.14/uSync/v14/DataTypes/Numeric.config → ...stSite/uSync/v14/DataTypes/Numeric.config
diff --git a/...te.14/uSync/v14/DataTypes/Radiobox.config → ...tSite/uSync/v14/DataTypes/Radiobox.config b/...te.14/uSync/v14/DataTypes/Radiobox.config → ...tSite/uSync/v14/DataTypes/Radiobox.config
diff --git a/...uSync/v14/DataTypes/RichtextEditor.config → ...uSync/v14/DataTypes/RichtextEditor.config b/...uSync/v14/DataTypes/RichtextEditor.config → ...uSync/v14/DataTypes/RichtextEditor.config
diff --git a/...stSite.14/uSync/v14/DataTypes/Tags.config → src/TestSite/uSync/v14/DataTypes/Tags.config b/...stSite.14/uSync/v14/DataTypes/Tags.config → src/TestSite/uSync/v14/DataTypes/Tags.config
diff --git a/...te.14/uSync/v14/DataTypes/Textarea.config → ...tSite/uSync/v14/DataTypes/Textarea.config b/...te.14/uSync/v14/DataTypes/Textarea.config → ...tSite/uSync/v14/DataTypes/Textarea.config
diff --git a/....14/uSync/v14/DataTypes/Textstring.config → ...ite/uSync/v14/DataTypes/Textstring.config b/....14/uSync/v14/DataTypes/Textstring.config → ...ite/uSync/v14/DataTypes/Textstring.config
diff --git a/...e.14/uSync/v14/DataTypes/Truefalse.config → ...Site/uSync/v14/DataTypes/Truefalse.config b/...e.14/uSync/v14/DataTypes/Truefalse.config → ...Site/uSync/v14/DataTypes/Truefalse.config
diff --git a/.../uSync/v14/DataTypes/UploadArticle.config → .../uSync/v14/DataTypes/UploadArticle.config b/.../uSync/v14/DataTypes/UploadArticle.config → .../uSync/v14/DataTypes/UploadArticle.config
diff --git a/...14/uSync/v14/DataTypes/UploadAudio.config → ...te/uSync/v14/DataTypes/UploadAudio.config b/...14/uSync/v14/DataTypes/UploadAudio.config → ...te/uSync/v14/DataTypes/UploadAudio.config
diff --git a/....14/uSync/v14/DataTypes/UploadFile.config → ...ite/uSync/v14/DataTypes/UploadFile.config b/....14/uSync/v14/DataTypes/UploadFile.config → ...ite/uSync/v14/DataTypes/UploadFile.config
diff --git a/...v14/DataTypes/UploadVectorGraphics.config → ...v14/DataTypes/UploadVectorGraphics.config b/...v14/DataTypes/UploadVectorGraphics.config → ...v14/DataTypes/UploadVectorGraphics.config
diff --git a/...14/uSync/v14/DataTypes/UploadVideo.config → ...te/uSync/v14/DataTypes/UploadVideo.config b/...14/uSync/v14/DataTypes/UploadVideo.config → ...te/uSync/v14/DataTypes/UploadVideo.config
diff --git a/...stSite.14/uSync/v14/Domains/_en-gb.config → src/TestSite/uSync/v14/Domains/_en-gb.config b/...stSite.14/uSync/v14/Domains/_en-gb.config → src/TestSite/uSync/v14/Domains/_en-gb.config
diff --git a/...estSite.14/uSync/v14/Domains/se_sv.config → src/TestSite/uSync/v14/Domains/se_sv.config b/...estSite.14/uSync/v14/Domains/se_sv.config → src/TestSite/uSync/v14/Domains/se_sv.config
diff --git a/...tSite.14/uSync/v14/Languages/en-gb.config → ...TestSite/uSync/v14/Languages/en-gb.config b/...tSite.14/uSync/v14/Languages/en-gb.config → ...TestSite/uSync/v14/Languages/en-gb.config
diff --git a/...tSite.14/uSync/v14/Languages/en-us.config → ...TestSite/uSync/v14/Languages/en-us.config b/...tSite.14/uSync/v14/Languages/en-us.config → ...TestSite/uSync/v14/Languages/en-us.config
diff --git a/...TestSite.14/uSync/v14/Languages/sv.config → src/TestSite/uSync/v14/Languages/sv.config b/...TestSite.14/uSync/v14/Languages/sv.config → src/TestSite/uSync/v14/Languages/sv.config
diff --git a/src/TestSite.14/uSync/v14/Media/icon.config → src/TestSite/uSync/v14/Media/icon.config b/src/TestSite.14/uSync/v14/Media/icon.config → src/TestSite/uSync/v14/Media/icon.config
diff --git a/...tSite.14/uSync/v14/MediaTypes/file.config → ...TestSite/uSync/v14/MediaTypes/file.config b/...tSite.14/uSync/v14/MediaTypes/file.config → ...TestSite/uSync/v14/MediaTypes/file.config
diff --git a/...ite.14/uSync/v14/MediaTypes/folder.config → ...stSite/uSync/v14/MediaTypes/folder.config b/...ite.14/uSync/v14/MediaTypes/folder.config → ...stSite/uSync/v14/MediaTypes/folder.config
diff --git a/...Site.14/uSync/v14/MediaTypes/image.config → ...estSite/uSync/v14/MediaTypes/image.config b/...Site.14/uSync/v14/MediaTypes/image.config → ...estSite/uSync/v14/MediaTypes/image.config
diff --git a/...v14/MediaTypes/umbracomediaarticle.config → ...v14/MediaTypes/umbracomediaarticle.config b/...v14/MediaTypes/umbracomediaarticle.config → ...v14/MediaTypes/umbracomediaarticle.config
diff --git a/...c/v14/MediaTypes/umbracomediaaudio.config → ...c/v14/MediaTypes/umbracomediaaudio.config b/...c/v14/MediaTypes/umbracomediaaudio.config → ...c/v14/MediaTypes/umbracomediaaudio.config
diff --git a/...iaTypes/umbracomediavectorgraphics.config → ...iaTypes/umbracomediavectorgraphics.config b/...iaTypes/umbracomediavectorgraphics.config → ...iaTypes/umbracomediavectorgraphics.config
diff --git a/...c/v14/MediaTypes/umbracomediavideo.config → ...c/v14/MediaTypes/umbracomediavideo.config b/...c/v14/MediaTypes/umbracomediavideo.config → ...c/v14/MediaTypes/umbracomediavideo.config
diff --git a/...te.14/uSync/v14/MemberTypes/member.config → ...tSite/uSync/v14/MemberTypes/member.config b/...te.14/uSync/v14/MemberTypes/member.config → ...tSite/uSync/v14/MemberTypes/member.config
diff --git a/...stSite.14/uSync/v14/Templates/home.config → src/TestSite/uSync/v14/Templates/home.config b/...stSite.14/uSync/v14/Templates/home.config → src/TestSite/uSync/v14/Templates/home.config
diff --git a/...e.14/umbraco/models/BasePage.generated.cs → ...Site/umbraco/models/BasePage.generated.cs b/...e.14/umbraco/models/BasePage.generated.cs → ...Site/umbraco/models/BasePage.generated.cs
@@ -2,7 +2,7 @@
 // <auto-generated>
 //   This code was generated by a tool.
 //
-//    Umbraco.ModelsBuilder.Embedded v14.0.0-rc4+0c5d7b2
+//    Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+0c5d7b2
 //
 //   Changes to this file will be lost if the code is regenerated.
 // </auto-generated>
@@ -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", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GridContent { get; }
 	}
@@ -34,18 +34,18 @@ public partial class BasePage : PublishedElementModel, IBasePage
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const string ModelTypeAlias = "basePage";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
-			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
+			=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<BasePage, TValue>> selector)
-			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
+		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<BasePage, TValue>> selector)
+			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
 #pragma warning restore 0109
 
 		private IPublishedValueFallback _publishedValueFallback;
@@ -62,13 +62,13 @@ public BasePage(IPublishedElement content, IPublishedValueFallback publishedValu
 		///<summary>
 		/// Grid Content
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[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", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[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");
 	}

diff --git a/...tSite.14/umbraco/models/File.generated.cs → ...TestSite/umbraco/models/File.generated.cs b/...tSite.14/umbraco/models/File.generated.cs → ...TestSite/umbraco/models/File.generated.cs
@@ -2,7 +2,7 @@
 // <auto-generated>
 //   This code was generated by a tool.
 //
-//    Umbraco.ModelsBuilder.Embedded v14.0.0-rc4+0c5d7b2
+//    Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+0c5d7b2
 //
 //   Changes to this file will be lost if the code is regenerated.
 // </auto-generated>
@@ -24,18 +24,18 @@ public partial class File : PublishedContentModel
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const string ModelTypeAlias = "File";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Media;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
-			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
+			=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<File, TValue>> selector)
-			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
+		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<File, TValue>> selector)
+			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
 #pragma warning restore 0109
 
 		private IPublishedValueFallback _publishedValueFallback;
@@ -52,23 +52,23 @@ public File(IPublishedContent content, IPublishedValueFallback publishedValueFal
 		///<summary>
 		/// Size: in bytes
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[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", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[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", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		[ImplementPropertyType("umbracoFile")]
 		public virtual string UmbracoFile => this.Value<string>(_publishedValueFallback, "umbracoFile");

diff --git a/...ite.14/umbraco/models/Folder.generated.cs → ...stSite/umbraco/models/Folder.generated.cs b/...ite.14/umbraco/models/Folder.generated.cs → ...stSite/umbraco/models/Folder.generated.cs
@@ -2,7 +2,7 @@
 // <auto-generated>
 //   This code was generated by a tool.
 //
-//    Umbraco.ModelsBuilder.Embedded v14.0.0-rc4+0c5d7b2
+//    Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+0c5d7b2
 //
 //   Changes to this file will be lost if the code is regenerated.
 // </auto-generated>
@@ -24,18 +24,18 @@ public partial class Folder : PublishedContentModel
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const string ModelTypeAlias = "Folder";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Media;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
-			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
+			=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Folder, TValue>> selector)
-			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
+		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<Folder, TValue>> selector)
+			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
 #pragma warning restore 0109
 
 		private IPublishedValueFallback _publishedValueFallback;

diff --git a/...tSite.14/umbraco/models/Home.generated.cs → ...TestSite/umbraco/models/Home.generated.cs b/...tSite.14/umbraco/models/Home.generated.cs → ...TestSite/umbraco/models/Home.generated.cs
@@ -2,7 +2,7 @@
 // <auto-generated>
 //   This code was generated by a tool.
 //
-//    Umbraco.ModelsBuilder.Embedded v14.0.0-rc4+0c5d7b2
+//    Umbraco.ModelsBuilder.Embedded v15.0.0-rc1+0c5d7b2
 //
 //   Changes to this file will be lost if the code is regenerated.
 // </auto-generated>
@@ -24,18 +24,18 @@ public partial class Home : PublishedContentModel, IBasePage
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const string ModelTypeAlias = "home";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
-			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		public new static IPublishedContentType GetModelContentType(IPublishedContentTypeCache contentTypeCache)
+			=> PublishedModelUtility.GetModelContentType(contentTypeCache, ModelItemType, ModelTypeAlias);
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
-		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Home, TValue>> selector)
-			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
+		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedContentTypeCache contentTypeCache, Expression<Func<Home, TValue>> selector)
+			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(contentTypeCache), selector);
 #pragma warning restore 0109
 
 		private IPublishedValueFallback _publishedValueFallback;
@@ -52,7 +52,7 @@ public Home(IPublishedContent content, IPublishedValueFallback publishedValueFal
 		///<summary>
 		/// Grid Content
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0-rc4+0c5d7b2")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "15.0.0-rc1+0c5d7b2")]
 		[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);