swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removes unused line, updates gitignore

Browse Source
This commit is contained in:
Shannon
2019-05-10 13:07:06 +10:00
parent 3d80d511a4
commit 8fce680430
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -161,3 +161,4 @@ build/temp/
# eof # eof
/src/Umbraco.Web.UI.Client/TESTS-*.xml /src/Umbraco.Web.UI.Client/TESTS-*.xml
/src/ApiDocs/api/*
build/build.ps1
+27 -29
View File
@@ -434,50 +434,47 @@
{ {
Write-Host "Prepare C# Documentation" Write-Host "Prepare C# Documentation"
$src = "$($this.SolutionRoot)\src" $src = "$($this.SolutionRoot)\src"
$tmp = $this.BuildTemp $tmp = $this.BuildTemp
$out = $this.BuildOutput $out = $this.BuildOutput
$DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json" $DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
$DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*" $DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
# Build the solution in debug mode
$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
#restore nuget packages #restore nuget packages
$this.RestoreNuGet() $this.RestoreNuGet()
# run DocFx
$DocFx = $this.BuildEnv.DocFx
& $DocFx metadata $DocFxJson
& $DocFx build $DocFxJson
# run DocFx # zip it
$DocFx = $this.BuildEnv.DocFx & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
& $DocFx metadata $DocFxJson
& $DocFx build $DocFxJson
# zip it
& $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
}) })
$ubuild.DefineMethod("PrepareAngularDocs", $ubuild.DefineMethod("PrepareAngularDocs",
{ {
Write-Host "Prepare Angular Documentation" Write-Host "Prepare Angular Documentation"
$src = "$($this.SolutionRoot)\src" $src = "$($this.SolutionRoot)\src"
$out = $this.BuildOutput $out = $this.BuildOutput
$this.CompileBelle() $this.CompileBelle()
"Moving to Umbraco.Web.UI.Client folder" "Moving to Umbraco.Web.UI.Client folder"
cd .\src\Umbraco.Web.UI.Client cd .\src\Umbraco.Web.UI.Client
"Generating the docs and waiting before executing the next commands" "Generating the docs and waiting before executing the next commands"
& gulp docs | Out-Null & gulp docs | Out-Null
# change baseUrl # change baseUrl
$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/" $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
$IndexPath = "./docs/api/index.html" $IndexPath = "./docs/api/index.html"
(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
# zip it # zip it
& $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*" & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
}) })
$ubuild.DefineMethod("Build", $ubuild.DefineMethod("Build",
@@ -511,6 +508,7 @@
if ($this.OnError()) { return } if ($this.OnError()) { return }
$this.PostPackageHook() $this.PostPackageHook()
if ($this.OnError()) { return } if ($this.OnError()) { return }
Write-Host "Done" Write-Host "Done"
}) })