From c03bff4399c0133b9e86f54ec3658dd11ec47505 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Tue, 7 Jul 2020 16:10:06 +0200 Subject: [PATCH 1/3] Nuget package specifications for SQL CE --- build/NuSpecs/UmbracoCms.SqlCe.nuspec | 42 +++++++++++++++++++++++++++ build/build.ps1 | 9 ++++++ 2 files changed, 51 insertions(+) create mode 100644 build/NuSpecs/UmbracoCms.SqlCe.nuspec diff --git a/build/NuSpecs/UmbracoCms.SqlCe.nuspec b/build/NuSpecs/UmbracoCms.SqlCe.nuspec new file mode 100644 index 0000000000..6c2f5584bb --- /dev/null +++ b/build/NuSpecs/UmbracoCms.SqlCe.nuspec @@ -0,0 +1,42 @@ + + + + UmbracoCms.SqlCe + 9.0.0 + Umbraco Cms Core Binaries + Umbraco HQ + Umbraco HQ + MIT + https://umbraco.com/ + https://umbraco.com/dist/nuget/logo-small.png + false + Contains the SQL CE assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project. + Contains the SQL CE assemblies needed to run Umbraco Cms + en-US + umbraco + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/build.ps1 b/build/build.ps1 index a59eb2c5ca..5a8219366c 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -247,6 +247,9 @@ /p:UmbracoBuild=True ` > $log + # copy Umbraco.Persistance.SqlCe files into WebApp + Copy-Item "$($this.BuildTemp)\tests\Umbraco.Persistance.SqlCe.*" "$($this.BuildTemp)\WebApp\bin" + if (-not $?) { throw "Failed to compile tests." } # /p:UmbracoBuild tells the csproj that we are building from PS @@ -420,6 +423,12 @@ -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log" if (-not $?) { throw "Failed to pack NuGet UmbracoCms." } + &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.SqlCe.nuspec" ` + -Properties BuildTmp="$($this.BuildTemp)" ` + -Version "$($this.Version.Semver.ToString())" ` + -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmssqlce.log" + if (-not $?) { throw "Failed to pack NuGet UmbracoCms.SqlCe." } + # run hook if ($this.HasMethod("PostPackageNuGet")) { From 8c38c22648df500742a2cbe0f6638384f3109fe8 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 8 Jul 2020 08:40:55 +0200 Subject: [PATCH 2/3] Added additional target framework and changed nuget package title --- build/NuSpecs/UmbracoCms.SqlCe.nuspec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.SqlCe.nuspec b/build/NuSpecs/UmbracoCms.SqlCe.nuspec index 6c2f5584bb..184928f127 100644 --- a/build/NuSpecs/UmbracoCms.SqlCe.nuspec +++ b/build/NuSpecs/UmbracoCms.SqlCe.nuspec @@ -3,7 +3,7 @@ UmbracoCms.SqlCe 9.0.0 - Umbraco Cms Core Binaries + Umbraco Cms Sql Ce Add-on Umbraco HQ Umbraco HQ MIT @@ -17,13 +17,15 @@ - + + + From 6282ac4a5b944bc820b7849f8ea51201f067de98 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 8 Jul 2020 09:07:54 +0200 Subject: [PATCH 3/3] Merged changes from base branch --- build/build.ps1 | 26 +++++-------------- .../Umbraco.Configuration.csproj | 4 +++ src/Umbraco.Core/Umbraco.Core.csproj | 4 +++ .../Umbraco.Infrastructure.csproj | 6 ++++- .../Umbraco.Persistance.SqlCe.csproj | 4 +++ .../Umbraco.PublishedCache.NuCache.csproj | 4 +++ .../Umbraco.Web.BackOffice.csproj | 4 +++ .../Umbraco.Web.Common.csproj | 4 +++ .../Umbraco.Web.UI.NetCore.csproj | 5 ++++ .../Umbraco.Web.Website.csproj | 4 +++ 10 files changed, 45 insertions(+), 20 deletions(-) diff --git a/build/build.ps1 b/build/build.ps1 index 5a8219366c..7b491768dc 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -180,10 +180,10 @@ $this.RemoveFile($excludeFiles) # copy rest of the files into WebApp - $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Config", "*", "$($this.BuildTemp)\WebApp\Config") + $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Config", "*", "$($this.BuildTemp)\WebApp\config") $this.RemoveFile("$($this.BuildTemp)\WebApp\Config\*.Release.*") - $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Umbraco", "*", "$($this.BuildTemp)\WebApp\Umbraco") - $excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\Umbraco\config","$($this.BuildTemp)\WebApp\Umbraco\lib") + $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco") + $excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\umbraco\config","$($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" @@ -322,10 +322,10 @@ # copy Belle Write-Host "Copy Belle" - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\umbraco\assets", "*", "$tmp\WebApp\umbraco\assets") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\umbraco\js", "*", "$tmp\WebApp\umbraco\js") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\umbraco\lib", "*", "$tmp\WebApp\umbraco\lib") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\umbraco\views", "*", "$tmp\WebApp\umbraco\views") + $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") }) $ubuild.DefineMethod("PackageZip", @@ -378,16 +378,6 @@ } }) - $ubuild.DefineMethod("PrepareNuGet", - { - Write-Host "Prepare NuGet" - - # add Web.config transform files to the NuGet package - Write-Host "Add web.config transforms to NuGet package" - mv "$($this.BuildTemp)\WebApp\Views\Web.config" "$($this.BuildTemp)\WebApp\Views\Web.config.transform" - - }) - $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json" $ubuild.DefineMethod("RestoreNuGet", @@ -523,8 +513,6 @@ if ($this.OnError()) { return } $this.VerifyNuGet() if ($this.OnError()) { return } - $this.PrepareNuGet() - if ($this.OnError()) { return } $this.PackageNuGet() if ($this.OnError()) { return } $this.PrepareAzureGallery() diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj index 2337ea24f8..9111a713ad 100644 --- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj +++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj @@ -5,6 +5,10 @@ 8 + + bin\Release\Umbraco.Configuration.xml + + diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 53e6fe3fbc..69ca2e5f18 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -10,6 +10,10 @@ Umbraco CMS + + bin\Release\Umbraco.Core.xml + + diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 1af8ce9119..acda3adceb 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -1,10 +1,14 @@ - + netstandard2.0 8 + + bin\Release\Umbraco.Infrastructure.xml + + diff --git a/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj b/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj index 8b4ac02a5c..ff6ef95806 100644 --- a/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj +++ b/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj @@ -5,6 +5,10 @@ net472 + + bin\Release\Umbraco.Persistance.SqlCe.xml + + diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index 75eeca268b..4a7733a810 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -6,6 +6,10 @@ 8 + + bin\Release\Umbraco.PublishedCache.NuCache.xml + + diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index ed2b2b482c..1c05a56f71 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -6,6 +6,10 @@ 8 + + bin\Release\Umbraco.Web.BackOffice.xml + + diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 9f6509cd82..447681c4ff 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -6,6 +6,10 @@ 8 + + bin\Release\Umbraco.Web.Common.xml + + diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj index 8f7b78b128..c2b2e2b7c6 100644 --- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj +++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj @@ -4,6 +4,11 @@ netcoreapp3.1 Umbraco.Web.UI.NetCore + + + bin\Release\Umbraco.Web.UI.NetCore.xml + + diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj index d2ef3b58f6..17a0630c83 100644 --- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj +++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj @@ -4,6 +4,10 @@ netcoreapp3.1 Library + + + bin\Release\Umbraco.Web.Website.xml +