diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/CustomBooleanTypeConverter.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/CustomBooleanTypeConverter.cs deleted file mode 100644 index 4ad77f7bb6..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/CustomBooleanTypeConverter.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.ComponentModel; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - /// - /// Allows for converting string representations of 0 and 1 to boolean - /// - internal class CustomBooleanTypeConverter : BooleanConverter - { - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - if (sourceType == typeof(string)) - { - return true; - } - return base.CanConvertFrom(context, sourceType); - } - - public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value) - { - if (value is string) - { - var str = (string)value; - if (str == "1") return true; - if (str == "0" || str == "") return false; - } - - return base.ConvertFrom(context, culture, value); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/LinkElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/LinkElement.cs deleted file mode 100644 index 31b4aa3e93..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/LinkElement.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class LinkElement : ConfigurationElement, ILink - { - [ConfigurationProperty("application")] - internal string Application - { - get { return (string)base["application"]; } - } - - [ConfigurationProperty("applicationUrl")] - internal string ApplicationUrl - { - get { return (string)base["applicationUrl"]; } - } - - [ConfigurationProperty("language")] - internal string Language - { - get { return (string)base["language"]; } - } - - [ConfigurationProperty("userType")] - internal string UserType - { - get { return (string)base["userType"]; } - } - - [ConfigurationProperty("helpUrl")] - internal string HelpUrl - { - get { return (string)base["helpUrl"]; } - } - - string ILink.Application - { - get { return Application; } - } - - string ILink.ApplicationUrl - { - get { return ApplicationUrl; } - } - - string ILink.Language - { - get { return Language; } - } - - string ILink.UserType - { - get { return UserType; } - } - - string ILink.HelpUrl - { - get { return HelpUrl; } - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/LinksCollection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/LinksCollection.cs deleted file mode 100644 index 5c317790cb..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/LinksCollection.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class LinksCollection : ConfigurationElementCollection, IEnumerable - { - protected override ConfigurationElement CreateNewElement() - { - return new LinkElement(); - } - - protected override object GetElementKey(ConfigurationElement element) - { - return ((LinkElement)element).Application - + ((LinkElement)element).ApplicationUrl - + ((LinkElement)element).Language - + ((LinkElement)element).UserType; - } - - IEnumerator IEnumerable.GetEnumerator() - { - for (var i = 0; i < Count; i++) - { - yield return BaseGet(i) as ILink; - } - } - - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs index f596820506..22df82367d 100644 --- a/src/Umbraco.Core/Constants-Web.cs +++ b/src/Umbraco.Core/Constants-Web.cs @@ -4,7 +4,7 @@ using System.ComponentModel; namespace Umbraco.Core { public static partial class Constants - { + { /// /// Defines the identifiers for Umbraco system nodes. /// @@ -54,5 +54,10 @@ namespace Umbraco.Core public const string SessionIdClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/sessionid"; } + + public static class IO + { + public const string MediaFileSystemProvider = "media"; + } } } \ No newline at end of file diff --git a/src/Umbraco.Core/ControlExtensions.cs b/src/Umbraco.Core/ControlExtensions.cs deleted file mode 100644 index 391c69159f..0000000000 --- a/src/Umbraco.Core/ControlExtensions.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI; - -namespace Umbraco.Core -{ - internal static class ControlExtensions - { - /// - /// Recursively finds a control with the specified identifier. - /// - /// - /// The type of control to be found. - /// - /// - /// The parent control from which the search will start. - /// - /// - /// The identifier of the control to be found. - /// - /// - /// The control with the specified identifier, otherwise if the control - /// is not found. - /// - public static T FindControlRecursive(this Control parent, string id) where T : Control - { - if ((parent is T) && (parent.ID == id)) - { - return (T)parent; - } - - foreach (Control control in parent.Controls) - { - var foundControl = FindControlRecursive(control, id); - if (foundControl != null) - { - return foundControl; - } - } - return default(T); - } - - } -} diff --git a/src/Umbraco.Core/Dynamics/ExtensionMethods.cs b/src/Umbraco.Core/Dynamics/ExtensionMethods.cs deleted file mode 100644 index 8439278b2e..0000000000 --- a/src/Umbraco.Core/Dynamics/ExtensionMethods.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core.Models; - -namespace Umbraco.Core.Dynamics -{ - [Obsolete("This class should not be used, it is just referenced by already obsoleted code and will be removed in the future")] - internal static class ExtensionMethods - { - //public static IEnumerable Map( - // this IEnumerable source, - // Func selectorFunction, - // Func> getChildrenFunction) - //{ - // if (!source.Any()) - // { - // return source; - // } - // // Add what we have to the stack - // var flattenedList = source.Where(selectorFunction); - // // Go through the input enumerable looking for children, - // // and add those if we have them - // foreach (TSource element in source) - // { - // var secondInner = getChildrenFunction(element); - // if (secondInner.Any()) - // { - // secondInner = secondInner.Map(selectorFunction, getChildrenFunction); - // } - // flattenedList = flattenedList.Concat(secondInner); - // } - // return flattenedList; - //} - - [Obsolete("This method should not be used and will be removed in the future")] - public static bool ContainsAny(this string haystack, IEnumerable needles) - { - return StringExtensions.ContainsAny(haystack, needles); - } - [Obsolete("This method should not be used and will be removed in the future")] - public static bool ContainsAny(this string haystack, params string[] needles) - { - return StringExtensions.ContainsAny(haystack, needles); - } - [Obsolete("This method should not be used and will be removed in the future")] - public static bool ContainsAny(this string haystack, StringComparison comparison, IEnumerable needles) - { - return StringExtensions.ContainsAny(haystack, needles, comparison); - } - [Obsolete("This method should not be used and will be removed in the future")] - public static bool ContainsAny(this string haystack, StringComparison comparison, params string[] needles) - { - return StringExtensions.ContainsAny(haystack, needles, comparison); - } - [Obsolete("This method should not be used and will be removed in the future")] - public static bool ContainsInsensitive(this string haystack, string needle) - { - if (haystack == null) throw new ArgumentNullException("haystack"); - return haystack.IndexOf(needle, StringComparison.CurrentCultureIgnoreCase) >= 0; - } - [Obsolete("This method should not be used and will be removed in the future")] - public static bool HasValue(this string s) - { - return !string.IsNullOrWhiteSpace(s); - } - - } -} diff --git a/src/Umbraco.Core/IO/FileSystemProviderConstants.cs b/src/Umbraco.Core/IO/FileSystemProviderConstants.cs deleted file mode 100644 index a447c4df8e..0000000000 --- a/src/Umbraco.Core/IO/FileSystemProviderConstants.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Umbraco.Core.CodeAnnotations; - -namespace Umbraco.Core.IO -{ - internal class FileSystemProviderConstants - { - public const string Media = "media"; - } -} diff --git a/src/Umbraco.Core/Macros/PersistableMacroProperty.cs b/src/Umbraco.Core/Macros/PersistableMacroProperty.cs deleted file mode 100644 index db3f824e4b..0000000000 --- a/src/Umbraco.Core/Macros/PersistableMacroProperty.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Collections; - -namespace Umbraco.Core.Macros -{ - /// - /// NOTE: This is legacy code, might require a cleanup - /// - [Serializable] - internal class PersistableMacroProperty - { - #region Private Fields - private string _name; - private string _alias; - private string _value; - private string _assemblyName; - private string _typeName; - #endregion - - #region Properties - /// - /// Macro Caption - /// - public string Name - { - get { return _name; } - set { _name = value; } - } - - /// - /// Macro Alias - /// - public string Alias - { - get { return _alias; } - set { _alias = value; } - } - - /// - /// Macro Value - /// - public string Value - { - get { return _value; } - set { _value = value; } - } - - /// - /// AssemblyName of the Property of teh Macro - /// - public string AssemblyName - { - get { return _assemblyName; } - set { _assemblyName = value; } - } - - /// - /// TypeName of the property of the macro - /// - public string TypeName - { - get { return _typeName; } - set { _typeName = value; } - } - #endregion - - } -} diff --git a/src/Umbraco.Core/Media/Exif/ExifExceptions.cs b/src/Umbraco.Core/Media/Exif/ExifExceptions.cs index 4dc1856903..b51d77e309 100644 --- a/src/Umbraco.Core/Media/Exif/ExifExceptions.cs +++ b/src/Umbraco.Core/Media/Exif/ExifExceptions.cs @@ -19,25 +19,7 @@ namespace Umbraco.Core.Media.Exif { ; } - } - - /// - /// The exception that is thrown when the IFD section ID could not be understood. - /// - internal class UnknownIFDSectionException : Exception - { - public UnknownIFDSectionException() - : base("Unknown IFD section.") - { - ; - } - - public UnknownIFDSectionException(string message) - : base(message) - { - ; - } - } + } /// /// The exception that is thrown when an invalid enum type is given to an @@ -57,22 +39,4 @@ namespace Umbraco.Core.Media.Exif ; } } - - /// - /// The exception that is thrown when the 0th IFD section does not contain any fields. - /// - internal class IFD0IsEmptyException : Exception - { - public IFD0IsEmptyException() - : base("0th IFD section cannot be empty.") - { - ; - } - - public IFD0IsEmptyException(string message) - : base(message) - { - ; - } - } } diff --git a/src/Umbraco.Core/Media/Exif/JPEGExceptions.cs b/src/Umbraco.Core/Media/Exif/JPEGExceptions.cs index 5e7195ab98..40b62b25cc 100644 --- a/src/Umbraco.Core/Media/Exif/JPEGExceptions.cs +++ b/src/Umbraco.Core/Media/Exif/JPEGExceptions.cs @@ -2,24 +2,6 @@ namespace Umbraco.Core.Media.Exif { - /// - /// The exception that is thrown when the format of the image file - /// could not be understood. - /// - internal class UnknownImageFormatException : Exception - { - public UnknownImageFormatException() - : base("Unkown image format.") - { - ; - } - - public UnknownImageFormatException(string message) - : base(message) - { - ; - } - } /// /// The exception that is thrown when the format of the image file diff --git a/src/Umbraco.Core/ModelMapperHelper.cs b/src/Umbraco.Core/ModelMapperHelper.cs deleted file mode 100644 index d8d52678de..0000000000 --- a/src/Umbraco.Core/ModelMapperHelper.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AutoMapper; - -namespace Umbraco.Core -{ - /// - /// Helper class for static model mapping with automapper - /// - internal static class ModelMapperHelper - { - internal static IMappingExpression SelfMap(this IMapperConfiguration config) - { - return config.CreateMap(); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Models/IMacroPropertyType.cs b/src/Umbraco.Core/Models/IMacroPropertyType.cs deleted file mode 100644 index 7c4bc0057f..0000000000 --- a/src/Umbraco.Core/Models/IMacroPropertyType.cs +++ /dev/null @@ -1,28 +0,0 @@ -namespace Umbraco.Core.Models -{ - /// - /// Defines a PropertyType (plugin) for a Macro - /// - internal interface IMacroPropertyType - { - /// - /// Gets the unique Alias of the Property Type - /// - string Alias { get; } - - /// - /// Gets the name of the Assembly used to render the Property Type - /// - string RenderingAssembly { get; } - - /// - /// Gets the name of the Type used to render the Property Type - /// - string RenderingType { get; } - - /// - /// Gets the Base Type for storing the PropertyType (Int32, String, Boolean) - /// - MacroPropertyTypeBaseTypes BaseType { get; } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs b/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs deleted file mode 100644 index f997e90b57..0000000000 --- a/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Runtime.Serialization; - -namespace Umbraco.Core.Models -{ - /// - /// Enum for the three allowed BaseTypes - /// - [Serializable] - [DataContract(IsReference = true)] - internal enum MacroPropertyTypeBaseTypes - { - [EnumMember] - Int32, - [EnumMember] - Boolean, - [EnumMember] - String - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Mapping/MappingExpressionExtensions.cs b/src/Umbraco.Core/Models/Mapping/MappingExpressionExtensions.cs deleted file mode 100644 index 570e51dbc3..0000000000 --- a/src/Umbraco.Core/Models/Mapping/MappingExpressionExtensions.cs +++ /dev/null @@ -1,20 +0,0 @@ -using AutoMapper; - -namespace Umbraco.Core.Models.Mapping -{ - internal static class MappingExpressionExtensions - { - /// - /// Ignores all unmapped members by default - Use with caution! - /// - /// - /// - /// - /// - public static IMappingExpression IgnoreAllUnmapped(this IMappingExpression expression) - { - expression.ForAllMembers(opt => opt.Ignore()); - return expression; - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Membership/UserGroup.cs b/src/Umbraco.Core/Models/Membership/UserGroup.cs deleted file mode 100644 index b0f10d9ff1..0000000000 --- a/src/Umbraco.Core/Models/Membership/UserGroup.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Runtime.Serialization; -using Umbraco.Core.Models.EntityBase; - -namespace Umbraco.Core.Models.Membership -{ - /// - /// Represents a Group for a Backoffice User - /// - /// - /// Should be internal until a proper user/membership implementation - /// is part of the roadmap. - /// - [Serializable] - [DataContract(IsReference = true)] - internal class UserGroup : Entity - { - //Add UserCollection ? - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Packaging/PackageBuilding.cs b/src/Umbraco.Core/Packaging/PackageBuilding.cs deleted file mode 100644 index e8c09d12b8..0000000000 --- a/src/Umbraco.Core/Packaging/PackageBuilding.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Umbraco.Core.Services; - -namespace Umbraco.Core.Packaging -{ - internal interface IPackageBuilding - { - } - - internal class PackageBuilding : IPackageBuilding - { - private readonly IPackagingService _packagingService; - - public PackageBuilding(IPackagingService packagingService) - { - _packagingService = packagingService; - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Factories/UserSectionFactory.cs b/src/Umbraco.Core/Persistence/Factories/UserSectionFactory.cs deleted file mode 100644 index 0e6a17594f..0000000000 --- a/src/Umbraco.Core/Persistence/Factories/UserSectionFactory.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Core.Models.Membership; -using Umbraco.Core.Models.Rdbms; - -namespace Umbraco.Core.Persistence.Factories -{ - internal class UserSectionFactory - { - private readonly IUser _user; - - public UserSectionFactory(IUser user) - { - _user = user; - } - - public IEnumerable BuildEntity(IEnumerable dto) - { - return dto.Select(x => x.AppAlias); - } - - public IEnumerable BuildDto(IEnumerable entity) - { - return entity.Select(x => new User2AppDto - { - //NOTE: We're force casting to int here! this might not work in the future - UserId = (int)_user.Id, - AppAlias = x - }); - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index f2c505ca7b..ac36147368 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -174,9 +174,9 @@ + - @@ -225,7 +225,6 @@ - @@ -253,8 +252,6 @@ - - @@ -281,7 +278,6 @@ - @@ -363,7 +359,6 @@ - @@ -543,7 +538,6 @@ - @@ -594,7 +588,6 @@ - @@ -672,7 +665,6 @@ - @@ -680,7 +672,6 @@ - @@ -710,7 +701,6 @@ - @@ -743,7 +733,6 @@ - @@ -1094,7 +1083,6 @@ - @@ -1185,7 +1173,6 @@ - @@ -1356,7 +1343,6 @@ - diff --git a/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs b/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs index 41414cb81a..f5175b2476 100644 --- a/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs +++ b/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs @@ -1002,25 +1002,7 @@ namespace Umbraco.Tests.CoreXml Root = new TestRootContent(type).WithChildren(1); } } - - class TestSource3 : TestSourceBase - { - public TestSource3() - { - LastAttributeIndex = 1; - - var prop1 = new TestPropertyType("prop1"); - var prop2 = new TestPropertyType("prop2"); - var prop3 = new TestPropertyType("prop3"); - var type = new TestRootContentType(this, prop1, prop2); - var type1 = type.CreateType("type1", prop3); - - Content[1] = new TestContent(type1, 1, 1).WithValues("1:p1", "1:p2", "1:p3").WithChildren(2); - Content[2] = new TestContent(type1, 2, 1).WithValues("2:p1", "2:p2", "2:p3"); - - Root = new TestRootContent(type).WithChildren(1); - } - } + class TestSource4 : TestSourceBase { diff --git a/src/Umbraco.Tests/IO/FileSystemProviderManagerTests.cs b/src/Umbraco.Tests/IO/FileSystemProviderManagerTests.cs index 56b487a82e..3350b8b65e 100644 --- a/src/Umbraco.Tests/IO/FileSystemProviderManagerTests.cs +++ b/src/Umbraco.Tests/IO/FileSystemProviderManagerTests.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Text; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Tests.TestHelpers; @@ -23,7 +24,7 @@ namespace Umbraco.Tests.IO [Test] public void Can_Get_Base_File_System() { - var fs = FileSystemProviderManager.Current.GetUnderlyingFileSystemProvider(FileSystemProviderConstants.Media); + var fs = FileSystemProviderManager.Current.GetUnderlyingFileSystemProvider(Constants.IO.MediaFileSystemProvider); Assert.NotNull(fs); } diff --git a/src/Umbraco.Web/BatchedDatabaseServerMessengerStartup.cs b/src/Umbraco.Web/BatchedDatabaseServerMessengerStartup.cs deleted file mode 100644 index a5b88a08ec..0000000000 --- a/src/Umbraco.Web/BatchedDatabaseServerMessengerStartup.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Sync; - -namespace Umbraco.Web -{ - /// - /// Used to boot up the server messenger once the application succesfully starts - /// - internal class BatchedDatabaseServerMessengerStartup : ApplicationEventHandler - { - protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) - { - var messenger = ServerMessengerResolver.HasCurrent - ? ServerMessengerResolver.Current.Messenger as BatchedDatabaseServerMessenger - : null; - - if (messenger != null) - messenger.Startup(); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs index a900689350..6cf77539e2 100644 --- a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs +++ b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs @@ -11,9 +11,7 @@ namespace Umbraco.Web.PublishedCache { /// /// Provides access to cached contents. - /// - [UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1153", - "We need to create something like the IPublishListener interface to have proper published content storage.")] + /// public interface IPublishedCache { /// diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 7617514dcb..6bb2b2160b 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -313,7 +313,6 @@ - @@ -947,7 +946,6 @@ ASPXCodeBehind - @@ -1146,7 +1144,6 @@ - @@ -1278,7 +1275,6 @@ NewRelationType.aspx - RelationTypesWebService.asmx Component @@ -1655,7 +1651,6 @@ - Mvc\web.config diff --git a/src/Umbraco.Web/WebApi/WebApiHelper.cs b/src/Umbraco.Web/WebApi/WebApiHelper.cs deleted file mode 100644 index d0559f0b17..0000000000 --- a/src/Umbraco.Web/WebApi/WebApiHelper.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Net.Http; -using System.Web; -using System.Web.Http; -using System.Web.Http.Controllers; -using System.Web.Http.Hosting; -using System.Web.Http.Routing; - -namespace Umbraco.Web.WebApi -{ - internal static class WebApiHelper - { - /// - /// A helper method to create a WebAPI HttpControllerContext which can be used to execute a controller manually - /// - /// - /// - /// - /// - internal static HttpControllerContext CreateContext(HttpMethod method, Uri uri, HttpContextBase httpContext) - { - var config = new HttpConfiguration(GlobalConfiguration.Configuration.Routes); - IHttpRouteData route = new HttpRouteData(new HttpRoute()); - var req = new HttpRequestMessage(method, uri); - req.Properties[HttpPropertyKeys.HttpConfigurationKey] = config; - req.Properties[HttpPropertyKeys.HttpRouteDataKey] = route; - req.Properties["MS_HttpContext"] = httpContext; - return new HttpControllerContext(config, route, req); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/_Legacy/Utils/EncodedStringWriter.cs b/src/Umbraco.Web/_Legacy/Utils/EncodedStringWriter.cs deleted file mode 100644 index 94699f5687..0000000000 --- a/src/Umbraco.Web/_Legacy/Utils/EncodedStringWriter.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.IO; -using System.Text; - -namespace Umbraco.Web._Legacy.Utils -{ - - /// - /// A TextWriter class based on the StringWriter that can support any encoding, not just UTF-16 - /// as is the default of the normal StringWriter class - /// - [Obsolete("Remove this for v8")] - internal class EncodedStringWriter : StringWriter - { - - /// - /// Initializes a new instance of the class. - /// - /// The sb. - /// The enc. - public EncodedStringWriter(StringBuilder sb, Encoding enc) - : base(sb) - { - m_encoding = enc; - } - - private Encoding m_encoding; - - /// - /// Gets the in which the output is written. - /// - /// - /// The Encoding in which the output is written. - public override Encoding Encoding - { - get - { - return m_encoding; - } - } - } -} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TranslateTreeNames.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TranslateTreeNames.cs deleted file mode 100644 index e5a2726019..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TranslateTreeNames.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Linq; -using umbraco.cms.businesslogic.language; - -namespace Umbraco.Web.umbraco.presentation.umbraco.Trees -{ - internal class TranslateTreeNames - { - public static string GetTranslatedName(string originalName) - { - - if (originalName.StartsWith("#") == false) - return originalName; - - var lang = Language.GetByCultureCode(System.Threading.Thread.CurrentThread.CurrentCulture.Name); - - if (lang != null && global::umbraco.cms.businesslogic.Dictionary.DictionaryItem.hasKey(originalName.Substring(1, originalName.Length - 1))) - { - var dictionaryItem = new global::umbraco.cms.businesslogic.Dictionary.DictionaryItem(originalName.Substring(1, originalName.Length - 1)); - if (dictionaryItem != null) - return dictionaryItem.Value(lang.id); - } - - return "[" + originalName + "]"; - } - } -} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/ReadOnlyRelation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/ReadOnlyRelation.cs deleted file mode 100644 index d4262d971e..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/ReadOnlyRelation.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; - -namespace umbraco.cms.presentation.developer.RelationTypes -{ - /// - /// This is used to build a collection of relations from a single sql statement, - /// as the umbraco.cms.businesslogic.relation.Relation obj will hit the DB for each instace it creates - /// - internal struct ReadOnlyRelation - { - /// - /// Gets or sets the Relation Id - /// - public int Id { get; set; } - - /// - /// Gets or sets Relation Parent Id - /// - public int ParentId { get; set; } - - /// - /// Gets or sets Relation Parent Text - /// - public string ParentText { get; set; } - - /// - /// Gets or sets Relation Child Id - /// - public int ChildId { get; set; } - - /// - /// Gets or sets Relation Child Text - /// - public string ChildText { get; set; } - - /// - /// Gets or sets Relation RelationType Id - /// - public int RelType { get; set; } - - /// - /// Gets or sets Relation DateTime - /// - public DateTime DateTime { get; set; } - - /// - /// Gets or sets Relation Comment - /// - public string Comment { get; set; } - } -} \ No newline at end of file diff --git a/src/UmbracoExamine/ExamineHelper.cs b/src/UmbracoExamine/ExamineHelper.cs deleted file mode 100644 index 2df27390cc..0000000000 --- a/src/UmbracoExamine/ExamineHelper.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Web; -using Examine; -using Examine.LuceneEngine.Config; -using Umbraco.Core; - -namespace UmbracoExamine -{ - internal class ExamineHelper - { - - public static IndexSet GetConfiguredIndexSet(string name, System.Collections.Specialized.NameValueCollection config, string matchingVerb, Func alreadyConfiguredCheck) - { - //Need to check if the index set or IndexerData is specified... - - if (config["indexSet"] == null && alreadyConfiguredCheck() == false) - { - //if we don't have either, then we'll try to set the index set by naming conventions - if (name.EndsWith(matchingVerb)) - { - var setNameByConvension = name.Remove(name.LastIndexOf(matchingVerb)) + "IndexSet"; - //check if we can assign the index set by naming convention - var set = IndexSets.Instance.Sets.Cast().SingleOrDefault(x => x.SetName == setNameByConvension); - - if (set != null) - { - //we've found an index set by naming conventions :) - return set; - } - } - - throw new ArgumentNullException("indexSet on LuceneExamineIndexer provider has not been set in configuration and/or the IndexerData property has not been explicitly set"); - } - - if (config["indexSet"] != null) - { - //if an index set is specified, ensure it exists and initialize the indexer based on the set - - if (IndexSets.Instance.Sets[config["indexSet"]] == null) - { - throw new ArgumentException("The indexSet specified for the LuceneExamineIndexer provider does not exist"); - } - var indexSetName = config["indexSet"]; - return IndexSets.Instance.Sets[indexSetName]; - } - - //it's already configured internally - return null; - } - } -} diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index ef8d87535d..7f137d11d0 100644 --- a/src/UmbracoExamine/UmbracoExamine.csproj +++ b/src/UmbracoExamine/UmbracoExamine.csproj @@ -121,7 +121,6 @@ -