From eca63e35a7dd2d7925d635fabcf03a9b701b7272 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 23 Feb 2021 18:52:35 -0500 Subject: Add custom action prefixes. --- global.json | 2 +- src/wixext/IIsCompiler.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index 10345833..32e88652 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0163" + "WixToolset.Sdk": "4.0.0-build-0190" } } diff --git a/src/wixext/IIsCompiler.cs b/src/wixext/IIsCompiler.cs index 27258094..952a4a67 100644 --- a/src/wixext/IIsCompiler.cs +++ b/src/wixext/IIsCompiler.cs @@ -288,8 +288,8 @@ namespace WixToolset.Iis this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); // Reference InstallCertificates and UninstallCertificates since nothing will happen without them - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4InstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4UninstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); this.ParseHelper.EnsureTable(section, sourceLineNumbers, IisTableDefinitions.CertificateHash); // Certificate CustomActions require the CertificateHash table if (!this.Messaging.EncounteredError) @@ -2604,7 +2604,7 @@ namespace WixToolset.Iis private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureIIs", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureIIs", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } } } -- cgit v1.2.3-55-g6feb