Merge pull request #371 from leekelleher/dev/v4.x

Preparing v4.6.0 release

.github/CONTRIBUTING.md

@@ -29,10 +29,10 @@ Given there are now multiple versions of Contentment that support multiple versi
 - The [`dev/v1.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v1.x) branch is for Contentment **v1.4.x** patch releases, this targets Umbraco **v8.6.1**.
 - The [`dev/v2.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v2.x) branch is for Contentment **v2.2.x** patch releases, this targets Umbraco **v8.14.0**.
 - The [`dev/v3.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v3.x) branch is for Contentment **v3.4.x** patch releases, this targets both Umbraco **v8.17.0** and **v9.0.0**.
-- The [`dev/v4.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v4.x) branch is for Contentment **v4.x** (current) releases, this targets Umbraco **v8.17.0**, **v9.5.0**, **v10.0.0**, **v11.0.0** and **v12.0.0**.
-- The `dev/v5.x` branch will be for Contentment **v5.x** (future) releases, this will target Umbraco **v10.0.0**, **v11.0.0**, **v12.0.0** and **v13.0.0**.
-- The `dev/v6.x` branch will be for Contentment **v6.x** (future) releases, this will target Umbraco **v15.0.0**.
-- The `dev/v7.x` branch will be for Contentment **v7.x** (future) releases, this will target Umbraco **v15.0.0**,**v16.0.0** and **v17.0.0**.
+- The [`dev/v4.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v4.x) branch is for Contentment **v4.6.x** (current) releases, this targets Umbraco **v8.17.0**, **v9.5.0**, **v10.0.0**, **v11.0.0**, **v12.0.0** and **v13.0.0**.
+- The [`dev/v5.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v5.x) branch is for Contentment **v5.x** (next) releases, this will target Umbraco **v10.3.0**, **v12.0.0** and **v13.0.0**.
+- The `dev/v6.x` branch will be for Contentment **v6.x** (future) releases, this might target Umbraco **v10.3.0**, **v12.0.0**, **v13.0.0** and **v15.0.0**.
+- The `dev/v7.x` branch will be for Contentment **v7.x** (far future) releases, this might target Umbraco **v15.0.0**, **v16.0.0** and **v17.0.0**.
 
 
 ### Further reading

.github/IDEAS.md

@@ -31,6 +31,10 @@
 
 - [Time Duration](https://github.com/leekelleher/umbraco-contentment/discussions/114)
 
+- Content Blocks - add Content Picker support, (think Content Blocks + MNTP, for reusable blocks). _Thank @lssweatherhead_ :wink:
+
+- Content Blocks: ["Templated" display mode](https://github.com/leekelleher/umbraco-contentment/discussions/278)
+
 
 ### Internally used editors
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: "Bug report"
 description: "File a bug report to help us improve."
-labels: "bug-report"
+labels: ["bug-report"]
 assignees:
   - leekelleher
 body:
@@ -18,37 +18,39 @@ body:
 - type: input
   id: "umbracoVersion"
   attributes:
-    label: "Which Umbraco version are you using? For example: 8.14.1 - don't just write v8"
+    label: "Which Umbraco version are you using? For example: 10.3.2 - don't just write v10"
     description: "Use the help icon in the Umbraco backoffice to find the version you're using."
   validations:
     required: true
 - type: textarea
   id: "summary"
   attributes:
     label: "Bug summary"
-    description: "Write a summary of the bug."
-    description: "Remember that you can format code and logs nicely with the `<>` button"
+    description: "Write a summary of the bug. Remember that you can format code and logs nicely with the `<>` button"
     placeholder: >
+      
       Try to pinpoint it as much as possible.
       
       Try to state the actual problem, and not just what you think the solution might be.
   validations:
     required: true
 - type: textarea
+  id: "reproduction"
   attributes:
     label: "Steps to reproduce"
-    id: "reproduction"
     description: "How can we reproduce the problem on a clean Contentment + Umbraco install?"
     placeholder: >
+      
       Please include any links, screenshots, stack-traces, etc.
   validations:
     required: true
 - type: textarea
+  id: "result"
   attributes:
     label: "Expected result / actual result"
-    id: "result"
     description: "What did you expect that would happen on your Umbraco site and what is the actual result of the above steps?"
     placeholder: >
+      
       Describe the intended/desired outcome after you did the steps mentioned.
       
       Describe the behaviour of the bug

.github/README.md

@@ -53,10 +53,10 @@ Downloads are available on the [releases page](../releases).
 
 _**Please note...**_
 
-- v4.x supports **Umbraco v8.17.0** (on .NET 4.7.2), **Umbraco v10** (on .NET 6.0) and  **Umbraco v11/v12** (on .NET 7.0), it will support those versions and above.
+- v4.x supports **Umbraco v8.17.0** (on .NET 4.7.2), **Umbraco v10** (on .NET 6.0),  **Umbraco v11/v12** (on .NET 7.0) and  **Umbraco v13** (on .NET 8.0).
 - v3.x supports **Umbraco v8.17.0** and **Umbraco v9.0.0**, it will work on latest Umbraco v8.x and v9.x releases.
-- v2.x was developed against **Umbraco v8.14.0**, it will still work on latest Umbraco v8.x releases.
-- v1.x was developed against **Umbraco v8.6.1**, it will still work on latest Umbraco v8.x releases.
+- v2.x supports **Umbraco v8.14.0**, it will still work on latest Umbraco v8.x releases.
+- v1.x supports **Umbraco v8.6.1**, it will still work on latest Umbraco v8.x releases.
 
 With Contentment v3+ on Umbraco v9+ (.NET 5+), you can only install a package from the [NuGet package repository](https://www.nuget.org/packages/Our.Umbraco.Community.Contentment). For Umbraco v8.x, the package can still be installed from either [Our Umbraco](https://our.umbraco.com/packages/backoffice-extensions/contentment/) or NuGet package repositories.
 
@@ -118,11 +118,11 @@ Ask for help on the [Our Umbraco support forum](https://our.umbraco.com/), or th
 
 ### Contributions, collaborations, rules of engagement
 
-If you would like to contribute to this project, please start a discussion before spending time and energy on a pull request. Your time is precious too.
+If you would like to contribute to this project, please [start a discussion](https://github.com/leekelleher/umbraco-contentment/discussions/new/choose) before spending time and energy on a pull request. Your time is precious too.
 
 Please make sure that you read the [CONTRIBUTING](CONTRIBUTING.md) guidelines.
 
-This project is governed by a [Code of Conduct](CODE_OF_CONDUCT.md). **Play nice or go home.** :v::heart::dove:
+This project is governed by a [Code of Conduct](CODE_OF_CONDUCT.md). **Play nice or go elsewhere.** :v::heart::dove:
 
 If you are unhappy with the project or documentation, please help to identify specific issues and work towards resolving them.
 Otherwise you are completely free to not use this software, complain on your favourite social network, or go [scream into the void](https://screamintothevoid.com/).
@@ -157,7 +157,7 @@ For more information about the **Mozilla Public License**, please visit: <https:
 - [Lee Kelleher](https://leekelleher.com) - ([GitHub](https://github.com/leekelleher), [Mastodon](https://mastodon.social/@leekelleher), [Twitter](https://twitter.com/leekelleher))
 
 <details>
-<summary>Current development effort: <b>~1,674+ hours</b> (between 2019-03-13 to 2023-08-24)</summary>
+<summary>Current development effort: <b>~1,802+ hours</b> (between 2019-03-13 to 2023-12-03)</summary>
 
 _To give you an idea of how much human developer time/effort has been put into making this package._
 
@@ -166,7 +166,7 @@ _To give you an idea of how much human developer time/effort has been put into m
 
 #### Special thanks
 
-- Thank you to [Umbrella](https://umbrellainc.co.uk) for facilitating the time and resource to help me initiate this project.
+- Thank you to [Umbrella](https://web.archive.org/web/*/https://umbrellainc.co.uk/) for facilitating the time and resource to help me initiate this project.
 - Kudos to [Gibe](https://gibe.digital/) for enabling the development of the [Data Picker](../docs/editors/data-picker.md) editor.
 
 

.github/ROADMAP.md

@@ -4,7 +4,7 @@
 
 Here is a _provisional_ roadmap for the Contentment for Umbraco package, to be actioned at my own pleasure.
 
-> To note: I try to follow the [Semantic Versioning](https://semver.org/) standard.
+> To note: I try to follow the [Semantic Versioning](https://semver.org/) standard.<br>
 > TL;DR, `[Major].[Minor].[Patch]`, Major = breaking-change; Minor  = feature; Patch = bug-fix.
 
 
@@ -14,7 +14,7 @@ Here is a _provisional_ roadmap for the Contentment for Umbraco package, to be a
 
 Initial release.
 
-Compiles against Umbraco CMS v8.6.1, _(this was the latest version at the time of initial release)._
+Compiles against Umbraco CMS **v8.6.1**, _(this was the latest version at the time of initial release)._
 
 Property Editors are:
 
@@ -52,7 +52,7 @@ Property Editors are:
 
 ### [v2.0](https://github.com/leekelleher/umbraco-contentment/releases/tag/2.0.0)
 
-- A breaking-change release _(in terms of following [SemVer guidelines](https://semver.org/)),_ of the latest v1.4.x features that compiles against Umbraco CMS v8.14.0, _(the most recent version of Umbraco at the time of release)._
+- A breaking-change release _(in terms of following [SemVer guidelines](https://semver.org/)),_ of the latest v1.4.x features that compiles against Umbraco CMS **v8.14.0**, _(the most recent version of Umbraco at the time of release)._
 
 ### [v2.1](https://github.com/leekelleher/umbraco-contentment/releases/tag/2.1.0)
 
@@ -68,7 +68,7 @@ Property Editors are:
 
 ### [v3.0](https://github.com/leekelleher/umbraco-contentment/releases/tag/3.0.0)
 
-- A breaking-change release _(following SemVer guidelines),_ of v2.x features that will compile against both Umbraco v8.17.0 and v9.0.0. If you're interested in the development of this release, please [see my developer's journal.](https://github.com/leekelleher/umbraco-contentment/discussions/105)
+- A breaking-change release _(following SemVer guidelines),_ of v2.x features that will compile against both Umbraco **v8.17.0** and **v9.0.0**. If you're interested in the development of this release, please [see my developer's journal.](https://github.com/leekelleher/umbraco-contentment/discussions/105)
 
 ### [v3.1](https://github.com/leekelleher/umbraco-contentment/releases/tag/3.1.0)
 
@@ -95,7 +95,7 @@ Property Editors are:
 
 ### [v4.0](https://github.com/leekelleher/umbraco-contentment/releases/tag/4.0.0)
 
-- A breaking-change release _(following SemVer guidelines),_ of v3.x features that will compile against both Umbraco v8.17.0, v9.5.0 and v10.0.0.
+- A breaking-change release _(following SemVer guidelines),_ of v3.x features that will compile against Umbraco **v8.17.0**, **v9.5.0** and **v10.0.0**.
 
 ### [v4.1](https://github.com/leekelleher/umbraco-contentment/releases/tag/4.1.0)
 
@@ -121,25 +121,20 @@ Property Editors are:
 
 ### v4.6
 
-- Content Blocks - add Content Picker support, (think Content Blocks + MNTP, for reusable blocks). _Thank @lssweatherhead_ :wink:
-
-### v4.7
-
-- Content Blocks: ["Templated" display mode](https://github.com/leekelleher/umbraco-contentment/discussions/278)
+- A non-breaking-change minor release. Adds support for Umbraco v13, .NET 8.0. _(Whilst still supporting v8.17+, v9, v10, v11 and v12)._
 
 
 ## v5
 
-- _Adds support for Umbraco 13 (.NET 8)._
-- _Removes support for Umbraco 8 (.NET Framework 4.7.2) and Umbraco 9 (.NET 5)._
-- _Convert to a Razor Class Library?_ :thinking:
+- Removes support for Umbraco 8 (.NET Framework 4.7.2), Umbraco 9 (.NET 5) and Umbraco 11 (.NET 7).
+- Converts package to be a Razor Class Library, _(e.g. web assets are served from NuGet package)._
 
 
 ## v6
 
 - [Support for the new Umbraco backoffice, aka Bellissima](https://github.com/leekelleher/umbraco-contentment/issues/316).
 - _Adds support for Umbraco 15 (.NET 9)._
-- _Removes support for Umbraco 10 (.NET 6), Umbraco 11, 12 (.NET 7) and Umbraco 13 (.NET 8)._
+- _I'm still deciding whether to remove support for Umbraco 10 (.NET 6), Umbraco 12 (.NET 7) and Umbraco 13 (.NET 8)._ :thinking:
 
 
 ## v7

VERSION

@@ -1 +1 @@
-4.5.1
+4.6.0

build/build-pkgs.ps1

@@ -72,6 +72,9 @@ Copy-Item -Path "${srcFolder}\${projectNamespace}\bin\Release\net6.0\${projectNa
 $net70Folder = "${assetsFolder}\net7.0";
 if (!(Test-Path -Path $net70Folder)) {New-Item -Path $net70Folder -Type Directory;}
 Copy-Item -Path "${srcFolder}\${projectNamespace}\bin\Release\net7.0\${projectNamespace}.*" -Destination $net70Folder;
+$net80Folder = "${assetsFolder}\net8.0";
+if (!(Test-Path -Path $net80Folder)) {New-Item -Path $net80Folder -Type Directory;}
+Copy-Item -Path "${srcFolder}\${projectNamespace}\bin\Release\net8.0\${projectNamespace}.*" -Destination $net80Folder;
 
 # Populate the Umbraco package manifest
 

build/manifest-nuget-core.nuspec

@@ -24,12 +24,16 @@
         <dependency id="Umbraco.Cms.Web.BackOffice" version="[9.5.0, 10.0.0)" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="Umbraco.Cms.Web.Website" version="[10.0.0, 13.0.0)" />
-        <dependency id="Umbraco.Cms.Web.BackOffice" version="[10.0.0, 13.0.0)" />
+        <dependency id="Umbraco.Cms.Web.Website" version="[10.0.0, 14.0.0)" />
+        <dependency id="Umbraco.Cms.Web.BackOffice" version="[10.0.0, 14.0.0)" />
       </group>
       <group targetFramework="net7.0">
-        <dependency id="Umbraco.Cms.Web.Website" version="[11.0.0, 13.0.0)" />
-        <dependency id="Umbraco.Cms.Web.BackOffice" version="[11.0.0, 13.0.0)" />
+        <dependency id="Umbraco.Cms.Web.Website" version="[11.0.0, 14.0.0)" />
+        <dependency id="Umbraco.Cms.Web.BackOffice" version="[11.0.0, 14.0.0)" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Umbraco.Cms.Web.Website" version="[13.0.0, 14.0.0)" />
+        <dependency id="Umbraco.Cms.Web.BackOffice" version="[13.0.0, 14.0.0)" />
       </group>
     </dependencies>
   </metadata>
@@ -38,6 +42,7 @@
     <file src="net5.0\*.dll" target="lib\net5.0" />
     <file src="net6.0\*.dll" target="lib\net6.0" />
     <file src="net7.0\*.dll" target="lib\net7.0" />
+    <file src="net8.0\*.dll" target="lib\net8.0" />
     <file src="icon.png" target="" />
     <file src="README_CORE.md" target="README.md" />
   </files>