WIP

wixtoolset · Feb 26, 2024 · 4d2c9c9 · 4d2c9c9
1 parent 2e1980a
commit 4d2c9c9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -197,6 +197,9 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
         hr = BalGetStringVariable(L"WixBundleVersion", &m_sczBundleVersion);
         BalExitOnFailure(hr, "CWixStandardBootstrapperApplication initialization failed.");
 
+        hr = InitializeData();
+        BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application.");
+
 #ifdef TODO_REWRITE
         // TODO: need to load the m_pPrereqData
 #endif
@@ -2734,9 +2737,6 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
         hr = ThemeInitialize(pThis->m_hModule);
         BalExitOnFailure(hr, "Failed to initialize theme manager.");
 
-        hr = pThis->InitializeData();
-        BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application.");
-
         // Create main window.
         pThis->InitializeTaskbarButton();
         hr = pThis->CreateMainWindow();
@@ -4781,8 +4781,8 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
         // TODO: load this data OnCreate().
         m_pPrereqData = NULL;
         m_fPrereq = NULL != m_pPrereqData;
-        m_fPreplanPrereqs = FALSE;
         m_fPerformHelp = !m_fPrereq || m_pPrereqData->fPerformHelp;
+        m_fPreplanPrereqs = FALSE;
         m_fPrereqPackagePlanned = FALSE;
         m_fPrereqInstalled = FALSE;
         m_fPrereqSkipped = FALSE;

diff --git a/src/ext/Bal/wixstdba/wixstdba.manifest b/src/ext/Bal/wixstdba/wixstdba.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
  <assemblyIdentity name="wixstdba.exe" version="5.0.0.0" type="win32"/>
- <description>WiX Toolset Standard Bootstrapper Application</description>
+ <description>WiX Toolset Bootstrapper Applications</description>
  <dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application>
   <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>

diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
@@ -1,16 +1,18 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Fragment>
-    <BootstrapperApplication Id="BrokenDncAlwaysPrereq" SourceFile="!(bindpath.dncx86)\TestBA.exe">
+    <BootstrapperApplication Id="BrokenDncAlwaysPrereq" SourceFile="!(bindpath.dncx86)\TestBA.exe"
+                             Secondary='true'>
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
       <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
       <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
       <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
+
+      <bal:WixPrerequisiteBootstrapperApplication AlwaysInstallPrereqs='true' />
     </BootstrapperApplication>
   </Fragment>
 

diff --git a/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs b/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs
@@ -110,7 +110,7 @@ public static Message TooManyBootstrapperApplications(SourceLineNumber sourceLin
         {
             var secondary = symbol.Secondary == true ? "secondary " : String.Empty;
 
-            return Message(sourceLineNumbers, Ids.MultipleSingletonSymbolsFound, "Multiple {1}BootstrapperApplications defined. You can have at most one BootstrapperAppplication of primary and secondary.", secondary);
+            return Message(sourceLineNumbers, Ids.MultipleSingletonSymbolsFound, "Multiple {0}BootstrapperApplications defined. You can have at most one BootstrapperAppplication of primary and secondary.", secondary);
         }
 
         public static Message BundleMissingBootstrapperApplicationContainer(SourceLineNumber sourceLineNumbers, string path)