From df6d4a603e60beda26928c7b4cf5d395675d9a1e Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 19 May 2021 15:05:30 +0200 Subject: [PATCH 1/3] Fix lucene reference for linux too --- src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index 2a66eec917..a453e7b92c 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -42,7 +42,7 @@ - + From cb6f74774d7c35eab0dcfd9f8343a5bf1eec6590 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 19 May 2021 19:12:13 +0200 Subject: [PATCH 2/3] No not use explicit nuspec file for Examine.Lucene anymore :) --- .../NuSpecs/UmbracoCms.Examine.Lucene.nuspec | 49 ------------------- build/build.ps1 | 7 --- src/umbraco.sln | 1 - 3 files changed, 57 deletions(-) delete mode 100644 build/NuSpecs/UmbracoCms.Examine.Lucene.nuspec diff --git a/build/NuSpecs/UmbracoCms.Examine.Lucene.nuspec b/build/NuSpecs/UmbracoCms.Examine.Lucene.nuspec deleted file mode 100644 index 19d60f27a9..0000000000 --- a/build/NuSpecs/UmbracoCms.Examine.Lucene.nuspec +++ /dev/null @@ -1,49 +0,0 @@ - - - - Umbraco.Cms.Examine.Lucene - 9.0.0 - Umbraco CMS Examine Binaries - Umbraco HQ - Umbraco HQ - MIT - https://umbraco.com/ - https://umbraco.com/dist/nuget/logo-small.png - false - Contains the Examine 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 dll files required to run Examine. - en-US - umbraco - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/build.ps1 b/build/build.ps1 index be9a8f0f4f..ba99e1e660 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -433,13 +433,6 @@ -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log" if (-not $?) { throw "Failed to pack NuGet UmbracoCms." } - &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Examine.Lucene.nuspec" ` - -Properties BuildTmp="$($this.BuildTemp)" ` - -Version "$($this.Version.Semver.ToString())" ` - -Verbosity detailed ` - -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.examine.lucene.log" - if (-not $?) { throw "Failed to pack Nuget UmbracoCms.Lucene.nuspec"} - &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.SqlCe.nuspec" ` -Properties BuildTmp="$($this.BuildTemp)" ` -Version "$($this.Version.Semver.ToString())" ` diff --git a/src/umbraco.sln b/src/umbraco.sln index 3da24dcca5..b021dfccff 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -39,7 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{227C ProjectSection(SolutionItems) = preProject ..\build\NuSpecs\UmbracoCms.nuspec = ..\build\NuSpecs\UmbracoCms.nuspec ..\build\NuSpecs\UmbracoCms.SqlCe.nuspec = ..\build\NuSpecs\UmbracoCms.SqlCe.nuspec - ..\build\NuSpecs\UmbracoCms.Examine.Lucene.nuspec = ..\build\NuSpecs\UmbracoCms.Examine.Lucene.nuspec ..\build\NuSpecs\UmbracoCms.StaticAssets.nuspec = ..\build\NuSpecs\UmbracoCms.StaticAssets.nuspec EndProjectSection EndProject From 80ee7b398cb951738db15bd2959f2370e2aa7a08 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 19 May 2021 20:40:06 +0200 Subject: [PATCH 3/3] Acquire the maindom before we do unattended installs --- src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs index e2b20ced8f..df4d09bf62 100644 --- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs +++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs @@ -91,6 +91,9 @@ namespace Umbraco.Cms.Infrastructure.Runtime AppDomain.CurrentDomain.SetData("DataDirectory", _hostingEnvironment?.MapPathContentRoot(Constants.SystemDirectories.Data)); + // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate + AcquireMainDom(); + DoUnattendedInstall(); DetermineRuntimeLevel(); @@ -105,8 +108,7 @@ namespace Umbraco.Cms.Infrastructure.Runtime throw new InvalidOperationException($"An instance of {typeof(IApplicationShutdownRegistry)} could not be resolved from the container, ensure that one if registered in your runtime before calling {nameof(IRuntime)}.{nameof(StartAsync)}"); } - // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate - AcquireMainDom(); + // if level is Run and reason is UpgradeMigrations, that means we need to perform an unattended upgrade if (State.Reason == RuntimeLevelReason.UpgradeMigrations && State.Level == RuntimeLevel.Run)