Merge branch 'dev/v14' into develop

Author: ronaldbarendse

.gitignore

@@ -361,7 +361,10 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
+# IDEs and Editors
 .vs/
+.vscode/
+.idea/
 
 # Umbraco things
 **/[Uu]mbraco/
@@ -378,4 +381,6 @@ FodyWeavers.xsd
 !**/Media/Web.config
 
 # Ignore the copied App_Plugins folder
-samples/*/App_Plugins/uiexamples/*
+samples/*/App_Plugins/uiexamples/*
+/samples/Umbraco14.Website/App_Plugins
+

CONTRIBUTING.md

@@ -5,14 +5,17 @@ If you want to add more UI examples to this package, please [raise an issue](./i
 Open the solution file `UI Examples.sln` in Visual Studio. You will see three projects:
 - `Our.Umbraco.UiExamples` is the main project containing the files that you will be working with
 - `Umbraco8.Website` is an Umbraco v8 test site
-- `Umrbaco9.Website` is an Umbraco v9 test site
+- `Umbraco9.Website` is an Umbraco v9 test site
+- `Umbraco14.Website` is an Umbraco v14 test site
 
-Steps to get the two test sites working:
+Steps to get the test sites working:
 - Build the solution
 - Run both test websites to run an unattended install (using a SQL CE database)
 - Login to the backoffice using:
   - Username: uiexamples@example.com
   - Password: 1234567890
+  
+For v14 you will also need to run `npm ci` within the `src\Our.Umbraco.UiExamples.v14` directory, and then `npm run dev` to start the development batch job. This will copy the files from the package into `samples\Umbraco14.Website` ready to see in the backoffice.
 
 ## Making changes
 The files you will be working on are in the `App_Plugins` folder in the main `Our.Umbraco.UiExamples` project. Changed files need to be copied into the test websites so you can confirm they work, which is automatically done when building the test websites (using a MSBuild target).

README.md

@@ -1,7 +1,6 @@
 # Umbraco UI Examples
 > [!IMPORTANT]  
-> Hey you! Are you looking to get involved in development of the Umbraco v14 version? Head over to the [dev/v14](https://github.com/umbraco/UI-Examples/tree/dev/v14) branch to get started.
-> P.S. We've also tagged a bunch of [issues with Umbraco 14](https://github.com/umbraco/UI-Examples/issues?q=is%3Aissue+is%3Aopen+label%3A%22Umbraco+14%22) ripe for the picking.
+> Hey you! Are you looking to get involved in development of the Umbraco 14 version? Head over to the [issues tagged with Umbraco 14](https://github.com/umbraco/UI-Examples/issues?q=is%3Aissue+is%3Aopen+label%3A%22Umbraco+14%22) ripe for the picking.
  
 UI Examples is a package that adds a new 'UI Examples' section to your Umbraco instance with working examples of how to customise the backoffice. During installation the Administrators user group will be given access to the section.
 

UI Examples.sln

@@ -7,12 +7,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		CONTRIBUTING.md = CONTRIBUTING.md
-		README.md = README.md
 		.github\workflows\build.yml = .github\workflows\build.yml
+		CONTRIBUTING.md = CONTRIBUTING.md
 		.github\workflows\prepare-release.yml = .github\workflows\prepare-release.yml
 		.github\workflows\publish-release.yml = .github\workflows\publish-release.yml
 		.github\workflows\publish.yml = .github\workflows\publish.yml
+		README.md = README.md
 		src\version.json = src\version.json
 	EndProjectSection
 EndProject
@@ -22,6 +22,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco8.Website", "samples
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco9.Website", "samples\Umbraco9.Website\Umbraco9.Website.csproj", "{7C6C2FFA-25A4-4CC4-9AA1-49B2DFB68DFC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco14.Website", "samples\Umbraco14.Website\Umbraco14.Website.csproj", "{D9B26368-94C2-4A90-B84C-506411254F9D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.UiExamples.v14", "src\Our.Umbraco.UiExamples.v14\Our.Umbraco.UiExamples.v14.csproj", "{E99F9B42-9A45-4008-8BD7-002444460335}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,6 +44,14 @@ Global
 		{7C6C2FFA-25A4-4CC4-9AA1-49B2DFB68DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C6C2FFA-25A4-4CC4-9AA1-49B2DFB68DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C6C2FFA-25A4-4CC4-9AA1-49B2DFB68DFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9B26368-94C2-4A90-B84C-506411254F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9B26368-94C2-4A90-B84C-506411254F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9B26368-94C2-4A90-B84C-506411254F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9B26368-94C2-4A90-B84C-506411254F9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E99F9B42-9A45-4008-8BD7-002444460335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E99F9B42-9A45-4008-8BD7-002444460335}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E99F9B42-9A45-4008-8BD7-002444460335}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E99F9B42-9A45-4008-8BD7-002444460335}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE