From bee2776035e5ebd2b1b92574adeca1fbb25712af Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 25 Jan 2019 09:10:49 +0000
Subject: [PATCH] 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<string, string> _params;
-        IDictionary<string, string> IFileSystemProviderElement.Parameters
-        {
-            get
-            {
-                if (_params != null) return _params;
-                _params = new Dictionary<string, string>();
-                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<IFileSystemProviderElement>
-    {
-        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<IFileSystemProviderElement> IEnumerable<IFileSystemProviderElement>.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<string, IFileSystemProviderElement> _providers;
-
-        IDictionary<string, IFileSystemProviderElement> 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<string, string> 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<string, IFileSystemProviderElement> 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 @@
     <Compile Include="Configuration\Dashboard\SectionElement.cs" />
     <Compile Include="Configuration\Dashboard\TabCollection.cs" />
     <Compile Include="Configuration\Dashboard\TabElement.cs" />
-    <Compile Include="Configuration\FileSystemProviderElement.cs" />
-    <Compile Include="Configuration\FileSystemProviderElementCollection.cs" />
-    <Compile Include="Configuration\FileSystemProvidersSection.cs" />
     <Compile Include="Configuration\GlobalSettings.cs" />
     <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
     <Compile Include="Configuration\Grid\GridConfig.cs" />
@@ -255,8 +252,6 @@
     <Compile Include="Configuration\HealthChecks\NotificationMethodsElementCollection.cs" />
     <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElement.cs" />
     <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElementCollection.cs" />
-    <Compile Include="Configuration\IFileSystemProviderElement.cs" />
-    <Compile Include="Configuration\IFileSystemProvidersSection.cs" />
     <Compile Include="Configuration\IGlobalSettings.cs" />
     <Compile Include="Configuration\InnerTextConfigurationElement.cs" />
     <Compile Include="Configuration\LocalTempStorage.cs" />
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 @@
     <Compile Include="Cache\WebCachingAppCacheTests.cs" />
     <Compile Include="Cache\RuntimeAppCacheTests.cs" />
     <Compile Include="Configurations\DashboardSettings\DashboardSettingsTests.cs" />
-    <Compile Include="Configurations\FileSystemProviderTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\LoggingElementDefaultTests.cs" />
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 @@
     <Content Include="Config\imageprocessor\cache.config">
       <SubType>Designer</SubType>
     </Content>
-    <None Include="Config\FileSystemProviders.Release.config">
-      <DependentUpon>FileSystemProviders.config</DependentUpon>
-    </None>
     <None Include="Config\EmbeddedMedia.Release.config">
       <DependentUpon>EmbeddedMedia.config</DependentUpon>
     </None>
@@ -314,7 +311,6 @@
     <Content Include="Config\umbracoSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\FileSystemProviders.config" />
     <Content Include="Config\EmbeddedMedia.config" />
     <Content Include="Config\BackOfficeTours\getting-started.json" />
   </ItemGroup>
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 @@
-<?xml version="1.0"?>
-<FileSystemProviders>
-  
-  <!-- Media -->
-  <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-    <Parameters>
-      <add key="virtualRoot" value="~/media/" />
-    </Parameters>
-  </Provider>
-   
-</FileSystemProviders>
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 @@
-<?xml version="1.0"?>
-<FileSystemProviders>
-  
-  <!-- Media -->
-  <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-    <Parameters>
-      <add key="virtualRoot" value="~/media/" />
-    </Parameters>
-  </Provider>
-   
-</FileSystemProviders>