From d580153c9ab9a40abacd23dc4be211395db437d3 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Wed, 15 May 2019 13:51:07 +0200
Subject: [PATCH 1/4] Removing build-docs.ps1 script since it is integrated now
 in the build.ps1

---
 build/build-docs.ps1 | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 build/build-docs.ps1

diff --git a/build/build-docs.ps1 b/build/build-docs.ps1
deleted file mode 100644
index 8cd3f090c7..0000000000
--- a/build/build-docs.ps1
+++ /dev/null
@@ -1,44 +0,0 @@
-$uenv=build/build.ps1 -get
-
-$src = "$($uenv.SolutionRoot)\src"
-$tmp = $uenv.BuildTemp
-$out = $uenv.BuildOutput
-$DocFxJson = "$src\ApiDocs\docfx.json"
-$DocFxSiteOutput = "$tmp\_site\*.*"
-
-################ Do the UI docs
-$uenv.CompileBelle()
-
-"Moving to Umbraco.Web.UI.Client folder"
-cd .\src\Umbraco.Web.UI.Client
-
-"Generating the docs and waiting before executing the next commands"
-& gulp docs | Out-Null
-
-# change baseUrl
-$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-$IndexPath = "./docs/api/index.html"
-(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
-
-
-################ Do the c# docs
-
-# Build the solution in debug mode
-$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
-#$uenv.CompileUmbraco()
-
-#restore nuget packages
-$uenv.RestoreNuGet()
-
-# run DocFx
-$DocFx = $uenv.BuildEnv.DocFx
-
-Write-Host "$DocFxJson"
-& $DocFx metadata $DocFxJson
-& $DocFx build $DocFxJson
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput

From 1a54cdb58364355a1e7746c9810891396101e308 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Wed, 15 May 2019 13:54:35 +0200
Subject: [PATCH 2/4] Functions for the API docs are refactored

---
 build/build.ps1 | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/build/build.ps1 b/build/build.ps1
index 55b686c98e..978d6b2c26 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -430,19 +430,16 @@
     $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
   })
   
-  $ubuild.DefineMethod("PrepareCSharpDocs",
+  $ubuild.DefineMethod("BuildCSharpDocs",
   {
-    Write-Host "Prepare C# Documentation"
+    Write-Host "Building C# Documentation"
 	
     $src = "$($this.SolutionRoot)\src"
-      $tmp = $this.BuildTemp
-      $out = $this.BuildOutput
+    $tmp = $this.BuildTemp
+    $out = $this.BuildOutput
     $DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
     $DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
 	
-
-	#restore nuget packages
-	$this.RestoreNuGet()
     # run DocFx
     $DocFx = $this.BuildEnv.DocFx
     
@@ -453,24 +450,26 @@
     & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
   })
   
-  $ubuild.DefineMethod("PrepareAngularDocs",
+  $ubuild.DefineMethod("BuildAngularDocs",
   {
-    Write-Host "Prepare Angular Documentation"
+    Write-Host "Building Angular Documentation"
 	
     $src = "$($this.SolutionRoot)\src"
-      $out = $this.BuildOutput
+    $out = $this.BuildOutput
     
-    $this.CompileBelle()
+    # Check if the solution has been built
+    if (!(Test-Path "$src\Umbraco.Web.UI.Client\node_modules")) {throw "Umbraco needs to be built before generating the Angular Docs"}
 
-    "Moving to Umbraco.Web.UI.Client folder"
-    cd .\src\Umbraco.Web.UI.Client
+    Push-Location "$src\Umbraco.Web.UI.Client"
 
     "Generating the docs and waiting before executing the next commands"
     & gulp docs | Out-Null
 
+    Pop-Location
+    
     # change baseUrl
     $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-    $IndexPath = "./docs/api/index.html"
+    $IndexPath = "$src\Umbraco.Web.UI.Client\docs\api\index.html"
     (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
 
     # zip it

From 3e73888510b2d146efe71954cb84e2208eb9da5e Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 12 May 2020 12:20:32 +0200
Subject: [PATCH 3/4] Changing path that was causing an error

---
 build/build.ps1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/build.ps1 b/build/build.ps1
index b69f02442b..2ca0a28565 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -460,8 +460,11 @@
     $src = "$($this.SolutionRoot)\src"
     $out = $this.BuildOutput
 
+    # Check if the solution has been built		
+    if (!(Test-Path "$src\Umbraco.Web.UI.Client\node_modules")) {throw "Umbraco needs to be built before generating the Angular Docs"}
+
     "Moving to Umbraco.Web.UI.Docs folder"
-    cd ..\src\Umbraco.Web.UI.Docs
+    cd $src\Umbraco.Web.UI.Docs
 
     "Generating the docs and waiting before executing the next commands"
 	& npm install

From 64be0c99afa43482248d3409290a2da90df886a4 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 12 May 2020 13:33:30 +0200
Subject: [PATCH 4/4] Changing the naming in case they are used on the build
 server

---
 build/build.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/build.ps1 b/build/build.ps1
index 2ca0a28565..45c98a3bcb 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -433,9 +433,9 @@
     $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
   })
 
-  $ubuild.DefineMethod("BuildCSharpDocs",
+  $ubuild.DefineMethod("PrepareCSharpDocs",
   {
-    Write-Host "Building C# Documentation"
+    Write-Host "Prepare C# Documentation"
 
     $src = "$($this.SolutionRoot)\src"
     $tmp = $this.BuildTemp
@@ -453,9 +453,9 @@
     & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
   })
 
-  $ubuild.DefineMethod("BuildAngularDocs",
+  $ubuild.DefineMethod("PrepareAngularDocs",
   {
-    Write-Host "Building Angular Documentation"
+    Write-Host "Prepare Angular Documentation"
 
     $src = "$($this.SolutionRoot)\src"
     $out = $this.BuildOutput