From a83b1faf06b799b469937f497bf7ae81fba53919 Mon Sep 17 00:00:00 2001 From: Mark Cassidy Date: Sun, 23 May 2021 14:48:13 +0200 Subject: [PATCH] Minor adjustments for automatic BranchID handling in Rainbow 2.1.4-pre2 --- src/SharedAssemblyInfo.cs | 2 +- src/Unicorn/Deserialization/UnicornDeserializer.cs | 3 ++- src/Unicorn/Standard Config Files/Unicorn.config | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 897fd58e..dce7ba51 100644 --- 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 index 967a7b8d..bdbce3ae 100644 --- 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 index 3ea87d37..92917000 100644 --- a/src/Unicorn/Standard Config Files/Unicorn.config +++ b/src/Unicorn/Standard Config Files/Unicorn.config @@ -76,7 +76,7 @@ - +