From 490c09b81e8346333d9805a4360ab18084a18fbd Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 18 Aug 2021 10:58:23 +0200
Subject: [PATCH] Remove old references of Umbraco.Web.UI

---
 .gitignore             | 51 +-----------------------------------------
 build/build.ps1        | 10 ---------
 src/ApiDocs/docfx.json |  1 -
 3 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57bb8c3acc..360fe85ee7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,84 +52,38 @@ App_Data/TEMP/*
 [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/*.vbhtml
 src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
 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
@@ -141,7 +95,6 @@ src/*.boltdata/
 src/umbraco.sln.ide/*
 src/.vs/
 
-src/Umbraco.Web.UI/[Jj]s/*
 src/Umbraco.Tests/[Mm]edia
 tools/docfx/*
 apidocs/_site/*
@@ -168,7 +121,6 @@ cypress.env.json
 /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
 
 
 # eof
@@ -191,6 +143,7 @@ src/Umbraco.Web.UI/Umbraco/telemetrics-id.umb
 /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/[Vv]iews/*.vbhtml
 /src/Umbraco.Web.UI.NetCore/appsettings.json
 /src/Umbraco.Web.UI.NetCore/appsettings.Development.json
 
@@ -203,8 +156,6 @@ 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/
diff --git a/build/build.ps1 b/build/build.ps1
index a5f8b6a3e4..9ab602c4ed 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -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"
@@ -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
diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json
index 2e9d9c0836..4ca9e92c6a 100644
--- a/src/ApiDocs/docfx.json
+++ b/src/ApiDocs/docfx.json
@@ -13,7 +13,6 @@
             "**/bin/**",
             "**/Umbraco.Web.csproj",
             "**/Umbraco.Infrastructure.csproj",
-            "**/Umbraco.Web.UI.csproj",
             "**/Umbraco.Web.UI.Netcore.csproj",
             "**/**.Test**/*.csproj"
           ]