From 69651a71ff2fdc1e9897b878782d79dcc1f9b896 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 6 Jan 2020 14:54:31 -0500
Subject: Ensure Errors have ids so they can be referenced.

---
 src/WixToolset.Core/Compiler.cs                                     | 2 +-
 src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs               | 6 ++++++
 .../WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs  | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 2a020ad5..6b9fe59e 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -5297,7 +5297,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ErrorTuple(sourceLineNumbers)
+                var tuple = new ErrorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id))
                 {
                     Error = id,
                     Message = Common.GetInnerText(node)
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index 81289e5a..a12ad469 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -280,6 +280,12 @@ namespace WixToolsetTest.CoreIntegration
                 var errors = section.Tuples.OfType<ErrorTuple>().ToDictionary(t => t.Error);
                 Assert.Equal("Category 55 Emergency Doomsday Crisis", errors[1234].Message.Trim());
                 Assert.Equal(" ", errors[5678].Message);
+
+                var customAction1 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single();
+                Assert.Equal("1234", customAction1.Target);
+
+                var customAction2 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single();
+                Assert.Equal("If you see this, something went wrong.", customAction2.Target);
             }
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
index 6da3dcbe..a4c01d7e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
@@ -6,6 +6,9 @@
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
     <MediaTemplate />
 
+    <CustomAction Id="CanWeReferenceAnError_YesWeCan" Error="1234" />
+    <CustomAction Id="TextErrorsWorkOKToo" Error="If you see this, something went wrong." />
+
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
     </Feature>
-- 
cgit v1.2.3-55-g6feb