diff --git a/.gitignore b/.gitignore index 0218f38ec7..82a173e81c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,207 +1,156 @@ -# -# Umbraco CMS .gitignore -# - -# Common files -*.obj -*.pdb -*.user -*.aps -*.pch -*.vspscc -*.orig -*.suo -*.vs10x -*.ndproj -*.ignorer.* - -# Common directories -.DS_Store -._.DS_Store -.vs/ -/local/ - -# Build directories -[Bb]in/ -[Db]ebug*/ -[Rr]elease*/ -obj/ - -# Tools -_ReSharper*/ -_NCrunch_*/ -*.ncrunchsolution -*.ncrunchsolution.user -*.ncrunchproject -*.crunchsolution.cache -tools/NDepend/ - -[Tt]est[Rr]esult* -[Bb]uild[Ll]og.* -*.[Pp]ublish.xml -[sS]ource -[sS]andbox -umbraco.config -App_Data/TEMP/* -[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/* -[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/* -[Uu]mbraco/[Pp]resentation/[Ss]cripts/* -[Uu]mbraco/[Pp]resentation/[Ff]onts/* -[Uu]mbraco/[Pp]resentation/[Cc]ss/* - -src/Umbraco.Web.UI/[Cc]ss/* -src/Umbraco.Web.UI/App_Code/* -src/Umbraco.Web.UI/App_Data/* -src/Umbraco.Web.UI/data/* -src/Umbraco.Tests/App_Data/* -src/Umbraco.Web.UI/[Mm]edia/* -src/Umbraco.Web.UI/[Mm]aster[Pp]ages/* -src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/* -!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig -src/Umbraco.Web.UI/[Xx]slt/* -src/Umbraco.Web.UI/[Ii]mages/* -src/Umbraco.Web.UI/[Ss]cripts/* -src/Umbraco.Web.UI/Web.*.config.transformed - -umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx -umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx - -src/Umbraco.Tests/config/applications.config -src/Umbraco.Tests/config/trees.config -src/Umbraco.Web.UI/web.config -src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config -src/Umbraco.Web.UI/[Cc]onfig/serilog.config -src/Umbraco.Web.UI/[Cc]onfig/serilog.user.config -src/Umbraco.Tests/config/404handlers.config -src/Umbraco.Web.UI/[Vv]iews/*.cshtml -src/Umbraco.Web.UI/[Vv]iews/*.vbhtml -src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config -src/Umbraco.Web.UI/[Vv]iews/* -src/packages/ -src/packages/repositories.config - -src/Umbraco.Web.UI/[Ww]eb.config -*.transformed - -node_modules -lib-bower - -src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/* -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.* -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/navigation.controller.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.controller.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/utilities.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/installer.app.js - -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/ -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html -src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/* -src/Umbraco.Web.UI.Client/[Bb]uild/* -src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/ -src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/ - -src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css -src/Umbraco.Web.UI.Client/vwd.webinfo - -src/Umbraco.Web.UI/App_Plugins/* -src/*.psess -src/*.vspx - -NDependOut/* -QueryResult.htm - -src/Umbraco.Web.UI/[Cc]onfig/appSettings.config -src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config -src/Umbraco.Web.UI/[Uu]mbraco/plugins/* -build/ApiDocs/* -build/ApiDocs/Output/* -src/Umbraco.Web.UI.Client/bower_components/* -/src/Umbraco.Web.UI/[Uu]mbraco/preview -/src/Umbraco.Web.UI/[Uu]mbraco/preview.old - -# Ignore rule for clearing out Belle (avoid rebuilding all the time) -preserve.belle - -# Ignore rule for output of generated documentation files from grunt docserve -src/Umbraco.Web.UI.Docs/api -src/Umbraco.Web.UI.Docs/package-lock.json -src/*.boltdata/ -src/umbraco.sln.ide/* -src/.vs/ - -src/Umbraco.Web.UI/[Jj]s/* -src/Umbraco.Tests/[Mm]edia -tools/docfx/* -apidocs/_site/* -src/*/project.lock.json -src/.idea/* - -apidocs/api/* -build/docs.zip -build/ui-docs.zip -build/csharp-docs.zip -src/packages/ -src/PrecompiledWeb/* - -# Build -build.out/ -build.tmp/ -build/hooks/ -build/temp/ - -# Acceptance tests -cypress.env.json -/src/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts -/src/Umbraco.Tests.AcceptanceTest/package-lock.json -/src/Umbraco.Tests.AcceptanceTest/cypress/videos/ -/src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/ -src/Umbraco.Web.UI/Umbraco/telemetrics-id.umb - -/src/Umbraco.Web.UI.Client/TESTS-*.xml -/src/ApiDocs/api/* -/src/Umbraco.Web.UI.Client/package-lock.json -/src/Umbraco.Web.UI.NetCore/wwwroot/Media/* -/src/Umbraco.Tests.Integration/App_Data/* -/src/Umbraco.Tests.Integration/TEMP/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/assets/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/js/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/lib/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/views/* -/src/Umbraco.Web.UI.NetCore/wwwroot/App_Data/TEMP/* -/src/Umbraco.Web.UI.NetCore/App_Data/Logs/* -/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/TypesCache/* -/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/* -/src/Umbraco.Web.UI.NetCore/App_Data/Smidge/Cache/* -/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Ll]ogs -/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Dd]ata/* -/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Mm]odels/* -/src/Umbraco.Web.UI.NetCore/appsettings.json -/src/Umbraco.Web.UI.NetCore/appsettings.Development.json - - -src/Umbraco.Tests.Integration/umbraco/Data/ -src/Umbraco.Tests.Integration/umbraco/logs/ - -src/Umbraco.Tests.Integration/Views/ - -src/Umbraco.Tests/TEMP/ - -/src/Umbraco.Web.UI/config/umbracoSettings.config - -src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/ -/src/Umbraco.Web.UI.NetCore/appsettings.Local.json -src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/ -src/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf - -src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json +# +# Umbraco CMS .gitignore +# + +# Common files +*.obj +*.pdb +*.user +*.aps +*.pch +*.vspscc +*.orig +*.suo +*.vs10x +*.ndproj +*.ignorer.* + +# Common directories +.DS_Store +._.DS_Store +.vs/ +/local/ + +# Build directories +[Bb]in/ +[Db]ebug*/ +[Rr]elease*/ +obj/ + +# Tools +_ReSharper*/ +_NCrunch_*/ +*.ncrunchsolution +*.ncrunchsolution.user +*.ncrunchproject +*.crunchsolution.cache +tools/NDepend/ + +[Tt]est[Rr]esult* +[Bb]uild[Ll]og.* +*.[Pp]ublish.xml +[sS]ource +[sS]andbox +umbraco.config +App_Data/TEMP/* +[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/* +[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/* +[Uu]mbraco/[Pp]resentation/[Ss]cripts/* +[Uu]mbraco/[Pp]resentation/[Ff]onts/* +[Uu]mbraco/[Pp]resentation/[Cc]ss/* + +src/Umbraco.Tests/App_Data/* + +umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx +umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx + +src/Umbraco.Tests/config/applications.config +src/Umbraco.Tests/config/trees.config +src/Umbraco.Tests/config/404handlers.config +src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config +src/packages/ +src/packages/repositories.config + +*.transformed + +node_modules +lib-bower + +src/Umbraco.Web.UI.Client/[Bb]uild/* +src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/ + +src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css +src/Umbraco.Web.UI.Client/vwd.webinfo + +src/*.psess +src/*.vspx + +NDependOut/* +QueryResult.htm + +build/ApiDocs/* +build/ApiDocs/Output/* +src/Umbraco.Web.UI.Client/bower_components/* + +# Ignore rule for clearing out Belle (avoid rebuilding all the time) +preserve.belle + +# Ignore rule for output of generated documentation files from grunt docserve +src/Umbraco.Web.UI.Docs/api +src/Umbraco.Web.UI.Docs/package-lock.json +src/*.boltdata/ +src/umbraco.sln.ide/* +src/.vs/ + +src/Umbraco.Tests/[Mm]edia +tools/docfx/* +apidocs/_site/* +src/*/project.lock.json +src/.idea/* + +apidocs/api/* +build/docs.zip +build/ui-docs.zip +build/csharp-docs.zip +src/packages/ +src/PrecompiledWeb/* + +# Build +build.out/ +build.tmp/ +build/hooks/ +build/temp/ + +# Acceptance tests +cypress.env.json +/src/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts +/src/Umbraco.Tests.AcceptanceTest/package-lock.json +/src/Umbraco.Tests.AcceptanceTest/cypress/videos/ +/src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/ + +/src/Umbraco.Web.UI.Client/TESTS-*.xml +/src/ApiDocs/api/* +/src/Umbraco.Web.UI.Client/package-lock.json +/src/Umbraco.Web.UI/wwwroot/Media/* +/src/Umbraco.Tests.Integration/App_Data/* +/src/Umbraco.Tests.Integration/TEMP/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/* +/src/Umbraco.Web.UI/wwwroot/App_Data/TEMP/* +/src/Umbraco.Web.UI/App_Data/Logs/* +/src/Umbraco.Web.UI/App_Data/TEMP/TypesCache/* +/src/Umbraco.Web.UI/App_Data/TEMP/* +/src/Umbraco.Web.UI/App_Data/Smidge/Cache/* +/src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs +/src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/* +/src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/* +/src/Umbraco.Web.UI/[Vv]iews/*.vbhtml +/src/Umbraco.Web.UI/appsettings.json +/src/Umbraco.Web.UI/appsettings.Development.json +/src/Umbraco.Web.UI/appsettings.Local.json + + +src/Umbraco.Tests.Integration/umbraco/Data/ +src/Umbraco.Tests.Integration/umbraco/logs/ + +src/Umbraco.Tests.Integration/Views/ + +src/Umbraco.Tests/TEMP/ + +src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/ +src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/ +src/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf + +src/Umbraco.Web.UI/umbraco/config/appsettings-schema.json diff --git a/.vscode/launch.json b/.vscode/launch.json index 85b28c51c1..1c7f8b11d7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,9 +10,9 @@ "request": "launch", "preLaunchTask": "Dotnet build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/src/Umbraco.Web.UI.NetCore/bin/Debug/net5.0/Umbraco.Web.UI.NetCore.dll", + "program": "${workspaceFolder}/src/Umbraco.Web.UI/bin/Debug/net5.0/Umbraco.Web.UI.dll", "args": [], - "cwd": "${workspaceFolder}/src/Umbraco.Web.UI.NetCore", + "cwd": "${workspaceFolder}/src/Umbraco.Web.UI", "stopAtEntry": false, // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser "serverReadyAction": { @@ -33,4 +33,4 @@ "processId": "${command:pickProcess}" } ] -} \ No newline at end of file +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e2b6c01894..9d2a5248e8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -50,18 +50,18 @@ }, { "label": "Dotnet watch", - "detail": "Dotnet run and watch of Web.UI.NetCore", + "detail": "Dotnet run and watch of Web.UI", "promptOnClose": true, "command": "dotnet", "type": "process", "args": [ "watch", "run", - "${workspaceFolder}/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj", + "${workspaceFolder}/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" } ] -} \ No newline at end of file +} diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index f4ee42deeb..c9e29d84b1 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -189,10 +189,10 @@ stages: - powershell: Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer displayName: Create database # - task: DotNetCoreCLI@2 -# displayName: dotnet build (Netcore) +# displayName: dotnet build # inputs: # command: build -# projects: '**/Umbraco.Web.UI.Netcore.csproj' +# projects: '**/Umbraco.Web.UI.csproj' - task: NodeTool@0 displayName: Use Node 11.x inputs: @@ -208,10 +208,10 @@ stages: gulpFile: src\Umbraco.Web.UI.Client\gulpfile.js targets: build workingDirectory: src\Umbraco.Web.UI.Client - - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI.Netcore\Umbraco.Web.UI.Netcore.csproj" - displayName: dotnet run (Netcore) -# - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj -# displayName: dotnet run (Netcore) + - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" + displayName: dotnet run +# - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj +# displayName: dotnet run - task: PowerShell@1 displayName: Generate Cypress.env.json inputs: @@ -302,10 +302,10 @@ stages: targets: build workingDirectory: src/Umbraco.Web.UI.Client - task: Bash@3 - displayName: dotnet run (Netcore) + displayName: dotnet run inputs: targetType: 'inline' - script: 'nohup dotnet run -p ./src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj &' + script: 'nohup dotnet run -p ./src/Umbraco.Web.UI/Umbraco.Web.UI.csproj &' - task: Bash@3 displayName: Generate Cypress.env.json inputs: diff --git a/build/build.ps1 b/build/build.ps1 index a5f8b6a3e4..ea0a50e5b1 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -53,7 +53,7 @@ $port = "" + $semver.Major + $semver.Minor + ("" + $semver.Patch).PadLeft(2, '0') Write-Host "Update port in launchSettings.json to $port" - $filePath = "$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Properties\launchSettings.json" + $filePath = "$($this.SolutionRoot)\src\Umbraco.Web.UI\Properties\launchSettings.json" $this.ReplaceFileText($filePath, ` "http://localhost:(\d+)?", ` "http://localhost:$port") @@ -178,13 +178,13 @@ Write-Host "Compile Umbraco" Write-Host "Logging to $log" - & dotnet build "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" ` + & dotnet build "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" ` --configuration $buildConfiguration ` --output "$($this.BuildTemp)\bin\\" ` > $log # get files into WebApp\bin - & dotnet publish "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" ` + & dotnet publish "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" ` --configuration Release --output "$($this.BuildTemp)\WebApp\bin\\" ` > $log @@ -200,13 +200,13 @@ $this.RemoveFile($excludeFiles) # copy rest of the files into WebApp - $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco") + $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco") $excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\umbraco\lib") $this.RemoveDirectory($excludeUmbracoDirs) - $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Views", "*", "$($this.BuildTemp)\WebApp\Views") - Copy-Item "$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\appsettings.json" "$($this.BuildTemp)\WebApp" + $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI\Views", "*", "$($this.BuildTemp)\WebApp\Views") + Copy-Item "$($this.SolutionRoot)\src\Umbraco.Web.UI\appsettings.json" "$($this.BuildTemp)\WebApp" - if (-not $?) { throw "Failed to compile Umbraco.Web.UI.NetCore." } + if (-not $?) { throw "Failed to compile Umbraco.Web.UI." } # /p:UmbracoBuild tells the csproj that we are building from PS, not VS }) @@ -296,9 +296,6 @@ $buildConfiguration = "Release" - # restore web.config - #$this.TempRestoreFile("$src\Umbraco.Web.UI\web.config") - # cleanup build Write-Host "Clean build" $this.RemoveFile("$tmp\bin\*.dll.config") @@ -319,9 +316,6 @@ Write-Host "Copy xml documentation" Copy-Item -force "$tmp\bin\*.xml" "$tmp\WebApp\bin" - # Write-Host "Copy transformed web.config" - # $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config") - # offset the modified timestamps on all umbraco dlls, as WebResources # break if date is in the future, which, due to timezone offsets can happen. Write-Host "Offset dlls timestamps" @@ -344,10 +338,10 @@ # copy Belle Write-Host "Copy Belle" - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views") @@ -356,9 +350,9 @@ $this.CopyFiles("$templates", "*", "$tmp\Templates") Write-Host "Copy files for dotnet templates" - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Program.cs", "$tmp\Templates\UmbracoProject") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Startup.cs", "$tmp\Templates\UmbracoProject") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\Views", "*", "$tmp\Templates\UmbracoProject\Views") + $this.CopyFiles("$src\Umbraco.Web.UI", "Program.cs", "$tmp\Templates\UmbracoProject") + $this.CopyFiles("$src\Umbraco.Web.UI", "Startup.cs", "$tmp\Templates\UmbracoProject") + $this.CopyFiles("$src\Umbraco.Web.UI\Views", "*", "$tmp\Templates\UmbracoProject\Views") $this.RemoveDirectory("$tmp\Templates\UmbracoProject\bin") }) @@ -366,10 +360,6 @@ $ubuild.DefineMethod("PrepareBuild", { - # $this.TempStoreFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config") - # Write-Host "Create clean web.config" - # $this.CopyFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.Template.config", "$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config") - Write-host "Set environment" $env:UMBRACO_VERSION=$this.Version.Semver.ToString() $env:UMBRACO_RELEASE=$this.Version.Release @@ -453,7 +443,7 @@ { $this.VerifyNuGetConsistency( ("UmbracoCms"), - ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Web.UI.NetCore", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice", "Umbraco.Persistence.SqlCe")) + ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Web.UI", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice", "Umbraco.Persistence.SqlCe")) if ($this.OnError()) { return } }) diff --git a/build/templates/UmbracoProject/.template.config/template.json b/build/templates/UmbracoProject/.template.config/template.json index 3b34f77130..9fa69b6df4 100644 --- a/build/templates/UmbracoProject/.template.config/template.json +++ b/build/templates/UmbracoProject/.template.config/template.json @@ -35,7 +35,7 @@ "type": "generated", "generator": "regex", "dataType": "string", - "replaces": "Umbraco.Cms.Web.UI.NetCore", + "replaces": "Umbraco.Cms.Web.UI", "parameters": { "source": "name", "steps": [ diff --git a/build/templates/UmbracoProject/Properties/launchSettings.json b/build/templates/UmbracoProject/Properties/launchSettings.json index f40916f4d1..97fdc9f7f5 100644 --- a/build/templates/UmbracoProject/Properties/launchSettings.json +++ b/build/templates/UmbracoProject/Properties/launchSettings.json @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Umbraco.Web.UI.NetCore": { + "Umbraco.Web.UI": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, diff --git a/build/templates/UmbracoProject/UmbracoProject.csproj b/build/templates/UmbracoProject/UmbracoProject.csproj index 2310f789e2..09e95b43b0 100644 --- a/build/templates/UmbracoProject/UmbracoProject.csproj +++ b/build/templates/UmbracoProject/UmbracoProject.csproj @@ -1,7 +1,7 @@  net5.0 - Umbraco.Cms.Web.UI.NetCore + Umbraco.Cms.Web.UI @@ -39,6 +39,10 @@ true Always + + true + Always + diff --git a/build/templates/UmbracoProject/Views/_ViewImports.cshtml b/build/templates/UmbracoProject/Views/_ViewImports.cshtml index ec320f2af5..cb9a0b658e 100644 --- a/build/templates/UmbracoProject/Views/_ViewImports.cshtml +++ b/build/templates/UmbracoProject/Views/_ViewImports.cshtml @@ -1,8 +1,8 @@ -@using Umbraco.Web.UI.NetCore +@using Umbraco.Web.UI @using Umbraco.Extensions @using Umbraco.Web.PublishedModels @using Umbraco.Cms.Core.Models.PublishedContent @using Microsoft.AspNetCore.Html @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Smidge -@inject Smidge.SmidgeHelper SmidgeHelper \ No newline at end of file +@inject Smidge.SmidgeHelper SmidgeHelper diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json index 2e9d9c0836..e5f6dd7410 100644 --- a/src/ApiDocs/docfx.json +++ b/src/ApiDocs/docfx.json @@ -14,7 +14,6 @@ "**/Umbraco.Web.csproj", "**/Umbraco.Infrastructure.csproj", "**/Umbraco.Web.UI.csproj", - "**/Umbraco.Web.UI.Netcore.csproj", "**/**.Test**/*.csproj" ] } diff --git a/src/JsonSchema/Program.cs b/src/JsonSchema/Program.cs index d8b31ad224..cd09093020 100644 --- a/src/JsonSchema/Program.cs +++ b/src/JsonSchema/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Threading.Tasks; using CommandLine; @@ -9,7 +9,7 @@ namespace JsonSchema { private class Options { - [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json")] + [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI/umbraco/config/appsettings-schema.json")] public string OutputFile { get; set; } } diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index f43ac533a7..e216516437 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs index d6197a371a..61d96e2e61 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs @@ -40,6 +40,7 @@ using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Cms.Infrastructure.HealthChecks; using Umbraco.Cms.Infrastructure.HostedServices; using Umbraco.Cms.Infrastructure.Install; +using Umbraco.Cms.Infrastructure.Mail; using Umbraco.Cms.Infrastructure.Media; using Umbraco.Cms.Infrastructure.Migrations; using Umbraco.Cms.Infrastructure.Migrations.Install; @@ -52,7 +53,6 @@ using Umbraco.Cms.Infrastructure.Runtime; using Umbraco.Cms.Infrastructure.Search; using Umbraco.Cms.Infrastructure.Serialization; using Umbraco.Extensions; -using System; namespace Umbraco.Cms.Infrastructure.DependencyInjection { diff --git a/src/Umbraco.Infrastructure/EmailSender.cs b/src/Umbraco.Infrastructure/Mail/EmailSender.cs similarity index 91% rename from src/Umbraco.Infrastructure/EmailSender.cs rename to src/Umbraco.Infrastructure/Mail/EmailSender.cs index 20c48a3b04..4c48a759fe 100644 --- a/src/Umbraco.Infrastructure/EmailSender.cs +++ b/src/Umbraco.Infrastructure/Mail/EmailSender.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Core.Notifications; using Umbraco.Cms.Infrastructure.Extensions; using SmtpClient = MailKit.Net.Smtp.SmtpClient; -namespace Umbraco.Cms.Infrastructure +namespace Umbraco.Cms.Infrastructure.Mail { /// /// A utility class for sending emails @@ -30,11 +30,15 @@ namespace Umbraco.Cms.Infrastructure ILogger logger, IOptions globalSettings, IEventAggregator eventAggregator) - : this(globalSettings, eventAggregator, null) - => _logger = logger; + : this(logger, globalSettings, eventAggregator, null) { } - public EmailSender(IOptions globalSettings, IEventAggregator eventAggregator, INotificationHandler handler) + public EmailSender( + ILogger logger, + IOptions globalSettings, + IEventAggregator eventAggregator, + INotificationHandler handler) { + _logger = logger; _eventAggregator = eventAggregator; _globalSettings = globalSettings.Value; _notificationHandlerRegistered = handler is not null; diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 88a43fd1c1..67adb9907c 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -18,9 +18,9 @@ - + - + @@ -28,20 +28,20 @@ - + - + - + diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index 85bcd07185..2915ce44e2 100644 --- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -17,7 +17,7 @@ - 0.13.0 + 0.13.1 5.0.0 diff --git a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj index 142f210d44..89f2711db5 100644 --- a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj +++ b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj @@ -8,11 +8,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index bb0da4d08a..1d7142d270 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -85,8 +85,8 @@ namespace Umbraco.Cms.Tests.Integration.DependencyInjection currFolder = currFolder.Parent; } - DirectoryInfo netcoreUI = currFolder.GetDirectories("Umbraco.Web.UI.NetCore", SearchOption.TopDirectoryOnly).First(); - var mainLangFolder = new DirectoryInfo(Path.Combine(netcoreUI.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); + DirectoryInfo uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); + var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); return new LocalizedTextServiceFileSources( loggerFactory.CreateLogger(), diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs index 74d364256f..b1f3fbf847 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs @@ -148,16 +148,34 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging Name = "test", }; bool result = PackageBuilder.SavePackage(def); - + //Update values and save def.Name = "updated"; + def.ContentNodeId = "test"; + def.Languages.Add("Danish"); + def.Languages.Add("English"); + def.Scripts.Add("TestScript1"); + def.Scripts.Add("TestScript2"); result = PackageBuilder.SavePackage(def); Assert.IsTrue(result); - // re-get def = PackageBuilder.GetById(def.Id); Assert.AreEqual("updated", def.Name); - - // TODO: There's a whole lot more assertions to be done + Assert.Multiple(() => + { + Assert.AreEqual("updated", def.Name); + Assert.AreEqual("test", def.ContentNodeId); + Assert.AreEqual(2, def.Languages.Count()); + Assert.AreEqual(2, def.Scripts.Count()); + Assert.AreEqual(0, def.DataTypes.Count()); + Assert.AreEqual(0, def.DictionaryItems.Count()); + Assert.AreEqual(0, def.DocumentTypes.Count()); + Assert.AreEqual(0, def.Macros.Count()); + Assert.AreEqual(0, def.MediaTypes.Count()); + Assert.AreEqual(0, def.MediaUdis.Count()); + Assert.AreEqual(0, def.PartialViews.Count()); + Assert.AreEqual(0, def.Stylesheets.Count()); + Assert.AreEqual(0, def.Templates.Count()); + }); } [Test] @@ -259,15 +277,24 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging using (FileStream packageZipStream = File.OpenRead(packageXmlPath)) using (ZipArchive zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out XDocument packageXml)) { - Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString()); - Assert.IsNotNull(zipArchive.GetEntry("media/media/test-file.txt")); - - Assert.AreEqual( - $"", - packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting)); - - // TODO: There's a whole lot more assertions to be done - + string test = "test-file.txt"; + Assert.Multiple(() => + { + var mediaEntry = zipArchive.GetEntry("media/media/test-file.txt"); + Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString()); + Assert.IsNotNull(mediaEntry); + Assert.AreEqual(test, mediaEntry.Name); + Assert.IsNotNull(zipArchive.GetEntry("package.xml")); + Assert.AreEqual( + $"", + packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting)); + Assert.AreEqual(2, zipArchive.Entries.Count()); + Assert.AreEqual(ZipArchiveMode.Read, zipArchive.Mode); + Assert.IsNull(packageXml.DocumentType); + Assert.IsNull(packageXml.NextNode); + Assert.IsNull(packageXml.Parent); + Assert.IsNull(packageXml.PreviousNode); + }); } } @@ -297,12 +324,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging using (var packageXmlStream = File.OpenRead(packageXmlPath)) { var xml = XDocument.Load(packageXmlStream); - Assert.AreEqual("umbPackage", xml.Root.Name.ToString()); - - Assert.AreEqual($"", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting)); - - // TODO: There's a whole lot more assertions to be done - + Assert.Multiple(() => + { + Assert.AreEqual("umbPackage", xml.Root.Name.ToString()); + Assert.AreEqual($"", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting)); + Assert.IsNull(xml.DocumentType); + Assert.IsNull(xml.Parent); + Assert.IsNull(xml.NextNode); + Assert.IsNull(xml.PreviousNode); + }); } } } diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs index d0999a0abc..ee19cd081c 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs @@ -32,9 +32,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage)); using var fileStream = testPackageFile.OpenRead(); CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream)); - Assert.IsNotNull(package); - Assert.AreEqual("Document Type Picker", package.Name); - Assert.AreEqual(1, package.DataTypes.Count()); + Assert.Multiple(() => + { + Assert.IsNotNull(package); + Assert.AreEqual("Document Type Picker", package.Name); + Assert.AreEqual(1, package.DataTypes.Count()); + }); } [Test] @@ -43,12 +46,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), HelloPackage)); using var fileStream = testPackageFile.OpenRead(); CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream)); - Assert.IsNotNull(package); - Assert.AreEqual("Hello", package.Name); - Assert.AreEqual(1, package.Documents.Count()); - Assert.AreEqual(1, package.DocumentTypes.Count()); - Assert.AreEqual(1, package.Templates.Count()); - Assert.AreEqual(1, package.DataTypes.Count()); + Assert.Multiple(() => + { + Assert.IsNotNull(package); + Assert.AreEqual("Hello", package.Name); + Assert.AreEqual(1, package.Documents.Count()); + Assert.AreEqual(1, package.DocumentTypes.Count()); + Assert.AreEqual(1, package.Templates.Count()); + Assert.AreEqual(1, package.DataTypes.Count()); + }); } [Test] @@ -66,9 +72,17 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging using var fileStream = File.OpenRead(packageFile); CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream)); InstallWarnings preInstallWarnings = package.Warnings; - Assert.IsNotNull(preInstallWarnings); - - // TODO: More Asserts + var dataType = package.DataTypes.First(); + Assert.Multiple(() => + { + Assert.AreEqual("Document Type Picker", package.Name); + Assert.AreEqual("3593d8e7-8b35-47b9-beda-5e830ca8c93c", dataType.LastAttribute?.Value); + Assert.AreEqual("Document Type Picker", dataType.FirstAttribute?.Value); + Assert.IsNotNull(preInstallWarnings); + Assert.AreEqual(0, preInstallWarnings.ConflictingMacros.Count()); + Assert.AreEqual(0, preInstallWarnings.ConflictingStylesheets.Count()); + Assert.AreEqual(0, preInstallWarnings.ConflictingTemplates.Count()); + }); } [Test] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index 2b2bb11f21..9ce4f53988 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -76,11 +76,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs index 48e83b9dcf..3a8949cff3 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs @@ -8,10 +8,8 @@ using System.ComponentModel; using System.IO; using System.Linq; using System.Reflection; -using Castle.Core.Logging; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Moq; @@ -36,13 +34,12 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Strings; -using Umbraco.Cms.Infrastructure; +using Umbraco.Cms.Infrastructure.Mail; using Umbraco.Cms.Infrastructure.Persistence; using Umbraco.Cms.Infrastructure.Persistence.Mappers; using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax; using Umbraco.Cms.Tests.Common; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; using File = System.IO.File; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj index 00f25a5d12..0d7777fb26 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj @@ -16,9 +16,9 @@ - + - + diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs index 4d7d0a0f26..0575813811 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs @@ -31,7 +31,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common private IEnumerable GetUiFiles(IEnumerable pathFromNetCore) { var sourceRoot = TestContext.CurrentContext.TestDirectory.Split("Umbraco.Tests.UnitTests")[0]; - var pathToFiles = Path.Combine(sourceRoot, "Umbraco.Web.UI.NetCore"); + var pathToFiles = Path.Combine(sourceRoot, "Umbraco.Web.UI"); foreach (var pathSection in pathFromNetCore) { pathToFiles = Path.Combine(pathToFiles, pathSection); diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 583bc07842..7fca2faa5f 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -25,8 +25,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js index 5991b53f7f..3ff4cf366b 100755 --- a/src/Umbraco.Web.UI.Client/gulp/config.js +++ b/src/Umbraco.Web.UI.Client/gulp/config.js @@ -81,7 +81,7 @@ module.exports = { assets: "./src/assets/**" } }, - roots: ["../Umbraco.Web.UI.NetCore/wwwroot/"], + roots: ["../Umbraco.Web.UI/wwwroot/"], targets: { js: "umbraco/js/", lib: "umbraco/lib/", diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js index b96ab87104..403305630a 100644 --- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js +++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js @@ -34,12 +34,12 @@ module.exports = function (config) { 'test/config/app.unit.js', //application files - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.controllers.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.directives.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.filters.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.services.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.interceptors.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.resources.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.controllers.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.directives.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.filters.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.services.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.interceptors.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.resources.min.js', //mocked data and routing 'src/common/mocks/umbraco.servervariables.js', diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI/Program.cs similarity index 95% rename from src/Umbraco.Web.UI.NetCore/Program.cs rename to src/Umbraco.Web.UI/Program.cs index 7a6ee4dcfd..797fd00562 100644 --- a/src/Umbraco.Web.UI.NetCore/Program.cs +++ b/src/Umbraco.Web.UI/Program.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace Umbraco.Cms.Web.UI.NetCore +namespace Umbraco.Cms.Web.UI { public class Program { diff --git a/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json b/src/Umbraco.Web.UI/Properties/launchSettings.json similarity index 95% rename from src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json rename to src/Umbraco.Web.UI/Properties/launchSettings.json index f4dda49a54..0f5957beb0 100644 --- a/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json +++ b/src/Umbraco.Web.UI/Properties/launchSettings.json @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Umbraco.Web.UI.NetCore": { + "Umbraco.Web.UI": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI/Startup.cs similarity index 98% rename from src/Umbraco.Web.UI.NetCore/Startup.cs rename to src/Umbraco.Web.UI/Startup.cs index 73eeef864f..0d263c7b6b 100644 --- a/src/Umbraco.Web.UI.NetCore/Startup.cs +++ b/src/Umbraco.Web.UI/Startup.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Hosting; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Extensions; -namespace Umbraco.Cms.Web.UI.NetCore +namespace Umbraco.Cms.Web.UI { public class Startup { diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj similarity index 96% rename from src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj rename to src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7979338f47..7e2d51b12c 100644 --- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2,10 +2,10 @@ net5.0 - Umbraco.Cms.Web.UI.NetCore + Umbraco.Cms.Web.UI - bin/Release/Umbraco.Web.UI.NetCore.xml + bin/Release/Umbraco.Web.UI.xml true @@ -66,7 +66,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -111,7 +111,7 @@ - + diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml rename to src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml b/src/Umbraco.Web.UI/Views/_ViewImports.cshtml similarity index 90% rename from src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml rename to src/Umbraco.Web.UI/Views/_ViewImports.cshtml index 703e248a8f..2d6f535107 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml +++ b/src/Umbraco.Web.UI/Views/_ViewImports.cshtml @@ -1,5 +1,5 @@ @using Umbraco.Extensions -@using Umbraco.Cms.Web.UI.NetCore +@using Umbraco.Cms.Web.UI @using Umbraco.Cms.Web.Common.PublishedModels @using Umbraco.Cms.Web.Common.Views @using Umbraco.Cms.Core.Models.PublishedContent diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json b/src/Umbraco.Web.UI/appsettings.Development.template.json similarity index 100% rename from src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json rename to src/Umbraco.Web.UI/appsettings.Development.template.json diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.template.json b/src/Umbraco.Web.UI/appsettings.template.json similarity index 100% rename from src/Umbraco.Web.UI.NetCore/appsettings.template.json rename to src/Umbraco.Web.UI/appsettings.template.json diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/EditProfile.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/EditProfile.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Empty.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Empty.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Login.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Login.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Navigation.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Navigation.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/SiteMap.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/SiteMap.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Preview.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Preview.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoInstall/Index.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/umbraco/config/lang/cs.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/cs.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/cs.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/da.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/de.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/de.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/en.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/es.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/es.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/fr.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/fr.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/he.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/he.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/it.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/it.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ja.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/ja.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ko.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/ko.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nb.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/nb.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nl.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/nl.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pl.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/pl.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pt.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/pt.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ru.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/ru.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/sv.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/sv.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/tr.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/tr.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/zh.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh_tw.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml diff --git a/src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico b/src/Umbraco.Web.UI/wwwroot/favicon.ico similarity index 100% rename from src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico rename to src/Umbraco.Web.UI/wwwroot/favicon.ico diff --git a/src/umbraco-netcore-only.sln b/src/umbraco-netcore-only.sln index aca309326c..375c23208a 100644 --- a/src/umbraco-netcore-only.sln +++ b/src/umbraco-netcore-only.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29209.152 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" ProjectSection(SolutionItems) = preProject ..\linting\.editorconfig = ..\linting\.editorconfig @@ -128,8 +130,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.PublishedCache.NuCa EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Common", "Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}" diff --git a/src/umbraco.sln b/src/umbraco.sln index 687839d814..fe2e8a5a44 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29209.152 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" ProjectSection(SolutionItems) = preProject ..\linting\.editorconfig = ..\linting\.editorconfig @@ -136,8 +138,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "U EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{D6319409-777A-4BD0-93ED-B2DFD805B32C}"