Skip to content

Fixed bug with updating wix 4 files #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Liran-Dobrish wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed bug with updating wix 4 files #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6157bd9
Merge pull request #1 from JayToltTech/master
Liran-Dobrish Apr 27, 2023
1925418
fixed bug with update on wix4
liran-capito Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Paraffin/Main.Update.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
/// </returns>
[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);
Expand All @@ -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
Expand Down Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions Paraffin/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions Paraffin/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]