From 33525f3ea9fc6cdc891f59b3920f409a83fc9036 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 8 Jan 2020 13:31:14 +0100 Subject: [PATCH 1/5] AB4375 - Moved Media from Umbraco.Web to Umbraco.Infrastructure and added reference to System.Drawing.Common --- .../ContentSectionExtensions.cs | 0 .../Media/EmbedProviders/DailyMotion.cs | 0 .../Media/EmbedProviders/EmbedProviderBase.cs | 9 ++-- .../EmbedProvidersCollection.cs | 0 .../EmbedProvidersCollectionBuilder.cs | 0 .../Media/EmbedProviders/Flickr.cs | 0 .../Media/EmbedProviders/GettyImages.cs | 0 .../Media/EmbedProviders/Giphy.cs | 0 .../Media/EmbedProviders/Hulu.cs | 0 .../Media/EmbedProviders/Instagram.cs | 0 .../Media/EmbedProviders/Issuu.cs | 0 .../Media/EmbedProviders/Kickstarter.cs | 0 .../Media/EmbedProviders/OEmbedResponse.cs | 0 .../Media/EmbedProviders/Slideshare.cs | 0 .../Media/EmbedProviders/SoundCloud.cs | 0 .../Media/EmbedProviders/Ted.cs | 0 .../Media/EmbedProviders/Twitter.cs | 0 .../Media/EmbedProviders/Vimeo.cs | 0 .../Media/EmbedProviders/Youtube.cs | 0 .../Media/Exif/BitConverterEx.cs | 0 .../Media/Exif/ExifBitConverter.cs | 0 .../Media/Exif/ExifEnums.cs | 0 .../Media/Exif/ExifExceptions.cs | 0 .../Media/Exif/ExifExtendedProperty.cs | 0 .../Media/Exif/ExifFileTypeDescriptor.cs | 0 .../Media/Exif/ExifInterOperability.cs | 0 .../Media/Exif/ExifProperty.cs | 0 .../Media/Exif/ExifPropertyCollection.cs | 0 .../Media/Exif/ExifPropertyFactory.cs | 0 .../Media/Exif/ExifTag.cs | 0 .../Media/Exif/ExifTagFactory.cs | 0 .../Media/Exif/IFD.cs | 0 .../Media/Exif/ImageFile.cs | 0 .../Media/Exif/ImageFileDirectory.cs | 0 .../Media/Exif/ImageFileDirectoryEntry.cs | 0 .../Media/Exif/ImageFileFormat.cs | 0 .../Media/Exif/JFIFEnums.cs | 0 .../Media/Exif/JFIFExtendedProperty.cs | 0 .../Media/Exif/JFIFThumbnail.cs | 0 .../Media/Exif/JPEGExceptions.cs | 0 .../Media/Exif/JPEGFile.cs | 0 .../Media/Exif/JPEGMarker.cs | 0 .../Media/Exif/JPEGSection.cs | 0 .../Media/Exif/MathEx.cs | 0 .../Media/Exif/SvgFile.cs | 0 .../Media/Exif/TIFFFile.cs | 0 .../Media/Exif/TIFFHeader.cs | 0 .../Media/Exif/TIFFStrip.cs | 0 .../Media/Exif/Utility.cs | 0 .../Media/ImageHelper.cs | 0 .../Media/TypeDetector/JpegDetector.cs | 0 .../TypeDetector/RasterizedTypeDetector.cs | 0 .../Media/TypeDetector/SvgDetector.cs | 0 .../Media/TypeDetector/TIFFDetector.cs | 0 .../Media/UploadAutoFillProperties.cs | 4 +- .../Umbraco.Infrastructure.csproj | 1 + src/Umbraco.Web/Umbraco.Web.csproj | 54 ------------------- 57 files changed, 7 insertions(+), 61 deletions(-) rename src/{Umbraco.Configuration => Umbraco.Abstractions/Configuration}/UmbracoSettings/ContentSectionExtensions.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/DailyMotion.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/EmbedProviderBase.cs (95%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/EmbedProvidersCollection.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Flickr.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/GettyImages.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Giphy.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Hulu.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Instagram.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Issuu.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Kickstarter.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/OEmbedResponse.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Slideshare.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/SoundCloud.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Ted.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Twitter.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Vimeo.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/EmbedProviders/Youtube.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/BitConverterEx.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifBitConverter.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifEnums.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifExceptions.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifExtendedProperty.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifFileTypeDescriptor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifInterOperability.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifProperty.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifPropertyCollection.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifPropertyFactory.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifTag.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ExifTagFactory.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/IFD.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ImageFile.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ImageFileDirectory.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ImageFileDirectoryEntry.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/ImageFileFormat.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/JFIFEnums.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/JFIFExtendedProperty.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/JFIFThumbnail.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/JPEGExceptions.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/JPEGFile.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/JPEGMarker.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/JPEGSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/MathEx.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/SvgFile.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/TIFFFile.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/TIFFHeader.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/TIFFStrip.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/Exif/Utility.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/ImageHelper.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/TypeDetector/JpegDetector.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/TypeDetector/RasterizedTypeDetector.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/TypeDetector/SvgDetector.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/TypeDetector/TIFFDetector.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/Media/UploadAutoFillProperties.cs (99%) 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/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 5667c6b1f6..795ce65381 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/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index bb4df93eb6..0aacdef88a 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -180,60 +180,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 39b7cb4201b1511af5703b0dd7f2fa3e20a18c66 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 8 Jan 2020 13:35:05 +0100 Subject: [PATCH 2/5] AB4375 - Moved Tour to Umbraco.Abstractions --- .../Tour/BackOfficeTourFilter.cs | 0 .../Tour/TourFilterCollection.cs | 0 .../Tour/TourFilterCollectionBuilder.cs | 0 .../Templates/TemplateUtilities.cs | 70 ------------------- src/Umbraco.Web/Umbraco.Web.csproj | 4 -- 5 files changed, 74 deletions(-) rename src/{Umbraco.Web => Umbraco.Abstractions}/Tour/BackOfficeTourFilter.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Tour/TourFilterCollection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Tour/TourFilterCollectionBuilder.cs (100%) delete mode 100644 src/Umbraco.Web/Templates/TemplateUtilities.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/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 0aacdef88a..95c987dd55 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -580,9 +580,6 @@ - - - @@ -1106,7 +1103,6 @@ - From 447e1ee1f0d5d042668caef72039404722a8e698 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 8 Jan 2020 13:36:48 +0100 Subject: [PATCH 3/5] AB4375 - Moved Sections to Umbraco.Abstractions --- .../Sections/ContentSection.cs | 0 .../Sections/FormsSection.cs | 0 .../Sections/MediaSection.cs | 0 .../Sections/MembersSection.cs | 0 .../Sections/PackagesSection.cs | 0 .../Sections/SectionCollection.cs | 0 .../Sections/SectionCollectionBuilder.cs | 0 .../Sections/SettingsSection.cs | 0 .../Sections/TranslationSection.cs | 0 .../Sections/UsersSection.cs | 0 src/Umbraco.Web/Umbraco.Web.csproj | 10 ---------- 11 files changed, 10 deletions(-) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/ContentSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/FormsSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/MediaSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/MembersSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/PackagesSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/SectionCollection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/SectionCollectionBuilder.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/SettingsSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/TranslationSection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Sections/UsersSection.cs (100%) 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/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 95c987dd55..5266fda3b3 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -246,16 +246,8 @@ - - - - - - - - @@ -269,7 +261,6 @@ - @@ -627,7 +618,6 @@ - From bdf0f32a702f844b4d5570224683ef8694ce2492 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 8 Jan 2020 13:39:47 +0100 Subject: [PATCH 4/5] AB4375 - Moved Actions to Umbraco.Abstractions --- .../Actions/ActionAssignDomain.cs | 0 .../Actions/ActionBrowse.cs | 0 .../Actions/ActionChangeDocType.cs | 0 .../Actions/ActionCollection.cs | 0 .../Actions/ActionCollectionBuilder.cs | 0 .../Actions/ActionCopy.cs | 0 .../ActionCreateBlueprintFromContent.cs | 0 .../Actions/ActionDelete.cs | 0 .../Actions/ActionMove.cs | 0 .../Actions/ActionNew.cs | 0 .../Actions/ActionProtect.cs | 0 .../Actions/ActionPublish.cs | 0 .../Actions/ActionRestore.cs | 0 .../Actions/ActionRights.cs | 0 .../Actions/ActionRollback.cs | 0 .../Actions/ActionSort.cs | 0 .../Actions/ActionToPublish.cs | 0 .../Actions/ActionUnpublish.cs | 0 .../Actions/ActionUpdate.cs | 0 .../Actions/IAction.cs | 0 src/Umbraco.Web/Umbraco.Web.csproj | 20 ------------------- 21 files changed, 20 deletions(-) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionAssignDomain.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionBrowse.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionChangeDocType.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionCollection.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionCollectionBuilder.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionCopy.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionCreateBlueprintFromContent.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionDelete.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionMove.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionNew.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionProtect.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionPublish.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionRestore.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionRights.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionRollback.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionSort.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionToPublish.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionUnpublish.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/ActionUpdate.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Actions/IAction.cs (100%) 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.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 5266fda3b3..2039383aa1 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -597,26 +597,6 @@ - - - - - - - - - - - - - - - - - - - - From 29140bc7eaed3bdc22977b930bf441439d879adf Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 8 Jan 2020 15:39:07 +0100 Subject: [PATCH 5/5] AB4375 - Moved ITagQuery and TagModel to Umbraco.Abstractions --- src/{Umbraco.Web => Umbraco.Abstractions}/ITagQuery.cs | 0 .../Models/TagModel.cs | 7 +------ src/Umbraco.Web/Umbraco.Web.csproj | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) rename src/{Umbraco.Web => Umbraco.Abstractions}/ITagQuery.cs (100%) rename src/{Umbraco.Web => Umbraco.Abstractions}/Models/TagModel.cs (75%) 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/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 2039383aa1..0ce7127a5b 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -658,7 +658,6 @@ - @@ -788,7 +787,6 @@ -