@joebigelow / wix / commits / eca63e35

Add custom action prefixes.

Bob Arnson committed Feb 23, 2021 at 18:52 UTC eca63e35a7dd2d7925d635fabcf03a9b701b7272
2 files changed +4 -4
global.json
+1 -1
@@ -1,5 +1,5 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0163"
3 + "WixToolset.Sdk": "4.0.0-build-0190"
4 }
5 }
src/wixext/IIsCompiler.cs
+3 -3
@@ -288,8 +288,8 @@ namespace WixToolset.Iis
288 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
289
290 // Reference InstallCertificates and UninstallCertificates since nothing will happen without them
291 - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
292 - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
291 + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4InstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
292 + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4UninstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
293 this.ParseHelper.EnsureTable(section, sourceLineNumbers, IisTableDefinitions.CertificateHash); // Certificate CustomActions require the CertificateHash table
294
295 if (!this.Messaging.EncounteredError)
@@ -2604,7 +2604,7 @@ namespace WixToolset.Iis
2604
2605 private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers)
2606 {
2607 - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureIIs", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2607 + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureIIs", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2608 }
2609 }
2610 }