diff --git a/Paraffin/Main.Update.cs b/Paraffin/Main.Update.cs index 440da38..e7486a0 100644 --- a/Paraffin/Main.Update.cs +++ b/Paraffin/Main.Update.cs @@ -622,9 +622,9 @@ private static void FixKeyPathAttribute(String file, /// True if everything is cool, false if this is a multiple files /// per component file. /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", - "CA1502:AvoidExcessiveComplexity", - Justification ="Want to keep this processing together for easy readability")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", + "CA1502:AvoidExcessiveComplexity", + Justification = "Want to keep this processing together for easy readability")] private static Boolean InitializeArgumentsFromFile(String inputXml) { XElement options = XElement.Parse(inputXml); @@ -638,7 +638,8 @@ private static Boolean InitializeArgumentsFromFile(String inputXml) ReportIfDifferent = originalArgs.ReportIfDifferent, PatchUpdate = originalArgs.PatchUpdate, FileName = originalArgs.FileName, - PatchCreateFiles = originalArgs.PatchCreateFiles + PatchCreateFiles = originalArgs.PatchCreateFiles, + WiX4 = originalArgs.WiX4 }; // Look for the version element. If it's missing or 1, it's an old @@ -759,7 +760,7 @@ private static Boolean InitializeArgumentsFromFile(String inputXml) if (permanentValue.Count() == 1) { - argValues.Permanent = Convert.ToBoolean(options.Descendants(PERMANENT).First().Value, + argValues.Permanent = Convert.ToBoolean(options.Descendants(PERMANENT).First().Value, CultureInfo.InvariantCulture); } diff --git a/Paraffin/Main.cs b/Paraffin/Main.cs index 06f6098..411b003 100644 --- a/Paraffin/Main.cs +++ b/Paraffin/Main.cs @@ -172,6 +172,7 @@ * 3.70 - Added support for WiX 4 fragments. * - Updated to .NET 4.6.2. * 3.71 - Fixed a bug in WiX 4 support. + * 3.72 - Fixed a bug in WiX 4 support with update. -----------------------------------------------------------------------------*/ namespace Wintellect.Paraffin { diff --git a/Paraffin/Properties/AssemblyInfo.cs b/Paraffin/Properties/AssemblyInfo.cs index f69283e..2d933bc 100644 --- a/Paraffin/Properties/AssemblyInfo.cs +++ b/Paraffin/Properties/AssemblyInfo.cs @@ -44,5 +44,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.7.1.0")] -[assembly: AssemblyFileVersion("3.7.1.0")] +[assembly: AssemblyVersion("3.7.2.0")] +[assembly: AssemblyFileVersion("3.7.2.0")]