Don't prefix custom action references.
Fixes https://github.com/wixtoolset/issues/issues/6365
Bob Arnson committed
Feb 23, 2021 at 17:43 UTC
41a337d00efa2f649ae5c1575ff55e568dc0b796
2 files changed
+6
-7
src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+1
-2
@@ -875,7 +875,6 @@ namespace WixToolset.Core.ExtensibilityServices
875
{
876
if (!this.Messaging.EncounteredError)
877
{
878
- var name = String.Concat("Wix4", customAction);
878
var suffix = "_X86";
879
880
switch (currentPlatform)
@@ -894,7 +893,7 @@ namespace WixToolset.Core.ExtensibilityServices
893
break;
894
}
895
897
- this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, name + suffix);
896
+ this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, customAction + suffix);
897
}
898
}
899
src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
+5
-5
@@ -26,11 +26,11 @@ namespace WixToolsetTest.CoreIntegration
26
parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64);
27
28
var simpleReferences = section.Symbols.OfType<WixSimpleReferenceSymbol>();
29
- Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction32_X86").FirstOrDefault());
30
- Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_X86").FirstOrDefault());
31
- Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_A64").FirstOrDefault());
32
- Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction_X86").FirstOrDefault());
33
- Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction_X64").FirstOrDefault());
29
+ Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction32_X86").FirstOrDefault());
30
+ Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomArmAction_X86").FirstOrDefault());
31
+ Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomArmAction_A64").FirstOrDefault());
32
+ Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction_X86").FirstOrDefault());
33
+ Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction_X64").FirstOrDefault());
34
}
35
}
36
}