Merge pull request #413 from SitecoreUnicorn/develop

Develop -> master for 4.1.5 release

Author: cassidydotdk

src/SharedAssemblyInfo.cs

@@ -4,7 +4,7 @@
 
 [assembly: AssemblyProduct("Unicorn")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("4.1.4.0")]
-[assembly: AssemblyFileVersion("4.1.4.0")]
-[assembly: AssemblyInformationalVersion("4.1.4")]
+[assembly: AssemblyVersion("4.1.5.0")]
+[assembly: AssemblyFileVersion("4.1.5.0")]
+[assembly: AssemblyInformationalVersion("4.1.5")]
 [assembly: CLSCompliant(false)]

src/Unicorn/Configuration/PredicatePreset.cs

@@ -68,14 +68,19 @@ protected virtual XmlElement ReplaceValues(Dictionary<string, string> replacers,
 			// ReSharper disable once PossibleNullReferenceException
 			foreach (XmlNode att in clone.Attributes)
 			{
-				while (att.Value.Contains("$"))
+				if (att.Value.Contains("$"))
 				{
 					didReplacement = true;
 
 					foreach (var replacerKey in replacers.Keys)
 					{
 						att.Value = Regex.Replace(att.Value, "\\$" + replacerKey, replacers[replacerKey], RegexOptions.IgnoreCase);
 					}
+
+					if (att.Value.Contains("$"))
+					{
+						throw new InvalidOperationException($"Predicate Preset '{((XmlElement)includeElement.ParentNode).Attributes["id"].Value}' could not be expanded, there are unresolved token attributes '{att.Value}'");
+					}
 				}
 			}
 

src/Unicorn/Deserialization/DefaultDeserializerLogger.cs

@@ -80,5 +80,10 @@ public void SkippedPastingIgnoredField(Item item, IItemFieldValue field)
 		{
 
 		}
+
+		public void LogSystemMessage(string message)
+		{
+			_logger.Debug($"* {message}");
+		}
 	}
 }

src/Unicorn/Deserialization/UnicornDeserializer.cs

@@ -7,7 +7,7 @@ namespace Unicorn.Deserialization
 {
 	public class UnicornDeserializer : DefaultDeserializer
 	{
-		public UnicornDeserializer(bool ignoreBranchId, IDefaultDeserializerLogger logger, IFieldFilter fieldFilter) : base(ignoreBranchId, logger, fieldFilter)
+		public UnicornDeserializer(IDefaultDeserializerLogger logger, IFieldFilter fieldFilter) : base(logger, fieldFilter)
 		{
 		}
 

src/Unicorn/Standard Config Files/Unicorn.AutoPublish.config

@@ -35,7 +35,7 @@
 				<!-- if for some reasons you do not have buckets enabled and/or if you have ~\App_Config\Sitecore\Buckets\Buckets.config disabled, use the below patch instead
 					<processor patch:after="*[@type='Sitecore.Publishing.Pipelines.Publish.AddItemsToQueue, Sitecore.Kernel']" type="Unicorn.Publishing.ManualPublishQueueHandler, Unicorn"/>
 				 -->
-				<processor patch:after="*[@type='Sitecore.Publishing.Pipelines.Publish.AddBucketFoldersToQueue, Sitecore.Kernel']" type="Unicorn.Publishing.ManualPublishQueueHandler, Unicorn"/>
+				<processor patch:after="*[@type='Sitecore.Publishing.Pipelines.Publish.AddBucketFoldersToQueue, Sitecore.Buckets']" type="Unicorn.Publishing.ManualPublishQueueHandler, Unicorn"/>
 			</publish>
 		</pipelines>
 		<settings>

src/Unicorn/Standard Config Files/Unicorn.config

@@ -76,7 +76,7 @@
 					<fieldFormatter type="Rainbow.Formatting.FieldFormatters.CheckboxFieldFormatter, Rainbow" />
 				</serializationFormatter>
 
-				<deserializer type="Unicorn.Deserialization.UnicornDeserializer, Unicorn" ignoreBranchId="true" singleInstance="true" />
+				<deserializer type="Unicorn.Deserialization.UnicornDeserializer, Unicorn" singleInstance="true" />
 					<deserializerLogger type="Unicorn.Deserialization.DefaultDeserializerLogger, Unicorn" singleInstance="true"/>
 
 				<evaluator type="Unicorn.Evaluators.SerializedAsMasterEvaluator, Unicorn" singleInstance="true"/>