From bee2776035e5ebd2b1b92574adeca1fbb25712af Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Fri, 25 Jan 2019 09:10:49 +0000 Subject: [PATCH 1/4] Bye bye FileSystemProvider.config - we no longer use you --- .../FileSystemProviderElement.cs | 67 ------------------- .../FileSystemProviderElementCollection.cs | 43 ------------ .../FileSystemProvidersSection.cs | 30 --------- .../IFileSystemProviderElement.cs | 11 --- .../IFileSystemProvidersSection.cs | 9 --- src/Umbraco.Core/Umbraco.Core.csproj | 5 -- .../Configurations/FileSystemProviderTests.cs | 25 ------- src/Umbraco.Tests/Umbraco.Tests.csproj | 1 - src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 -- .../config/FileSystemProviders.Release.config | 11 --- .../config/FileSystemProviders.config | 11 --- 11 files changed, 217 deletions(-) delete mode 100644 src/Umbraco.Core/Configuration/FileSystemProviderElement.cs delete mode 100644 src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs delete mode 100644 src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs delete mode 100644 src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs delete mode 100644 src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs delete mode 100644 src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs delete mode 100644 src/Umbraco.Web.UI/config/FileSystemProviders.Release.config delete mode 100644 src/Umbraco.Web.UI/config/FileSystemProviders.config diff --git a/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs b/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs deleted file mode 100644 index 1085439b9e..0000000000 --- a/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Text; - -namespace Umbraco.Core.Configuration -{ - public class FileSystemProviderElement : ConfigurationElement, IFileSystemProviderElement - { - private const string ALIAS_KEY = "alias"; - private const string TYPE_KEY = "type"; - private const string PARAMETERS_KEY = "Parameters"; - - [ConfigurationProperty(ALIAS_KEY, IsKey = true, IsRequired = true)] - public string Alias - { - get - { - return ((string)(base[ALIAS_KEY])); - } - } - - [ConfigurationProperty(TYPE_KEY, IsKey = false, IsRequired = true)] - public string Type - { - get - { - return ((string)(base[TYPE_KEY])); - } - } - - [ConfigurationProperty(PARAMETERS_KEY, IsDefaultCollection = true, IsRequired = false)] - public KeyValueConfigurationCollection Parameters - { - get - { - return ((KeyValueConfigurationCollection)(base[PARAMETERS_KEY])); - } - } - - string IFileSystemProviderElement.Alias - { - get { return Alias; } - } - - string IFileSystemProviderElement.Type - { - get { return Type; } - } - - private IDictionary _params; - IDictionary IFileSystemProviderElement.Parameters - { - get - { - if (_params != null) return _params; - _params = new Dictionary(); - foreach (KeyValueConfigurationElement element in Parameters) - { - _params.Add(element.Key, element.Value); - } - return _params; - } - } - } -} diff --git a/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs b/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs deleted file mode 100644 index 8d1fdb017e..0000000000 --- a/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Text; - -namespace Umbraco.Core.Configuration -{ - [ConfigurationCollection(typeof(FileSystemProviderElement), AddItemName = "Provider")] - public class FileSystemProviderElementCollection : ConfigurationElementCollection, IEnumerable - { - protected override ConfigurationElement CreateNewElement() - { - return new FileSystemProviderElement(); - } - - protected override object GetElementKey(ConfigurationElement element) - { - return ((FileSystemProviderElement)(element)).Alias; - } - - public new FileSystemProviderElement this[string key] - { - get - { - return (FileSystemProviderElement)BaseGet(key); - } - } - - IEnumerator IEnumerable.GetEnumerator() - { - for (var i = 0; i < Count; i++) - { - yield return BaseGet(i) as IFileSystemProviderElement; - } - } - - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } -} diff --git a/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs b/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs deleted file mode 100644 index 7c6c552ddd..0000000000 --- a/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Text; - -namespace Umbraco.Core.Configuration -{ - public class FileSystemProvidersSection : ConfigurationSection, IFileSystemProvidersSection - { - - [ConfigurationProperty("", IsDefaultCollection = true, IsRequired = true)] - public FileSystemProviderElementCollection Providers - { - get { return ((FileSystemProviderElementCollection)(base[""])); } - } - - private IDictionary _providers; - - IDictionary IFileSystemProvidersSection.Providers - { - get - { - if (_providers != null) return _providers; - _providers = Providers.ToDictionary(x => x.Alias, x => x); - return _providers; - } - } - } -} diff --git a/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs b/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs deleted file mode 100644 index 438e6f2b81..0000000000 --- a/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; - -namespace Umbraco.Core.Configuration -{ - public interface IFileSystemProviderElement - { - string Alias { get; } - string Type { get; } - IDictionary Parameters { get; } - } -} diff --git a/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs b/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs deleted file mode 100644 index f87ba383a9..0000000000 --- a/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; - -namespace Umbraco.Core.Configuration -{ - public interface IFileSystemProvidersSection - { - IDictionary Providers { get; } - } -} diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 1a978650f0..1faa913d75 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -231,9 +231,6 @@ - - - @@ -255,8 +252,6 @@ - - diff --git a/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs b/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs deleted file mode 100644 index c65980e763..0000000000 --- a/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Configuration; -using System.Linq; -using Moq; -using NUnit.Framework; -using Umbraco.Core.Configuration; -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Tests.Configurations -{ - - [TestFixture] - public class FileSystemProviderTests - { - [Test] - public void Can_Get_Media_Provider() - { - var config = (FileSystemProvidersSection)ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders"); - var providerConfig = config.Providers["media"]; - - Assert.That(providerConfig, Is.Not.Null); - Assert.That(providerConfig.Parameters.AllKeys.Any(), Is.True); - } - } -} diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 61d0672d7f..0db92db58b 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -293,7 +293,6 @@ - diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 045c56764a..2b257b4a51 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -178,9 +178,6 @@ Designer - - FileSystemProviders.config - EmbeddedMedia.config @@ -314,7 +311,6 @@ Designer - diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config b/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config deleted file mode 100644 index 1f038f61c5..0000000000 --- a/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.config b/src/Umbraco.Web.UI/config/FileSystemProviders.config deleted file mode 100644 index 1f038f61c5..0000000000 --- a/src/Umbraco.Web.UI/config/FileSystemProviders.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - From b88ca1db49a75db2fdb93222d3616c07b589dbd7 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Fri, 25 Jan 2019 09:22:02 +0000 Subject: [PATCH 2/4] Remove FIleSystemProviders.config from web.config XML files --- build/NuSpecs/tools/Web.config.install.xdt | 5 --- src/Umbraco.Tests/App.config | 50 ---------------------- src/Umbraco.Web.UI/web.Template.config | 2 - 3 files changed, 57 deletions(-) diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt index e3ba6b27df..2f6fb8f61c 100644 --- a/build/NuSpecs/tools/Web.config.install.xdt +++ b/build/NuSpecs/tools/Web.config.install.xdt @@ -2,7 +2,6 @@ -
@@ -11,7 +10,6 @@
-
@@ -27,13 +25,10 @@ - - - diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config index fdb18c598d..4c5bb57aa2 100644 --- a/src/Umbraco.Tests/App.config +++ b/src/Umbraco.Tests/App.config @@ -1,58 +1,8 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index 2371282a14..749fa0b500 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -13,7 +13,6 @@
-
@@ -27,7 +26,6 @@ - From f49516ff13cfe3dda77c089de36c184c4075fdd4 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 30 Jan 2019 17:14:04 +1100 Subject: [PATCH 3/4] fix csproj building --- src/Umbraco.Core/Umbraco.Core.csproj | 23 ----------------------- src/Umbraco.Tests/Umbraco.Tests.csproj | 2 -- 2 files changed, 25 deletions(-) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index ca4bd40551..366326cd8b 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -211,29 +211,6 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 4fa3961bf1..03d0d4f8cb 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -294,8 +294,6 @@ - - From 08a886b724862c5f5b5776d896658ef9a3c8ae9a Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 30 Jan 2019 17:35:57 +1100 Subject: [PATCH 4/4] nucache bug fix --- src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs index 5bab8aa265..db7aa0d5d1 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs @@ -100,8 +100,8 @@ namespace Umbraco.Web.PublishedCache.NuCache var originPublished = origin.PublishedContent; - DraftContent = new PublishedContent(this, originDraft, umbracoContextAccessor); - PublishedContent = new PublishedContent(this, originPublished, umbracoContextAccessor); + DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft, umbracoContextAccessor); + PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished, umbracoContextAccessor); DraftModel = DraftContent?.CreateModel(); PublishedModel = PublishedContent?.CreateModel();