From eab59ecbfd254bb8707615bc31b840339a6356d6 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 11 Dec 2022 21:07:48 -0600 Subject: Try to convert the MBA prereq magic variables to the new attributes. Fixes 7026 --- src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 2 +- src/ext/Bal/wixext/BalErrors.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ext') diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 329722a4..32ff42b5 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -177,7 +177,7 @@ namespace WixToolsetTest.Bal "-o", bundleFile, }); Assert.Equal(6802, compileResult.ExitCode); - WixAssert.StringEqual("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); + WixAssert.StringEqual("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.", compileResult.Messages[0].ToString()); Assert.False(File.Exists(bundleFile)); Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); diff --git a/src/ext/Bal/wixext/BalErrors.cs b/src/ext/Bal/wixext/BalErrors.cs index cc4c6d41..cde37143 100644 --- a/src/ext/Bal/wixext/BalErrors.cs +++ b/src/ext/Bal/wixext/BalErrors.cs @@ -45,7 +45,7 @@ namespace WixToolset.Bal public static Message MissingDNCPrereq() { - return Message(null, Ids.MissingDNCPrereq, "There must be at least one PrereqPackage when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\"."); + return Message(null, Ids.MissingDNCPrereq, "There must be at least one package with bal:PrereqPackage=\"yes\" when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\"."); } public static Message MissingIUIPrimaryPackage() @@ -55,7 +55,7 @@ namespace WixToolset.Bal public static Message MissingMBAPrereq() { - return Message(null, Ids.MissingMBAPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups."); + return Message(null, 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) -- cgit v1.2.3-55-g6feb