Fix building `ExePackage/@ExitCode` elements.

7 files changed, 121 insertions, 4 deletions

diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageExitCodeSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageExitCodeSymbol.cs
index d77d9d58..f025a493 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageExitCodeSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageExitCodeSymbol.cs
@@ -32,7 +32,7 @@ namespace WixToolset.Data.Symbols
     public enum ExitCodeBehaviorType
     {
         NotSet = -1,
-        Success,
+        Success = 1,
         Error,
         ScheduleReboot,
         ForceReboot,
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index dda79aa1..7273918b 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -532,7 +532,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                         if (exitCode.Code.HasValue)
                         {
-                            writer.WriteAttributeString("Code", unchecked((uint)exitCode.Code).ToString(CultureInfo.InvariantCulture));
+                            writer.WriteAttributeString("Code", exitCode.Code.Value.ToString(CultureInfo.InvariantCulture));
                         }
                         else
                         {
diff --git a/src/wix/WixToolset.Core/Common.cs b/src/wix/WixToolset.Core/Common.cs
index 89cfe515..c838463d 100644
--- a/src/wix/WixToolset.Core/Common.cs
+++ b/src/wix/WixToolset.Core/Common.cs
@@ -681,6 +681,33 @@ namespace WixToolset.Core
         }
 
         /// <summary>
+        /// Get an integer attribute value and displays an error for an illegal integer value.
+        /// </summary>
+        /// <param name="messaging"></param>
+        /// <param name="sourceLineNumbers">Source line information about the owner element.</param>
+        /// <param name="attribute">The attribute containing the value to get.</param>
+        /// <returns>The attribute's integer value or null if an error occurred during conversion.</returns>
+        public static int? GetAttributeRawIntegerValue(IMessaging messaging, SourceLineNumber sourceLineNumbers, XAttribute attribute)
+        {
+            var value = Common.GetAttributeValue(messaging, sourceLineNumbers, attribute, EmptyRule.MustHaveNonWhitespaceCharacters);
+            int? integer = null;
+
+            if (0 < value.Length)
+            {
+                if (Int32.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture.NumberFormat, out var integerValue))
+                {
+                    integer = integerValue;
+                }
+                else
+                {
+                    messaging.Write(ErrorMessages.IllegalIntegerValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                }
+            }
+
+            return integer;
+        }
+
+        /// <summary>
         /// Gets a yes/no value and displays an error for an illegal yes/no value.
         /// </summary>
         /// <param name="messaging"></param>
diff --git a/src/wix/WixToolset.Core/CompilerCore.cs b/src/wix/WixToolset.Core/CompilerCore.cs
index cbb8f1f0..c03305f0 100644
--- a/src/wix/WixToolset.Core/CompilerCore.cs
+++ b/src/wix/WixToolset.Core/CompilerCore.cs
@@ -501,6 +501,17 @@ namespace WixToolset.Core
         }
 
         /// <summary>
+        /// Get an integer attribute value and displays an error for an illegal integer value.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Source line information about the owner element.</param>
+        /// <param name="attribute">The attribute containing the value to get.</param>
+        /// <returns>The attribute's integer value or null if an error occurred during conversion.</returns>
+        public int? GetAttributeRawIntegerValue(SourceLineNumber sourceLineNumbers, XAttribute attribute)
+        {
+            return Common.GetAttributeRawIntegerValue(this.messaging, sourceLineNumbers, attribute);
+        }
+
+        /// <summary>
         /// Get a long integral attribute value and displays an error for an illegal long value.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information about the owner element.</param>
diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
index 47eb646b..0a1e416f 100644
--- a/src/wix/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -1609,7 +1609,7 @@ namespace WixToolset.Core
         private void ParseExitCodeElement(XElement node, string packageId)
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            var value = CompilerConstants.IntegerNotSet;
+            int? value = null;
             var behavior = ExitCodeBehaviorType.NotSet;
 
             foreach (var attrib in node.Attributes())
@@ -1619,7 +1619,7 @@ namespace WixToolset.Core
                     switch (attrib.Name.LocalName)
                     {
                         case "Value":
-                            value = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int32.MinValue + 2, Int32.MaxValue);
+                            value = this.Core.GetAttributeRawIntegerValue(sourceLineNumbers, attrib);
                             break;
                         case "Behavior":
                             var behaviorString = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
index 882a7861..a3ca2917 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
@@ -55,6 +55,60 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanBuildWithCustomExitCodes()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var bundlePath = Path.Combine(binFolder, "test.exe");
+                var baFolderPath = Path.Combine(baseFolder, "ba");
+                var extractFolderPath = Path.Combine(baseFolder, "extract");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "ExePackage", "CustomExitCodes.wxs"),
+                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
+                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
+                    "-bindpath", Path.Combine(folder, ".Data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", bundlePath,
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(bundlePath));
+
+                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
+                extractResult.AssertSuccess();
+
+                var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage");
+                WixAssert.CompareLineByLine(new string[]
+                {
+                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964' InstallSize='463360' Size='463360' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='-repair' Repairable='yes' DetectionType='condition' DetectCondition='detect' UninstallArguments='-uninstall' Uninstallable='yes'>" +
+                      "<ExitCode Code='0' Type='2' />" +
+                      "<ExitCode Code='3' Type='3' />" +
+                      "<ExitCode Code='4' Type='4' />" +
+                      "<ExitCode Code='3010' Type='2' />" +
+                      "<ExitCode Code='-2147021886' Type='2' />" +
+                      "<ExitCode Code='3011' Type='2' />" +
+                      "<ExitCode Code='-2147021885' Type='2' />" +
+                      "<ExitCode Code='1641' Type='2' />" +
+                      "<ExitCode Code='-2147023255' Type='2' />" +
+                      "<ExitCode Code='-2147483647' Type='2' />" +
+                      "<ExitCode Code='-2147483648' Type='2' />" +
+                      "<ExitCode Code='*' Type='1' />" +
+                      "<PayloadRef Id='burn.exe' />" +
+                    "</ExePackage>",
+                }, exePackages);
+            }
+        }
+
+        [Fact]
         public void WarningWhenInvalidArpEntryVersion()
         {
             var folder = TestData.Get(@"TestData");
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/CustomExitCodes.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/CustomExitCodes.wxs
new file mode 100644
index 00000000..9cbc9919
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/CustomExitCodes.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <ExePackage InstallArguments="-install"
+                        RepairArguments="-repair"
+                        UninstallArguments="-uninstall"
+                        DetectCondition="detect"
+                        SourceFile="burn.exe">
+                <ExitCode Value="0" Behavior="error" />
+                <ExitCode Value="3" Behavior="scheduleReboot" />
+                <ExitCode Value="4" Behavior="forceReboot" />
+                <ExitCode Value="3010" Behavior="error" />
+                <ExitCode Value="-2147021886" Behavior="error" />
+                <ExitCode Value="3011" Behavior="error" />
+                <ExitCode Value="-2147021885" Behavior="error" />
+                <ExitCode Value="1641" Behavior="error" />
+                <ExitCode Value="-2147023255" Behavior="error" />
+                <ExitCode Value="-2147483647" Behavior="error" />
+                <ExitCode Value="-2147483648" Behavior="error" />
+                <ExitCode Behavior="success" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>