From 601d48277e3042ef0655ede6370b750414930313 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Sun, 23 Jun 2019 19:53:57 +0100 Subject: [PATCH 1/8] Update NuSpecs with the XML MetaData for SourceLink --- build/NuSpecs/UmbracoCms.Core.nuspec | 1 + build/NuSpecs/UmbracoCms.Web.nuspec | 1 + build/NuSpecs/UmbracoCms.nuspec | 1 + 3 files changed, 3 insertions(+) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 56462fcc40ee..d93cd4e2411f 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -14,6 +14,7 @@ Contains the core assemblies needed to run Umbraco Cms en-US umbraco + diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec index 614a816f3f8c..4937c8546658 100644 --- a/build/NuSpecs/UmbracoCms.Web.nuspec +++ b/build/NuSpecs/UmbracoCms.Web.nuspec @@ -14,6 +14,7 @@ Contains the core assemblies needed to run Umbraco Cms en-US umbraco + diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index 5cdacca41956..99a4a9e98c3d 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -14,6 +14,7 @@ Installs Umbraco Cms in your Visual Studio ASP.NET project en-US umbraco + From 003ee1a9916c4cd0c69389c099bc1447daf9ea66 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Sun, 23 Jun 2019 19:57:43 +0100 Subject: [PATCH 2/8] Added in Microsoft.SourceLink.GitHub Nuget package --- src/Umbraco.Core/Umbraco.Core.csproj | 5 +++++ src/Umbraco.Examine/Umbraco.Examine.csproj | 5 +++++ src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 5 +++++ src/Umbraco.Web/Umbraco.Web.csproj | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 7c0e41348b16..a874024c853b 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -55,6 +55,11 @@ + + 1.0.0-beta2-19270-01 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + 1.3.0 diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj index 05b209f927f3..14a57c3216cc 100644 --- a/src/Umbraco.Examine/Umbraco.Examine.csproj +++ b/src/Umbraco.Examine/Umbraco.Examine.csproj @@ -49,6 +49,11 @@ + + 1.0.0-beta2-19270-01 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7ae996a6c582..d9aba825d8cb 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -101,6 +101,11 @@ + + 1.0.0-beta2-19270-01 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 7ebcf55155fe..af4b37f2b1ef 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -80,6 +80,11 @@ + + 1.0.0-beta2-19270-01 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 60ed6f6b20f9830bebfa40933dd059fe94318ad4 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 24 Jun 2019 13:18:20 +0100 Subject: [PATCH 3/8] Remove snupkg aka newer Symbol nuget packages --- build/build.ps1 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build/build.ps1 b/build/build.ps1 index 55b686c98edb..e4994d2c4a67 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -15,7 +15,7 @@ [Parameter(Mandatory=$false)] [Alias("doc")] [switch] $docfx = $false, - + # keep the build directories, don't clear them [Parameter(Mandatory=$false)] [Alias("c")] @@ -392,13 +392,13 @@ &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" ` -Properties BuildTmp="$($this.BuildTemp)" ` -Version "$($this.Version.Semver.ToString())" ` - -Symbols -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log" + -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log" if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Core." } &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Web.nuspec" ` -Properties BuildTmp="$($this.BuildTemp)" ` -Version "$($this.Version.Semver.ToString())" ` - -Symbols -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log" + -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log" if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." } &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" ` @@ -429,37 +429,37 @@ Write-Host "Prepare Azure Gallery" $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput) }) - + $ubuild.DefineMethod("PrepareCSharpDocs", { Write-Host "Prepare C# Documentation" - + $src = "$($this.SolutionRoot)\src" $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 - + & $DocFx metadata $DocFxJson & $DocFx build $DocFxJson # zip it & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput }) - + $ubuild.DefineMethod("PrepareAngularDocs", { Write-Host "Prepare Angular Documentation" - + $src = "$($this.SolutionRoot)\src" $out = $this.BuildOutput - + $this.CompileBelle() "Moving to Umbraco.Web.UI.Client folder" From f01be090750acfad253ab145e79ccb050cf16ec2 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 1 Jul 2019 10:13:31 +0100 Subject: [PATCH 4/8] Update sourcelink & set from full to portable --- src/Umbraco.Core/Umbraco.Core.csproj | 4 ++-- src/Umbraco.Examine/Umbraco.Examine.csproj | 4 ++-- src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- src/Umbraco.Web/Umbraco.Web.csproj | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 3daeb3739236..f2ae7b8d99e3 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -13,7 +13,7 @@ true - full + portable false bin\Debug\ TRACE;DEBUG @@ -56,7 +56,7 @@ - 1.0.0-beta2-19270-01 + 1.0.0-beta2-19324-01 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj index 14a57c3216cc..e4116154aec7 100644 --- a/src/Umbraco.Examine/Umbraco.Examine.csproj +++ b/src/Umbraco.Examine/Umbraco.Examine.csproj @@ -13,7 +13,7 @@ true - full + portable false bin\Debug\ DEBUG;TRACE @@ -50,7 +50,7 @@ - 1.0.0-beta2-19270-01 + 1.0.0-beta2-19324-01 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj index b9a5890d573f..39913991f2e1 100644 --- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj +++ b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj @@ -14,7 +14,7 @@ true - full + portable false bin\Debug\ DEBUG;TRACE diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index ee19c27ad0c7..025aea0fb10f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -34,7 +34,7 @@ true - full + portable false bin\ TRACE;DEBUG @@ -102,7 +102,7 @@ - 1.0.0-beta2-19270-01 + 1.0.0-beta2-19324-01 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 9bcc1da13dd5..2c8e8bc91545 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -16,7 +16,7 @@ true - full + portable false bin\Debug\ DEBUG;TRACE @@ -81,7 +81,7 @@ - 1.0.0-beta2-19270-01 + 1.0.0-beta2-19324-01 runtime; build; native; contentfiles; analyzers; buildtransitive all From 0b64e34f05382ecb4c59f8e2ebe6753ca87c6262 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 1 Jul 2019 10:19:09 +0100 Subject: [PATCH 5/8] Add in SourceLink Nuget to Umbraco.ModelsBuilder csproj --- src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj index 39913991f2e1..7c3af3312dd1 100644 --- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj +++ b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj @@ -103,6 +103,11 @@ 2.8.0 + + 1.0.0-beta2-19324-01 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 760f6a1647df7e15ec4426ca7d31c84798a2a440 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 1 Jul 2019 10:54:29 +0100 Subject: [PATCH 6/8] Umbraco.Web.UI revert change as no real CS code to F11 into this project --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 025aea0fb10f..b27f6aa335ac 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -34,7 +34,7 @@ true - portable + full false bin\ TRACE;DEBUG From b64f30353766470b6ffb05cc42645de99e3e943f Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 1 Jul 2019 11:20:07 +0100 Subject: [PATCH 7/8] Mark the release PDB as portable too - the Powershell build uses Release not Debug --- src/Umbraco.Core/Umbraco.Core.csproj | 2 +- src/Umbraco.Examine/Umbraco.Examine.csproj | 2 +- src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index f2ae7b8d99e3..facb7b034608 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -23,7 +23,7 @@ latest - pdbonly + portable true bin\Release\ TRACE diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj index e4116154aec7..95690c17e47f 100644 --- a/src/Umbraco.Examine/Umbraco.Examine.csproj +++ b/src/Umbraco.Examine/Umbraco.Examine.csproj @@ -23,7 +23,7 @@ latest - pdbonly + portable true bin\Release\ TRACE diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj index 7c3af3312dd1..60ef944a8c5e 100644 --- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj +++ b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj @@ -22,7 +22,7 @@ 4 - pdbonly + portable true bin\Release\ TRACE diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 2c8e8bc91545..5f076e60c36a 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -26,7 +26,7 @@ latest - pdbonly + portable true bin\Release\ TRACE From 3effc66b2c6472334ad19731de0def60ed0b399e Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 1 Jul 2019 11:53:22 +0100 Subject: [PATCH 8/8] Need to update NuSpec to ensure the PDB are getting coppied into the bin when Nuget pacakeg installed into a project --- build/NuSpecs/UmbracoCms.Core.nuspec | 4 ++-- build/NuSpecs/UmbracoCms.Web.nuspec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index d93cd4e2411f..fce15eb487ae 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -45,7 +45,7 @@ - + @@ -56,6 +56,6 @@ - + diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec index 4937c8546658..4aa354eba245 100644 --- a/build/NuSpecs/UmbracoCms.Web.nuspec +++ b/build/NuSpecs/UmbracoCms.Web.nuspec @@ -44,7 +44,7 @@ - + @@ -59,7 +59,7 @@ - - + +