diff --git a/.github/New BackOffice - README.md b/.github/New BackOffice - README.md index c67ebdea93..7d90312fc4 100644 --- a/.github/New BackOffice - README.md +++ b/.github/New BackOffice - README.md @@ -5,6 +5,24 @@ This solution folder contains the projects for the new backoffice. If you're looking to fix or improve the existing CMS, this is not the place to do it, although we do very much appreciate your efforts. +### Getting Started: Management API + +This branch contains the project for the new Management API as well as the new Backoffice. To get started with the Management API you should: +* Run any of the executables (Umbraco.Web.UI or Umbraco.Web.UI.New) +* Access "/umbraco/swagger" in the browser to see the Swagger interface +* The API lives in the Umbraco.Cms.Api.Management project + +### Getting Started: Backoffice +To run the new Backoffice: +* Execute `git submodule init` and then `git submodule update` to get the files into Umbraco.Web.UI.New.Client project +* Run Umbraco.Web.UI.New project + * If you get a white page delete Umbraco.Cms.StaticAssets\wwwroot\umbraco folder and run `npm ci && npm run build:for:cms` inside Umbraco.Web.UI.New.Client folder to clear out any leftover files from older versions. +* If you are going to work on the Backoffice, you can either go to the Umbraco.Web.UI.New.Client folder and check out a new branch or set it up in your IDE, which will allow you to commit to each repository simultaneously: + * **Rider**: Preferences -> Version Control -> Directory Mappings -> Click the '+' sign + +### Latest version +* If you want to get the latest changes from the Backoffice repository, run `git submodule update` again which will pull the latest main branch. + ### Project structure Since the new backoffice API is still very much a work in progress, we've created new projects for the new backoffice API: @@ -14,5 +32,7 @@ Since the new backoffice API is still very much a work in progress, we've create * Umbraco.New.Cms.Core * Umbraco.New.Cms.Infrastructure * Umbraco.New.Cms.Web.Common + * Umbraco.Web.UI.New + * Umbraco.Web.UI.New.Client This also means that we have to use "InternalsVisibleTo" for the new projects since these should be able to access the internal classes since they will when they get merged. diff --git a/umbraco.sln b/umbraco.sln index f6150893c4..7a6f71bf8f 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -34,29 +34,6 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "ht StartServerOnDebug = "false" EndProjectSection EndProject -Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.New.Client", "http://localhost:3961", "{17E2067E-9D0F-4891-B6BA-CD828886B968}" - ProjectSection(WebsiteProperties) = preProject - UseIISExpress = "true" - TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2" - Debug.AspNetCompiler.VirtualPath = "/localhost_3961" - Debug.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.New.Client\" - Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_3961\" - Debug.AspNetCompiler.Updateable = "true" - Debug.AspNetCompiler.ForceOverwrite = "true" - Debug.AspNetCompiler.FixedNames = "false" - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.VirtualPath = "/localhost_3961" - Release.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.New.Client\" - Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_3961\" - Release.AspNetCompiler.Updateable = "true" - Release.AspNetCompiler.ForceOverwrite = "true" - Release.AspNetCompiler.FixedNames = "false" - Release.AspNetCompiler.Debug = "False" - SlnRelativePath = "src\Umbraco.Web.UI.New.Client\" - DefaultWebSiteLanguage = "Visual C#" - StartServerOnDebug = "false" - EndProjectSection -EndProject Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Tests.AcceptanceTest", "http://localhost:58896", "{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}" ProjectSection(WebsiteProperties) = preProject UseIISExpress = "true" @@ -185,6 +162,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.New", "src\U EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Api.Common", "src\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj", "{D48B5D6B-82FF-4235-986C-CDE646F41DEC}" EndProject +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.New.Client", "src\Umbraco.Web.UI.New.Client\", "{D88A926B-E8D6-495A-A2ED-8EFD0C847C62}" + ProjectSection(WebsiteProperties) = preProject + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8" + Debug.AspNetCompiler.VirtualPath = "/localhost_55211" + Debug.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.New.Client\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_55211\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/localhost_55211" + Release.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.New.Client\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_55211\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "55211" + SlnRelativePath = "src\Umbraco.Web.UI.New.Client\" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -201,6 +199,9 @@ Global {3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Release|Any CPU.ActiveCfg = Release|Any CPU {3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU + {D88A926B-E8D6-495A-A2ED-8EFD0C847C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D88A926B-E8D6-495A-A2ED-8EFD0C847C62}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D88A926B-E8D6-495A-A2ED-8EFD0C847C62}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU {9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}.Release|Any CPU.ActiveCfg = Release|Any CPU {9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU @@ -377,8 +378,8 @@ Global {2B47AD9F-FFF1-448A-88F1-D4F568811738} = {F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44} {25AECCB5-B187-4406-844B-91B8FF0FCB37} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} {EA628ABD-624E-4AF3-B548-6710D4D66531} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} - {17E2067E-9D0F-4891-B6BA-CD828886B968} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} {C55CA725-9F4E-4618-9435-6B8AE05DA14D} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} + {D88A926B-E8D6-495A-A2ED-8EFD0C847C62} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}