From d94ecfe65e7bb6ffb8fe173ca83347a431c7bcb0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 10 Jul 2020 13:00:54 +0200
Subject: [PATCH] Fixes for running using nuget package

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
---
 build/NuSpecs/UmbracoCms.Core.nuspec              | 15 ++++++---------
 .../Models/ContentSettings.cs                     |  2 +-
 src/Umbraco.Core/Composing/ReferenceResolver.cs   |  2 +-
 .../NotificationMethods/NotificationMethodBase.cs |  3 +--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 8b34a312a3..6e00e02bbe 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -26,7 +26,7 @@
                 <dependency id="Microsoft.Extensions.Configuration" version="[3.1.2,3.999999)" />
                 <dependency id="Microsoft.Extensions.Configuration.Binder" version="[3.1.2,3.999999)" />
                 <dependency id="Microsoft.Extensions.Configuration.Json" version="[3.1.2,3.999999)" />
-                <dependency id="System.Configuration.ConfigurationManager" version="[4.6.0,4.999999)" />
+                <dependency id="System.Configuration.ConfigurationManager" version="[4.7.0,4.999999)" />
                 <dependency id="System.ComponentModel.Annotations" version="[4.7.0,4.999999)" />
                 <dependency id="System.Reflection.Emit.Lightweight" version="[4.3.0,4.999999)" />
                 <dependency id="System.Runtime.Caching" version="[4.6.0,4.999999)" />
@@ -61,19 +61,16 @@
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
                 <dependency id="Examine.Core" version="[2.0.0-alpha.20200128.15,2.999999)" />
                 <dependency id="CSharpTest.Net.Collections-NetStd2" version="[14.906.1403.1084,14.999999)" />
-            </group>
-            <!-- Umbraco.Examine.Lucene -->
-            <group targetFramework="net472">
-                <dependency id="Examine.Lucene" version="[2.0.0-alpha.20200128.15,2.999999)" />
-                <dependency id="Microsoft.SourceLink.GitHub" version="[1.0.0,1.999999)" />
-                <dependency id="Newtonsoft.Json" version="[12.0.3,12.999999)" />
-                <dependency id="NPoco" version="[4.0.2,4.999999)" />
                 <dependency id="SecurityCodeScan" version="[3.4.0,3.999999)" />
             </group>
 
         </dependencies>
     </metadata>
     <files>
+        <!-- Umbraco.Examine.Lucene HACK remove this when Examine lucene is a real netstandard dependency -->
+        <file src="$BuildTmp$\WebApp\bin\Examine.Lucene.dll" target="lib\netstandard2.0\Examine.Lucene.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Lucene.Net.dll" target="lib\netstandard2.0\Lucene.Net.dll" />
+
         <!-- libs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.dll" target="lib\netstandard2.0\Umbraco.Configuration.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\netstandard2.0\Umbraco.Core.dll" />
@@ -81,7 +78,7 @@
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.dll" target="lib\netstandard2.0\Umbraco.Examine.Lucene.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Infrastructure.dll" target="lib\netstandard2.0\Umbraco.Infrastructure.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.PublishedCache.NuCache.dll" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.dll" />
-       
+
         <!-- docs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.xml" target="lib\netstandard2.0\Umbraco.Configuration.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\netstandard2.0\Umbraco.Core.xml" />
diff --git a/src/Umbraco.Configuration/Models/ContentSettings.cs b/src/Umbraco.Configuration/Models/ContentSettings.cs
index bf046a1376..6c9b986dd1 100644
--- a/src/Umbraco.Configuration/Models/ContentSettings.cs
+++ b/src/Umbraco.Configuration/Models/ContentSettings.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Configuration.Models
             _configuration.GetValue(Prefix+"ShowDeprecatedPropertyEditors", false);
 
         public string LoginBackgroundImage =>
-            _configuration.GetValue(Prefix+"LoginBackgroundImage", string.Empty);
+            _configuration.GetValue(Prefix+"LoginBackgroundImage", "assets/img/login.jpg");
 
         private class ContentErrorPage : IContentErrorPage
         {
diff --git a/src/Umbraco.Core/Composing/ReferenceResolver.cs b/src/Umbraco.Core/Composing/ReferenceResolver.cs
index c0334674a3..b6bd121be7 100644
--- a/src/Umbraco.Core/Composing/ReferenceResolver.cs
+++ b/src/Umbraco.Core/Composing/ReferenceResolver.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Core.Composing
 
                     // don't include this item if it's Umbraco
                     // TODO: We should maybe pass an explicit list of these names in?
-                    if (assemblyName.FullName.StartsWith("Umbraco."))
+                    if (assemblyName.FullName.StartsWith("Umbraco.") || assemblyName.Name.EndsWith(".Views"))
                         continue;
 
                     var assembly = Assembly.Load(assemblyName);
diff --git a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
index 9c3516e712..3e6606e965 100644
--- a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
+++ b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
@@ -19,8 +19,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
             }
 
             var notificationMethods = healthCheckSettingsConfig.NotificationSettings.NotificationMethods;
-            var notificationMethod = notificationMethods[attribute.Alias];
-            if (notificationMethod == null)
+            if(!notificationMethods.TryGetValue(attribute.Alias, out var notificationMethod))
             {
                 Enabled = false;
                 return;