diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7f1363..828cd3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,4 +11,5 @@ jobs:
with:
project-name: jcdcdev.Umbraco.Core
project-path: src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj
- umbraco-version: 14
\ No newline at end of file
+ umbraco-version: 15
+ dotnet-version: "9"
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f1df4a..9429d1c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,8 @@ jobs:
with:
project-name: jcdcdev.Umbraco.Core
project-path: src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj
- 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/uSync/v14/Domains/_en-gb.config b/src/TestSite.14/uSync/v14/Domains/_en-gb.config
deleted file mode 100644
index 2fc72a8..0000000
--- a/src/TestSite.14/uSync/v14/Domains/_en-gb.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
- en-GB
- 0
-
-
\ No newline at end of file
diff --git a/src/TestSite.14/uSync/v14/Domains/se_sv.config b/src/TestSite.14/uSync/v14/Domains/se_sv.config
deleted file mode 100644
index e3fde01..0000000
--- a/src/TestSite.14/uSync/v14/Domains/se_sv.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
- sv
- 0
-
-
\ No newline at end of file
diff --git a/src/TestSite.14/uSync/v14/Languages/sv.config b/src/TestSite.14/uSync/v14/Languages/sv.config
deleted file mode 100644
index a157757..0000000
--- a/src/TestSite.14/uSync/v14/Languages/sv.config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- Swedish
- sv
- true
- false
-
\ No newline at end of file
diff --git a/src/TestSite.14/umbraco/models/BasePage.generated.cs b/src/TestSite.14/umbraco/models/BasePage.generated.cs
deleted file mode 100644
index 1cf1d84..0000000
--- a/src/TestSite.14/umbraco/models/BasePage.generated.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-//
-// Umbraco.ModelsBuilder.Embedded v14.0.0+8685c7d
-//
-// Changes to this file will be lost if the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-using System;
-using System.Linq.Expressions;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.Infrastructure.ModelsBuilder;
-using Umbraco.Cms.Core;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.Common.PublishedModels
-{
- // Mixin Content Type with alias "basePage"
- /// Base Page
- public partial interface IBasePage : IPublishedElement
- {
- /// Grid Content
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0+8685c7d")]
- [global::System.Diagnostics.CodeAnalysis.MaybeNull]
- global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GridContent { get; }
- }
-
- /// Base Page
- [PublishedModel("basePage")]
- 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+8685c7d")]
- public new const string ModelTypeAlias = "basePage";
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0+8685c7d")]
- public new const PublishedItemType ModelItemType = PublishedItemType.Content;
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0+8685c7d")]
- [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+8685c7d")]
- [return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
- public static IPublishedPropertyType GetModelPropertyType(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression> selector)
- => PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
-#pragma warning restore 0109
-
- private IPublishedValueFallback _publishedValueFallback;
-
- // ctor
- public BasePage(IPublishedElement content, IPublishedValueFallback publishedValueFallback)
- : base(content, publishedValueFallback)
- {
- _publishedValueFallback = publishedValueFallback;
- }
-
- // properties
-
- ///
- /// Grid Content
- ///
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0+8685c7d")]
- [global::System.Diagnostics.CodeAnalysis.MaybeNull]
- [ImplementPropertyType("gridContent")]
- public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GridContent => GetGridContent(this, _publishedValueFallback);
-
- /// Static getter for Grid Content
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "14.0.0+8685c7d")]
- [return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
- public static global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel GetGridContent(IBasePage that, IPublishedValueFallback publishedValueFallback) => that.Value(publishedValueFallback, "gridContent");
- }
-}
diff --git a/src/TestSite.14/.gitignore b/src/jcdcdev.Umbraco.Core.TestSite/.gitignore
similarity index 100%
rename from src/TestSite.14/.gitignore
rename to src/jcdcdev.Umbraco.Core.TestSite/.gitignore
diff --git a/src/TestSite.14/Composer.cs b/src/jcdcdev.Umbraco.Core.TestSite/Composer.cs
similarity index 87%
rename from src/TestSite.14/Composer.cs
rename to src/jcdcdev.Umbraco.Core.TestSite/Composer.cs
index 2c59909..dcbc89c 100644
--- a/src/TestSite.14/Composer.cs
+++ b/src/jcdcdev.Umbraco.Core.TestSite/Composer.cs
@@ -1,7 +1,7 @@
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Infrastructure.Manifest;
-namespace TestSite.Fourteen;
+namespace jcdcdev.Umbraco.Core.TestSite;
public class Composer : IComposer
{
diff --git a/src/TestSite.14/Program.cs b/src/jcdcdev.Umbraco.Core.TestSite/Program.cs
similarity index 86%
rename from src/TestSite.14/Program.cs
rename to src/jcdcdev.Umbraco.Core.TestSite/Program.cs
index 80374f2..36e7bc4 100644
--- a/src/TestSite.14/Program.cs
+++ b/src/jcdcdev.Umbraco.Core.TestSite/Program.cs
@@ -1,3 +1,6 @@
+using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Extensions;
+
var builder = WebApplication.CreateBuilder(args);
builder.CreateUmbracoBuilder()
diff --git a/src/TestSite.14/Properties/launchSettings.json b/src/jcdcdev.Umbraco.Core.TestSite/Properties/launchSettings.json
similarity index 100%
rename from src/TestSite.14/Properties/launchSettings.json
rename to src/jcdcdev.Umbraco.Core.TestSite/Properties/launchSettings.json
diff --git a/src/TestSite.14/SimpleWorkspaceViewPackageManifestReader.cs b/src/jcdcdev.Umbraco.Core.TestSite/SimpleWorkspaceViewPackageManifestReader.cs
similarity index 93%
rename from src/TestSite.14/SimpleWorkspaceViewPackageManifestReader.cs
rename to src/jcdcdev.Umbraco.Core.TestSite/SimpleWorkspaceViewPackageManifestReader.cs
index 84bea93..a639070 100644
--- a/src/TestSite.14/SimpleWorkspaceViewPackageManifestReader.cs
+++ b/src/jcdcdev.Umbraco.Core.TestSite/SimpleWorkspaceViewPackageManifestReader.cs
@@ -3,9 +3,9 @@
using Umbraco.Cms.Core.Manifest;
using Umbraco.Cms.Infrastructure.Manifest;
-namespace TestSite.Fourteen;
+namespace jcdcdev.Umbraco.Core.TestSite;
-public class SimpleWorkspaceViewPackageManifestReader() : IPackageManifestReader
+public class SimpleWorkspaceViewPackageManifestReader : IPackageManifestReader
{
public async Task> ReadPackageManifestsAsync()
{
@@ -65,6 +65,6 @@ public async Task> ReadPackageManifestsAsync()
extensions.Add(dashboardManifest);
extensions.Add(workspaceViewManifest);
packageManifest.Extensions = extensions.OfType