Merge pull request #4206 from umbraco/temp8-fixme-children-wrong-merge-and-unused-file

Fixme - Wrong merge in PublishedContentExtensions and renamed prevalue connector

src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Umbraco.Core.Deploy
+{
+    /// <summary>
+    /// Defines methods that can convert a data type configurations to / from an environment-agnostic string.
+    /// </summary>
+    /// <remarks>Configurations may contain values such as content identifiers, that would be local
+    /// to one environment, and need to be converted in order to be deployed.</remarks>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "This is actual only used by Deploy, but we dont want third parties to have references on deploy, thats why this interface is part of core.")]
+    public interface IDataTypeConfigurationConnector
+    {
+        /// <summary>
+        /// Gets the property editor aliases that the value converter supports by default.
+        /// </summary>
+        IEnumerable<string> PropertyEditorAliases { get; }
+
+        /// <summary>
+        /// Gets the environment-agnostic data type configurations corresponding to environment-specific configurations.
+        /// </summary>
+        /// <param name="configuration">The environment-specific configuration.</param>
+        /// <param name="dependencies">The dependencies.</param>
+        /// <returns></returns>
+        IDictionary<string, string> ConvertToDeploy(IDictionary<string, string> configuration, ICollection<ArtifactDependency> dependencies);
+
+        /// <summary>
+        /// Gets the environment-specific data type configurations corresponding to environment-agnostic configurations.
+        /// </summary>
+        /// <param name="configuration">The environment-agnostic configuration.</param>
+        /// <returns></returns>
+        IDictionary<string, string> ConvertToLocalEnvironment(IDictionary<string, string> configuration);
+    }
+}

src/Umbraco.Core/Deploy/IPreValueConnector.cs

@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Defines methods that can convert a preValue to / from an environment-agnostic string.
-    /// </summary>
-    /// <remarks>PreValues may contain values such as content identifiers, that would be local
-    /// to one environment, and need to be converted in order to be deployed.</remarks>
-    public interface IPreValueConnector // fixme/task: rename to IDataTypeConfigurationConnector + kill all "preValues" name usage
-    {
-        /// <summary>
-        /// Gets the property editor aliases that the value converter supports by default.
-        /// </summary>
-        IEnumerable<string> PropertyEditorAliases { get; }
-
-        /// <summary>
-        /// Gets the environment-agnostic preValues corresponding to environment-specific preValues.
-        /// </summary>
-        /// <param name="preValues">The environment-specific preValues.</param>
-        /// <param name="dependencies">The dependencies.</param>
-        /// <returns></returns>
-        IDictionary<string, string> ConvertToDeploy(IDictionary<string, string> preValues, ICollection<ArtifactDependency> dependencies);
-
-        /// <summary>
-        /// Gets the environment-specific preValues corresponding to environment-agnostic preValues.
-        /// </summary>
-        /// <param name="preValues">The environment-agnostic preValues.</param>
-        /// <returns></returns>
-        IDictionary<string, string> ConvertToLocalEnvironment(IDictionary<string, string> preValues);
-    }
-}

src/Umbraco.Core/Umbraco.Core.csproj

@@ -331,6 +331,7 @@
     <Compile Include="Constants.cs" />
     <Compile Include="Composing\RegisterExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
+    <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
     <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
@@ -564,7 +565,6 @@
     <Compile Include="Deploy\IImageSourceParser.cs" />
     <Compile Include="Deploy\ILocalLinkParser.cs" />
     <Compile Include="Deploy\IMacroParser.cs" />
-    <Compile Include="Deploy\IPreValueConnector.cs" />
     <Compile Include="Deploy\IServiceConnector.cs" />
     <Compile Include="Deploy\IUniqueIdentifyingServiceConnector.cs" />
     <Compile Include="Deploy\IValueConnector.cs" />

src/Umbraco.Web/PublishedContentExtensions.cs

@@ -956,13 +956,6 @@ namespace Umbraco.Web
         {
             if (content == null) throw new ArgumentNullException(nameof(content)); // fixme/task wtf is this?
 
-            return content.Children.Where(x =>
-            {
-                if (!x.ContentType.VariesByCulture()) return true; // invariant = always ok
-                return x.HasCulture(culture);
-                return false;
-            });
-
             return content.Children.WhereIsInvariantOrHasCulture(culture);
         }