diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-12-11 21:07:48 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-12-12 21:51:07 -0600 |
commit | eab59ecbfd254bb8707615bc31b840339a6356d6 (patch) | |
tree | f553ee5125ba82361a9e3499b7445231cac675d9 /src/ext | |
parent | 132cc6ae8de1bae87000a2108e832db520fed038 (diff) | |
download | wix-eab59ecbfd254bb8707615bc31b840339a6356d6.tar.gz wix-eab59ecbfd254bb8707615bc31b840339a6356d6.tar.bz2 wix-eab59ecbfd254bb8707615bc31b840339a6356d6.zip |
Try to convert the MBA prereq magic variables to the new attributes.
Fixes 7026
Diffstat (limited to 'src/ext')
-rw-r--r-- | src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 2 | ||||
-rw-r--r-- | src/ext/Bal/wixext/BalErrors.cs | 4 |
2 files changed, 3 insertions, 3 deletions
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 | |||
177 | "-o", bundleFile, | 177 | "-o", bundleFile, |
178 | }); | 178 | }); |
179 | Assert.Equal(6802, compileResult.ExitCode); | 179 | Assert.Equal(6802, compileResult.ExitCode); |
180 | 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()); | 180 | 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()); |
181 | 181 | ||
182 | Assert.False(File.Exists(bundleFile)); | 182 | Assert.False(File.Exists(bundleFile)); |
183 | Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); | 183 | 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 | |||
45 | 45 | ||
46 | public static Message MissingDNCPrereq() | 46 | public static Message MissingDNCPrereq() |
47 | { | 47 | { |
48 | return Message(null, Ids.MissingDNCPrereq, "There must be at least one PrereqPackage when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\"."); | 48 | 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\"."); |
49 | } | 49 | } |
50 | 50 | ||
51 | public static Message MissingIUIPrimaryPackage() | 51 | public static Message MissingIUIPrimaryPackage() |
@@ -55,7 +55,7 @@ namespace WixToolset.Bal | |||
55 | 55 | ||
56 | public static Message MissingMBAPrereq() | 56 | public static Message MissingMBAPrereq() |
57 | { | 57 | { |
58 | 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."); | 58 | 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."); |
59 | } | 59 | } |
60 | 60 | ||
61 | public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers) | 61 | public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers) |