diff --git a/src/Umbraco.Web/Actions/ActionAssignDomain.cs b/src/Umbraco.Abstractions/Actions/ActionAssignDomain.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionAssignDomain.cs rename to src/Umbraco.Abstractions/Actions/ActionAssignDomain.cs diff --git a/src/Umbraco.Web/Actions/ActionBrowse.cs b/src/Umbraco.Abstractions/Actions/ActionBrowse.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionBrowse.cs rename to src/Umbraco.Abstractions/Actions/ActionBrowse.cs diff --git a/src/Umbraco.Web/Actions/ActionChangeDocType.cs b/src/Umbraco.Abstractions/Actions/ActionChangeDocType.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionChangeDocType.cs rename to src/Umbraco.Abstractions/Actions/ActionChangeDocType.cs diff --git a/src/Umbraco.Web/Actions/ActionCollection.cs b/src/Umbraco.Abstractions/Actions/ActionCollection.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionCollection.cs rename to src/Umbraco.Abstractions/Actions/ActionCollection.cs diff --git a/src/Umbraco.Web/Actions/ActionCollectionBuilder.cs b/src/Umbraco.Abstractions/Actions/ActionCollectionBuilder.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionCollectionBuilder.cs rename to src/Umbraco.Abstractions/Actions/ActionCollectionBuilder.cs diff --git a/src/Umbraco.Web/Actions/ActionCopy.cs b/src/Umbraco.Abstractions/Actions/ActionCopy.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionCopy.cs rename to src/Umbraco.Abstractions/Actions/ActionCopy.cs diff --git a/src/Umbraco.Web/Actions/ActionCreateBlueprintFromContent.cs b/src/Umbraco.Abstractions/Actions/ActionCreateBlueprintFromContent.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionCreateBlueprintFromContent.cs rename to src/Umbraco.Abstractions/Actions/ActionCreateBlueprintFromContent.cs diff --git a/src/Umbraco.Web/Actions/ActionDelete.cs b/src/Umbraco.Abstractions/Actions/ActionDelete.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionDelete.cs rename to src/Umbraco.Abstractions/Actions/ActionDelete.cs diff --git a/src/Umbraco.Web/Actions/ActionMove.cs b/src/Umbraco.Abstractions/Actions/ActionMove.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionMove.cs rename to src/Umbraco.Abstractions/Actions/ActionMove.cs diff --git a/src/Umbraco.Web/Actions/ActionNew.cs b/src/Umbraco.Abstractions/Actions/ActionNew.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionNew.cs rename to src/Umbraco.Abstractions/Actions/ActionNew.cs diff --git a/src/Umbraco.Web/Actions/ActionProtect.cs b/src/Umbraco.Abstractions/Actions/ActionProtect.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionProtect.cs rename to src/Umbraco.Abstractions/Actions/ActionProtect.cs diff --git a/src/Umbraco.Web/Actions/ActionPublish.cs b/src/Umbraco.Abstractions/Actions/ActionPublish.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionPublish.cs rename to src/Umbraco.Abstractions/Actions/ActionPublish.cs diff --git a/src/Umbraco.Web/Actions/ActionRestore.cs b/src/Umbraco.Abstractions/Actions/ActionRestore.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionRestore.cs rename to src/Umbraco.Abstractions/Actions/ActionRestore.cs diff --git a/src/Umbraco.Web/Actions/ActionRights.cs b/src/Umbraco.Abstractions/Actions/ActionRights.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionRights.cs rename to src/Umbraco.Abstractions/Actions/ActionRights.cs diff --git a/src/Umbraco.Web/Actions/ActionRollback.cs b/src/Umbraco.Abstractions/Actions/ActionRollback.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionRollback.cs rename to src/Umbraco.Abstractions/Actions/ActionRollback.cs diff --git a/src/Umbraco.Web/Actions/ActionSort.cs b/src/Umbraco.Abstractions/Actions/ActionSort.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionSort.cs rename to src/Umbraco.Abstractions/Actions/ActionSort.cs diff --git a/src/Umbraco.Web/Actions/ActionToPublish.cs b/src/Umbraco.Abstractions/Actions/ActionToPublish.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionToPublish.cs rename to src/Umbraco.Abstractions/Actions/ActionToPublish.cs diff --git a/src/Umbraco.Web/Actions/ActionUnpublish.cs b/src/Umbraco.Abstractions/Actions/ActionUnpublish.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionUnpublish.cs rename to src/Umbraco.Abstractions/Actions/ActionUnpublish.cs diff --git a/src/Umbraco.Web/Actions/ActionUpdate.cs b/src/Umbraco.Abstractions/Actions/ActionUpdate.cs similarity index 100% rename from src/Umbraco.Web/Actions/ActionUpdate.cs rename to src/Umbraco.Abstractions/Actions/ActionUpdate.cs diff --git a/src/Umbraco.Web/Actions/IAction.cs b/src/Umbraco.Abstractions/Actions/IAction.cs similarity index 100% rename from src/Umbraco.Web/Actions/IAction.cs rename to src/Umbraco.Abstractions/Actions/IAction.cs diff --git a/src/Umbraco.Configuration/UmbracoSettings/ContentSectionExtensions.cs b/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ContentSectionExtensions.cs similarity index 100% rename from src/Umbraco.Configuration/UmbracoSettings/ContentSectionExtensions.cs rename to src/Umbraco.Abstractions/Configuration/UmbracoSettings/ContentSectionExtensions.cs diff --git a/src/Umbraco.Web/ITagQuery.cs b/src/Umbraco.Abstractions/ITagQuery.cs similarity index 100% rename from src/Umbraco.Web/ITagQuery.cs rename to src/Umbraco.Abstractions/ITagQuery.cs diff --git a/src/Umbraco.Web/Models/TagModel.cs b/src/Umbraco.Abstractions/Models/TagModel.cs similarity index 75% rename from src/Umbraco.Web/Models/TagModel.cs rename to src/Umbraco.Abstractions/Models/TagModel.cs index f97e0cd083..3b6ab2d9eb 100644 --- a/src/Umbraco.Web/Models/TagModel.cs +++ b/src/Umbraco.Abstractions/Models/TagModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Runtime.Serialization; +using System.Runtime.Serialization; namespace Umbraco.Web.Models { diff --git a/src/Umbraco.Web/Sections/ContentSection.cs b/src/Umbraco.Abstractions/Sections/ContentSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/ContentSection.cs rename to src/Umbraco.Abstractions/Sections/ContentSection.cs diff --git a/src/Umbraco.Web/Sections/FormsSection.cs b/src/Umbraco.Abstractions/Sections/FormsSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/FormsSection.cs rename to src/Umbraco.Abstractions/Sections/FormsSection.cs diff --git a/src/Umbraco.Web/Sections/MediaSection.cs b/src/Umbraco.Abstractions/Sections/MediaSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/MediaSection.cs rename to src/Umbraco.Abstractions/Sections/MediaSection.cs diff --git a/src/Umbraco.Web/Sections/MembersSection.cs b/src/Umbraco.Abstractions/Sections/MembersSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/MembersSection.cs rename to src/Umbraco.Abstractions/Sections/MembersSection.cs diff --git a/src/Umbraco.Web/Sections/PackagesSection.cs b/src/Umbraco.Abstractions/Sections/PackagesSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/PackagesSection.cs rename to src/Umbraco.Abstractions/Sections/PackagesSection.cs diff --git a/src/Umbraco.Web/Sections/SectionCollection.cs b/src/Umbraco.Abstractions/Sections/SectionCollection.cs similarity index 100% rename from src/Umbraco.Web/Sections/SectionCollection.cs rename to src/Umbraco.Abstractions/Sections/SectionCollection.cs diff --git a/src/Umbraco.Web/Sections/SectionCollectionBuilder.cs b/src/Umbraco.Abstractions/Sections/SectionCollectionBuilder.cs similarity index 100% rename from src/Umbraco.Web/Sections/SectionCollectionBuilder.cs rename to src/Umbraco.Abstractions/Sections/SectionCollectionBuilder.cs diff --git a/src/Umbraco.Web/Sections/SettingsSection.cs b/src/Umbraco.Abstractions/Sections/SettingsSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/SettingsSection.cs rename to src/Umbraco.Abstractions/Sections/SettingsSection.cs diff --git a/src/Umbraco.Web/Sections/TranslationSection.cs b/src/Umbraco.Abstractions/Sections/TranslationSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/TranslationSection.cs rename to src/Umbraco.Abstractions/Sections/TranslationSection.cs diff --git a/src/Umbraco.Web/Sections/UsersSection.cs b/src/Umbraco.Abstractions/Sections/UsersSection.cs similarity index 100% rename from src/Umbraco.Web/Sections/UsersSection.cs rename to src/Umbraco.Abstractions/Sections/UsersSection.cs diff --git a/src/Umbraco.Web/Tour/BackOfficeTourFilter.cs b/src/Umbraco.Abstractions/Tour/BackOfficeTourFilter.cs similarity index 100% rename from src/Umbraco.Web/Tour/BackOfficeTourFilter.cs rename to src/Umbraco.Abstractions/Tour/BackOfficeTourFilter.cs diff --git a/src/Umbraco.Web/Tour/TourFilterCollection.cs b/src/Umbraco.Abstractions/Tour/TourFilterCollection.cs similarity index 100% rename from src/Umbraco.Web/Tour/TourFilterCollection.cs rename to src/Umbraco.Abstractions/Tour/TourFilterCollection.cs diff --git a/src/Umbraco.Web/Tour/TourFilterCollectionBuilder.cs b/src/Umbraco.Abstractions/Tour/TourFilterCollectionBuilder.cs similarity index 100% rename from src/Umbraco.Web/Tour/TourFilterCollectionBuilder.cs rename to src/Umbraco.Abstractions/Tour/TourFilterCollectionBuilder.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/DailyMotion.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/DailyMotion.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/EmbedProviderBase.cs similarity index 95% rename from src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/EmbedProviderBase.cs index 9e34815def..5529df771b 100644 --- a/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs +++ b/src/Umbraco.Infrastructure/Media/EmbedProviders/EmbedProviderBase.cs @@ -1,10 +1,9 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; -using System.Linq; +using System.Net; using System.Net.Http; using System.Text; -using System.Web; using System.Xml; using Umbraco.Core.Media; @@ -19,7 +18,7 @@ namespace Umbraco.Web.Media.EmbedProviders public abstract string[] UrlSchemeRegex { get; } public abstract Dictionary RequestParams { get; } - + public abstract string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0); public virtual string GetEmbedProviderUrl(string url, int maxWidth, int maxHeight) @@ -30,7 +29,7 @@ namespace Umbraco.Web.Media.EmbedProviders var fullUrl = new StringBuilder(); fullUrl.Append(ApiEndpoint); - fullUrl.Append("?url=" + HttpUtility.UrlEncode(url)); + fullUrl.Append("?url=" + WebUtility.UrlEncode(url)); foreach (var param in RequestParams) fullUrl.Append($"&{param.Key}={param.Value}"); @@ -43,7 +42,7 @@ namespace Umbraco.Web.Media.EmbedProviders return fullUrl.ToString(); } - + public virtual string DownloadResponse(string url) { if (_httpClient == null) diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollection.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/EmbedProvidersCollection.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollection.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/EmbedProvidersCollection.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Flickr.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Flickr.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Flickr.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/GettyImages.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/GettyImages.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/GettyImages.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/GettyImages.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Giphy.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Giphy.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Giphy.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Giphy.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Hulu.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Hulu.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Hulu.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Hulu.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Instagram.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Instagram.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Issuu.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Issuu.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Issuu.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Issuu.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Kickstarter.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Kickstarter.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Kickstarter.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Kickstarter.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/OEmbedResponse.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/OEmbedResponse.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Slideshare.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Slideshare.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Slideshare.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Slideshare.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/SoundCloud.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/SoundCloud.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/SoundCloud.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/SoundCloud.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Ted.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Ted.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Ted.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Ted.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Twitter.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Twitter.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Twitter.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Twitter.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Vimeo.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Vimeo.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Vimeo.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Vimeo.cs diff --git a/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Youtube.cs similarity index 100% rename from src/Umbraco.Web/Media/EmbedProviders/Youtube.cs rename to src/Umbraco.Infrastructure/Media/EmbedProviders/Youtube.cs diff --git a/src/Umbraco.Web/Media/Exif/BitConverterEx.cs b/src/Umbraco.Infrastructure/Media/Exif/BitConverterEx.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/BitConverterEx.cs rename to src/Umbraco.Infrastructure/Media/Exif/BitConverterEx.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifBitConverter.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifBitConverter.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifBitConverter.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifEnums.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifEnums.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifEnums.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifEnums.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifExceptions.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifExceptions.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifExceptions.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifExceptions.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifExtendedProperty.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifExtendedProperty.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifExtendedProperty.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifExtendedProperty.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifFileTypeDescriptor.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifFileTypeDescriptor.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifFileTypeDescriptor.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifFileTypeDescriptor.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifInterOperability.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifInterOperability.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifInterOperability.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifInterOperability.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifProperty.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifProperty.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifProperty.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifProperty.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifPropertyCollection.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifPropertyCollection.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifPropertyCollection.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifPropertyCollection.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifPropertyFactory.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifPropertyFactory.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifTag.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifTag.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifTag.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifTag.cs diff --git a/src/Umbraco.Web/Media/Exif/ExifTagFactory.cs b/src/Umbraco.Infrastructure/Media/Exif/ExifTagFactory.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ExifTagFactory.cs rename to src/Umbraco.Infrastructure/Media/Exif/ExifTagFactory.cs diff --git a/src/Umbraco.Web/Media/Exif/IFD.cs b/src/Umbraco.Infrastructure/Media/Exif/IFD.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/IFD.cs rename to src/Umbraco.Infrastructure/Media/Exif/IFD.cs diff --git a/src/Umbraco.Web/Media/Exif/ImageFile.cs b/src/Umbraco.Infrastructure/Media/Exif/ImageFile.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ImageFile.cs rename to src/Umbraco.Infrastructure/Media/Exif/ImageFile.cs diff --git a/src/Umbraco.Web/Media/Exif/ImageFileDirectory.cs b/src/Umbraco.Infrastructure/Media/Exif/ImageFileDirectory.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ImageFileDirectory.cs rename to src/Umbraco.Infrastructure/Media/Exif/ImageFileDirectory.cs diff --git a/src/Umbraco.Web/Media/Exif/ImageFileDirectoryEntry.cs b/src/Umbraco.Infrastructure/Media/Exif/ImageFileDirectoryEntry.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ImageFileDirectoryEntry.cs rename to src/Umbraco.Infrastructure/Media/Exif/ImageFileDirectoryEntry.cs diff --git a/src/Umbraco.Web/Media/Exif/ImageFileFormat.cs b/src/Umbraco.Infrastructure/Media/Exif/ImageFileFormat.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/ImageFileFormat.cs rename to src/Umbraco.Infrastructure/Media/Exif/ImageFileFormat.cs diff --git a/src/Umbraco.Web/Media/Exif/JFIFEnums.cs b/src/Umbraco.Infrastructure/Media/Exif/JFIFEnums.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/JFIFEnums.cs rename to src/Umbraco.Infrastructure/Media/Exif/JFIFEnums.cs diff --git a/src/Umbraco.Web/Media/Exif/JFIFExtendedProperty.cs b/src/Umbraco.Infrastructure/Media/Exif/JFIFExtendedProperty.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/JFIFExtendedProperty.cs rename to src/Umbraco.Infrastructure/Media/Exif/JFIFExtendedProperty.cs diff --git a/src/Umbraco.Web/Media/Exif/JFIFThumbnail.cs b/src/Umbraco.Infrastructure/Media/Exif/JFIFThumbnail.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/JFIFThumbnail.cs rename to src/Umbraco.Infrastructure/Media/Exif/JFIFThumbnail.cs diff --git a/src/Umbraco.Web/Media/Exif/JPEGExceptions.cs b/src/Umbraco.Infrastructure/Media/Exif/JPEGExceptions.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/JPEGExceptions.cs rename to src/Umbraco.Infrastructure/Media/Exif/JPEGExceptions.cs diff --git a/src/Umbraco.Web/Media/Exif/JPEGFile.cs b/src/Umbraco.Infrastructure/Media/Exif/JPEGFile.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/JPEGFile.cs rename to src/Umbraco.Infrastructure/Media/Exif/JPEGFile.cs diff --git a/src/Umbraco.Web/Media/Exif/JPEGMarker.cs b/src/Umbraco.Infrastructure/Media/Exif/JPEGMarker.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/JPEGMarker.cs rename to src/Umbraco.Infrastructure/Media/Exif/JPEGMarker.cs diff --git a/src/Umbraco.Web/Media/Exif/JPEGSection.cs b/src/Umbraco.Infrastructure/Media/Exif/JPEGSection.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/JPEGSection.cs rename to src/Umbraco.Infrastructure/Media/Exif/JPEGSection.cs diff --git a/src/Umbraco.Web/Media/Exif/MathEx.cs b/src/Umbraco.Infrastructure/Media/Exif/MathEx.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/MathEx.cs rename to src/Umbraco.Infrastructure/Media/Exif/MathEx.cs diff --git a/src/Umbraco.Web/Media/Exif/SvgFile.cs b/src/Umbraco.Infrastructure/Media/Exif/SvgFile.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/SvgFile.cs rename to src/Umbraco.Infrastructure/Media/Exif/SvgFile.cs diff --git a/src/Umbraco.Web/Media/Exif/TIFFFile.cs b/src/Umbraco.Infrastructure/Media/Exif/TIFFFile.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/TIFFFile.cs rename to src/Umbraco.Infrastructure/Media/Exif/TIFFFile.cs diff --git a/src/Umbraco.Web/Media/Exif/TIFFHeader.cs b/src/Umbraco.Infrastructure/Media/Exif/TIFFHeader.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/TIFFHeader.cs rename to src/Umbraco.Infrastructure/Media/Exif/TIFFHeader.cs diff --git a/src/Umbraco.Web/Media/Exif/TIFFStrip.cs b/src/Umbraco.Infrastructure/Media/Exif/TIFFStrip.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/TIFFStrip.cs rename to src/Umbraco.Infrastructure/Media/Exif/TIFFStrip.cs diff --git a/src/Umbraco.Web/Media/Exif/Utility.cs b/src/Umbraco.Infrastructure/Media/Exif/Utility.cs similarity index 100% rename from src/Umbraco.Web/Media/Exif/Utility.cs rename to src/Umbraco.Infrastructure/Media/Exif/Utility.cs diff --git a/src/Umbraco.Web/Media/ImageHelper.cs b/src/Umbraco.Infrastructure/Media/ImageHelper.cs similarity index 100% rename from src/Umbraco.Web/Media/ImageHelper.cs rename to src/Umbraco.Infrastructure/Media/ImageHelper.cs diff --git a/src/Umbraco.Web/Media/TypeDetector/JpegDetector.cs b/src/Umbraco.Infrastructure/Media/TypeDetector/JpegDetector.cs similarity index 100% rename from src/Umbraco.Web/Media/TypeDetector/JpegDetector.cs rename to src/Umbraco.Infrastructure/Media/TypeDetector/JpegDetector.cs diff --git a/src/Umbraco.Web/Media/TypeDetector/RasterizedTypeDetector.cs b/src/Umbraco.Infrastructure/Media/TypeDetector/RasterizedTypeDetector.cs similarity index 100% rename from src/Umbraco.Web/Media/TypeDetector/RasterizedTypeDetector.cs rename to src/Umbraco.Infrastructure/Media/TypeDetector/RasterizedTypeDetector.cs diff --git a/src/Umbraco.Web/Media/TypeDetector/SvgDetector.cs b/src/Umbraco.Infrastructure/Media/TypeDetector/SvgDetector.cs similarity index 100% rename from src/Umbraco.Web/Media/TypeDetector/SvgDetector.cs rename to src/Umbraco.Infrastructure/Media/TypeDetector/SvgDetector.cs diff --git a/src/Umbraco.Web/Media/TypeDetector/TIFFDetector.cs b/src/Umbraco.Infrastructure/Media/TypeDetector/TIFFDetector.cs similarity index 100% rename from src/Umbraco.Web/Media/TypeDetector/TIFFDetector.cs rename to src/Umbraco.Infrastructure/Media/TypeDetector/TIFFDetector.cs diff --git a/src/Umbraco.Web/Media/UploadAutoFillProperties.cs b/src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs similarity index 99% rename from src/Umbraco.Web/Media/UploadAutoFillProperties.cs rename to src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs index 01ced179d6..4c02111ccd 100644 --- a/src/Umbraco.Web/Media/UploadAutoFillProperties.cs +++ b/src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs @@ -13,7 +13,7 @@ namespace Umbraco.Web.Media /// /// Provides methods to manage auto-fill properties for upload fields. /// - internal class UploadAutoFillProperties + public class UploadAutoFillProperties { private readonly IMediaFileSystem _mediaFileSystem; private readonly ILogger _logger; @@ -40,7 +40,7 @@ namespace Umbraco.Web.Media ResetProperties(content, autoFillConfig, culture, segment); } - + /// /// Populates the auto-fill properties of a content item, for a specified auto-fill configuration. /// diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 41509aec4c..bb893ea1df 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -26,6 +26,7 @@ + diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs deleted file mode 100644 index 4625707b33..0000000000 --- a/src/Umbraco.Web/Templates/TemplateUtilities.cs +++ /dev/null @@ -1,70 +0,0 @@ -using HtmlAgilityPack; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.RegularExpressions; -using Umbraco.Core; -using Umbraco.Core.IO; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Composing; -using Umbraco.Web.PropertyEditors; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; -using File = System.IO.File; - -namespace Umbraco.Web.Templates -{ - - [Obsolete("This class is obsolete, all methods have been moved to other classes: " + nameof(HtmlLocalLinkParser) + ", " + nameof(HtmlUrlParser) + " and " + nameof(HtmlImageSourceParser))] - public static class TemplateUtilities - { - - // TODO: Replace mediaCache with media url provider - internal static string ParseInternalLinks(string text, UrlProvider urlProvider, IPublishedMediaCache mediaCache) - { - if (urlProvider == null) throw new ArgumentNullException(nameof(urlProvider)); - if (mediaCache == null) throw new ArgumentNullException(nameof(mediaCache)); - - // Parse internal links - var tags = HtmlLocalLinkParser.LocalLinkPattern.Matches(text); - foreach (Match tag in tags) - { - if (tag.Groups.Count > 0) - { - var id = tag.Groups[1].Value; //.Remove(tag.Groups[1].Value.Length - 1, 1); - - //The id could be an int or a UDI - if (UdiParser.TryParse(id, out var udi)) - { - var guidUdi = udi as GuidUdi; - if (guidUdi != null) - { - var newLink = "#"; - if (guidUdi.EntityType == Constants.UdiEntityType.Document) - newLink = urlProvider.GetUrl(guidUdi.Guid); - else if (guidUdi.EntityType == Constants.UdiEntityType.Media) - newLink = mediaCache.GetById(guidUdi.Guid)?.Url; - - if (newLink == null) - newLink = "#"; - - text = text.Replace(tag.Value, "href=\"" + newLink); - } - } - - if (int.TryParse(id, out var intId)) - { - var newLink = urlProvider.GetUrl(intId); - text = text.Replace(tag.Value, "href=\"" + newLink); - } - } - } - - return text; - } - - - } -} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index feea890438..22bcc7b969 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -182,60 +182,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -316,16 +262,8 @@ - - - - - - - - @@ -339,7 +277,6 @@ - @@ -650,9 +587,6 @@ - - - @@ -679,28 +613,7 @@ - - - - - - - - - - - - - - - - - - - - - @@ -761,7 +674,6 @@ - @@ -891,7 +803,6 @@ - @@ -1176,7 +1087,6 @@ -