Minor adjustments for automatic BranchID handling in Rainbow 2.1.4-pre2

SitecoreUnicorn · May 23, 2021 · a83b1fa · a83b1fa
1 parent b0ae957
commit a83b1fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -6,5 +6,5 @@
 [assembly: ComVisible(false)]
 [assembly: AssemblyVersion("4.1.5.0")]
 [assembly: AssemblyFileVersion("4.1.5.0")]
-[assembly: AssemblyInformationalVersion("4.1.5-pre1")]
+[assembly: AssemblyInformationalVersion("4.1.5-pre2")]
 [assembly: CLSCompliant(false)]
diff --git a/src/Unicorn/Deserialization/UnicornDeserializer.cs b/src/Unicorn/Deserialization/UnicornDeserializer.cs
@@ -7,7 +7,8 @@ namespace Unicorn.Deserialization
 {
 	public class UnicornDeserializer : DefaultDeserializer
 	{
-		public UnicornDeserializer(bool ignoreBranchId, IDefaultDeserializerLogger logger, IFieldFilter fieldFilter) : base(ignoreBranchId, logger, fieldFilter)
+		// This constructor being kept in place for now, for configuration compatibility
+		public UnicornDeserializer(bool ignoreBranchId, IDefaultDeserializerLogger logger, IFieldFilter fieldFilter) : base(logger, fieldFilter)
 		{
 		}
 

diff --git a/src/Unicorn/Standard Config Files/Unicorn.config b/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"/>