diff --git a/src/Umbraco.Core/IApplicationEventHandler.cs b/src/Umbraco.Core/IApplicationEventHandler.cs
index a9521d51b6..866ce220d4 100644
--- a/src/Umbraco.Core/IApplicationEventHandler.cs
+++ b/src/Umbraco.Core/IApplicationEventHandler.cs
@@ -1,11 +1,11 @@
-using umbraco.interfaces;
+
namespace Umbraco.Core
{
///
/// Custom IApplicationStartupHandler that auto subscribes to the applications events
///
- public interface IApplicationEventHandler : IApplicationStartupHandler
+ public interface IApplicationEventHandler
{
///
/// ApplicationContext is created and other static objects that require initialization have been setup
diff --git a/src/Umbraco.Tests/MediaFactoryTests.cs b/src/Umbraco.Tests/MediaFactoryTests.cs
index 3dc43d3da3..99e07cc1b1 100644
--- a/src/Umbraco.Tests/MediaFactoryTests.cs
+++ b/src/Umbraco.Tests/MediaFactoryTests.cs
@@ -39,16 +39,7 @@ namespace Umbraco.Tests
PluginManager.Current = null;
}
- ///
- /// Ensures that the media factory finds the correct number of IMediaFactory
- ///
- [Test]
- public void Find_Media_Factories()
- {
- var factories = MediaFactory.Factories;
- Assert.AreEqual(2, factories.Count());
- }
-
+
#region Classes for tests
public class MediaFactory1 : IMediaFactory
{
diff --git a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
index e83a8eecaa..83c667bdc0 100644
--- a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
+++ b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Plugins
_manager.AssembliesToScan = new[]
{
this.GetType().Assembly,
- typeof(ApplicationStartupHandler).Assembly,
+ //typeof(ApplicationStartupHandler).Assembly,
typeof(SqlCEHelper).Assembly,
typeof(CMSNode).Assembly,
typeof(System.Guid).Assembly,
diff --git a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
index 9b01a8c814..1944fe48c1 100644
--- a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.Plugins
_assemblies = new[]
{
this.GetType().Assembly,
- typeof(ApplicationStartupHandler).Assembly,
+ //typeof(ApplicationStartupHandler).Assembly,
typeof(SqlCEHelper).Assembly,
typeof(CMSNode).Assembly,
typeof(System.Guid).Assembly,
@@ -67,16 +67,16 @@ namespace Umbraco.Tests.Plugins
Assert.AreEqual(2, typesFound.Count());
}
- [Test]
- public void Find_Classes_Of_Type()
- {
- var typesFound = TypeFinder.FindClassesOfType(_assemblies);
- var originalTypesFound = TypeFinderOriginal.FindClassesOfType(_assemblies);
+ //[Test]
+ //public void Find_Classes_Of_Type()
+ //{
+ // var typesFound = TypeFinder.FindClassesOfType(_assemblies);
+ // var originalTypesFound = TypeFinderOriginal.FindClassesOfType(_assemblies);
- Assert.AreEqual(originalTypesFound.Count(), typesFound.Count());
- Assert.AreEqual(5, typesFound.Count());
- Assert.AreEqual(5, originalTypesFound.Count());
- }
+ // Assert.AreEqual(originalTypesFound.Count(), typesFound.Count());
+ // Assert.AreEqual(5, typesFound.Count());
+ // Assert.AreEqual(5, originalTypesFound.Count());
+ //}
[Test]
public void Find_Classes_With_Attribute()
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 65da43becc..9e57a14d11 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1449,9 +1449,6 @@
MacroContainerService.asmx
Component
-
- MediaUploader.ashx
-
TagsAutoCompleteHandler.ashx
@@ -1832,7 +1829,6 @@
-
diff --git a/src/packages/repositories.config b/src/packages/repositories.config
index 666deb1455..92890afd96 100644
--- a/src/packages/repositories.config
+++ b/src/packages/repositories.config
@@ -6,7 +6,6 @@
-
diff --git a/src/umbraco.businesslogic/umbraco.businesslogic.csproj b/src/umbraco.businesslogic/umbraco.businesslogic.csproj
index bb3c80cfd1..37bb106271 100644
--- a/src/umbraco.businesslogic/umbraco.businesslogic.csproj
+++ b/src/umbraco.businesslogic/umbraco.businesslogic.csproj
@@ -182,10 +182,8 @@
Code
-
-
diff --git a/src/umbraco.cms/businesslogic/media/MediaFactory.cs b/src/umbraco.cms/businesslogic/media/MediaFactory.cs
index 6123f7eae4..8152ddc018 100644
--- a/src/umbraco.cms/businesslogic/media/MediaFactory.cs
+++ b/src/umbraco.cms/businesslogic/media/MediaFactory.cs
@@ -9,45 +9,6 @@ using umbraco.BusinessLogic.Utils;
namespace umbraco.cms.businesslogic.media
{
- //TODO: This class needs to be changed to use the new MultipleResolverBase, doing this will require migrating and cleaning up
- // a bunch of types so I have left it existing here under legacy code for now.
-
-
- public class MediaFactory
- {
- internal static readonly List Factories = new List();
-
- static MediaFactory()
- {
- Initialize();
- }
-
- private static void Initialize()
- {
- Factories.AddRange(
- PluginManager.Current.CreateInstances(
- PluginManager.Current.ResolveMediaFactories()));
-
- Factories.Sort((f1, f2) => f1.Priority.CompareTo(f2.Priority));
- }
-
- public static IMediaFactory GetMediaFactory(int parentId, PostedMediaFile postedFile, User user)
- {
- var ext = Path.GetExtension(postedFile.FileName);
- if (ext == null)
- return null;
-
- var factories = Factories.Where(mf => mf.Extensions.Contains(ext.ToLower().TrimStart('.'))).ToList();
-
- if (factories.Count == 0)
- factories = Factories.Where(mf => mf.Extensions.Contains("*")).ToList();
-
- if (factories.Count > 0)
- return factories.FirstOrDefault(factory => factory.CanHandleMedia(parentId, postedFile, user));
-
- return null;
- }
- }
public class PostedMediaFile
{
diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj
index 280d2244c6..429c456ec8 100644
--- a/src/umbraco.interfaces/umbraco.interfaces.csproj
+++ b/src/umbraco.interfaces/umbraco.interfaces.csproj
@@ -123,7 +123,6 @@
Properties\SolutionInfo.cs
-