diff options
-rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 3 | ||||
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index 6a71c4e9..ad2427e4 100644 --- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | |||
@@ -875,7 +875,6 @@ namespace WixToolset.Core.ExtensibilityServices | |||
875 | { | 875 | { |
876 | if (!this.Messaging.EncounteredError) | 876 | if (!this.Messaging.EncounteredError) |
877 | { | 877 | { |
878 | var name = String.Concat("Wix4", customAction); | ||
879 | var suffix = "_X86"; | 878 | var suffix = "_X86"; |
880 | 879 | ||
881 | switch (currentPlatform) | 880 | switch (currentPlatform) |
@@ -894,7 +893,7 @@ namespace WixToolset.Core.ExtensibilityServices | |||
894 | break; | 893 | break; |
895 | } | 894 | } |
896 | 895 | ||
897 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, name + suffix); | 896 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, customAction + suffix); |
898 | } | 897 | } |
899 | } | 898 | } |
900 | 899 | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs index 387031b9..2d98a66c 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs | |||
@@ -26,11 +26,11 @@ namespace WixToolsetTest.CoreIntegration | |||
26 | parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64); | 26 | parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64); |
27 | 27 | ||
28 | var simpleReferences = section.Symbols.OfType<WixSimpleReferenceSymbol>(); | 28 | var simpleReferences = section.Symbols.OfType<WixSimpleReferenceSymbol>(); |
29 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction32_X86").FirstOrDefault()); | 29 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction32_X86").FirstOrDefault()); |
30 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_X86").FirstOrDefault()); | 30 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomArmAction_X86").FirstOrDefault()); |
31 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_A64").FirstOrDefault()); | 31 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomArmAction_A64").FirstOrDefault()); |
32 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction_X86").FirstOrDefault()); | 32 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction_X86").FirstOrDefault()); |
33 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction_X64").FirstOrDefault()); | 33 | Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction_X64").FirstOrDefault()); |
34 | } | 34 | } |
35 | } | 35 | } |
36 | } | 36 | } |