Update decompiler to use XDocument rather than generated classes.

- Use CompareXml for diffing.
- Change CustomAction/@ScriptFile to @ScriptSourceFile.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/WixToolset.Core/CommandLine/DecompileCommand.cs b/src/WixToolset.Core/CommandLine/DecompileCommand.cs
index 1e11ae52..fc77a7b4 100644
--- a/src/WixToolset.Core/CommandLine/DecompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/DecompileCommand.cs
@@ -33,7 +33,7 @@ namespace WixToolset.Core.CommandLine
 
         public Task<int> ExecuteAsync(CancellationToken _)
         {
-            if (this.commandLine.ShowHelp)
+            if (this.commandLine.ShowHelp || String.IsNullOrEmpty(this.commandLine.DecompileFilePath))
             {
                 Console.WriteLine("TODO: Show decompile command help");
                 return Task.FromResult(-1);
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index c641bceb..6cc3a2e8 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -3331,7 +3331,7 @@ namespace WixToolset.Core
                             break;
                         }
                         break;
-                    case "ScriptFile":
+                    case "ScriptSourceFile":
                         scriptFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                         break;
                     case "SuppressModularization":
@@ -3387,7 +3387,7 @@ namespace WixToolset.Core
             {
                 if (String.IsNullOrEmpty(scriptFile))
                 {
-                    this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ScriptFile", "Script"));
+                    this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ScriptSourceFile", "Script"));
                 }
             }
             else if (CustomActionTargetType.VBScript == targetType) // non-inline vbscript
@@ -3426,7 +3426,7 @@ namespace WixToolset.Core
 
             if (!inlineScript && !String.IsNullOrEmpty(scriptFile))
             {
-                this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ScriptFile", "Script"));
+                this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ScriptSourceFile", "Script"));
             }
 
             if (win64 && CustomActionTargetType.VBScript != targetType && CustomActionTargetType.JScript != targetType)