From 0d3d54992104288e9ee0c834d0b96e8502fd2d42 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 11 Jan 2024 18:26:20 -0800 Subject: Move the BootstrapperApplication out of proc --- src/ext/Bal/wixext/BalErrors.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/ext/Bal/wixext/BalErrors.cs') diff --git a/src/ext/Bal/wixext/BalErrors.cs b/src/ext/Bal/wixext/BalErrors.cs index 7fbccecb..10986f0e 100644 --- a/src/ext/Bal/wixext/BalErrors.cs +++ b/src/ext/Bal/wixext/BalErrors.cs @@ -48,9 +48,9 @@ namespace WixToolset.Bal return Message(sourceLineNumbers, Ids.MissingDNCBAFactoryAssembly, "When using DotNetCoreBootstrapperApplicationHost, the Payload element for the BA's entry point DLL must have bal:BAFactoryAssembly=\"yes\"."); } - public static Message MissingDNCPrereq(SourceLineNumber sourceLineNumbers) + public static Message MissingPrereq(SourceLineNumber sourceLineNumbers) { - return Message(sourceLineNumbers, Ids.MissingDNCPrereq, "There must be at least one package with bal:PrereqPackage=\"yes\" when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\"."); + return Message(sourceLineNumbers, Ids.MissingPrereq, "There must be at least one package with bal:PrereqPackage=\"yes\" when using the bal:WixPrerequisiteBootstrapperApplication."); } public static Message MissingIUIPrimaryPackage(SourceLineNumber sourceLineNumbers) @@ -58,11 +58,6 @@ namespace WixToolset.Bal return Message(sourceLineNumbers, Ids.MissingIUIPrimaryPackage, "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\"."); } - public static Message MissingMBAPrereq(SourceLineNumber sourceLineNumbers) - { - return Message(sourceLineNumbers, Ids.MissingMBAPrereq, "There must be at least one package with bal:PrereqPackage=\"yes\" when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups."); - } - public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers) { return Message(sourceLineNumbers, Ids.MultipleBAFunctions, "WixStandardBootstrapperApplication doesn't support multiple BAFunctions DLLs."); @@ -106,11 +101,10 @@ namespace WixToolset.Bal public enum Ids { AttributeRequiresPrereqPackage = 6801, - MissingMBAPrereq = 6802, + MissingPrereq = 6802, MultiplePrereqLicenses = 6803, MultipleBAFunctions = 6804, BAFunctionsPayloadRequiredInUXContainer = 6805, - MissingDNCPrereq = 6806, MissingIUIPrimaryPackage = 6808, MultiplePrimaryPackageType = 6809, MultiplePrimaryPackageType2 = 6810, -- cgit v1.2.3-55-g6feb