Move wixstdba functions to Bal.wixext build

40 files changed, 397 insertions, 57 deletions

diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj
index 280f21b8..7d539b5b 100644
--- a/src/api/burn/balutil/balutil.vcxproj
+++ b/src/api/burn/balutil/balutil.vcxproj
@@ -52,7 +52,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ClCompile Include="BalBaseBAFunctionsProc.cpp" />
     <ClCompile Include="BalBootstrapperEngine.cpp" />
     <ClCompile Include="balcondition.cpp" />
     <ClCompile Include="balinfo.cpp" />
@@ -64,15 +63,11 @@
     <ClCompile Include="msg.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="inc\BAFunctions.h" />
-    <ClInclude Include="inc\BalBaseBAFunctions.h" />
-    <ClInclude Include="inc\BalBaseBAFunctionsProc.h" />
     <ClInclude Include="inc\BalBaseBootstrapperApplication.h" />
     <ClInclude Include="inc\balcondition.h" />
     <ClInclude Include="inc\balinfo.h" />
     <ClInclude Include="inc\balretry.h" />
     <ClInclude Include="inc\balutil.h" />
-    <ClInclude Include="inc\IBAFunctions.h" />
     <ClInclude Include="inc\IBootstrapperApplication.h" />
     <ClInclude Include="inc\IBootstrapperEngine.h" />
     <ClInclude Include="BalBootstrapperEngine.h" />
diff --git a/src/api/burn/balutil/precomp.h b/src/api/burn/balutil/precomp.h
index 68e07a44..753bc21f 100644
--- a/src/api/burn/balutil/precomp.h
+++ b/src/api/burn/balutil/precomp.h
@@ -30,13 +30,11 @@
 #include <thmutil.h>
 #include <xmlutil.h>
 
-#include "IBAFunctions.h"
+#include "IBootstrapperApplication.h"
 
 #include "balutil.h"
 #include "BalBootstrapperEngine.h"
 #include "balcondition.h"
 #include "balinfo.h"
 #include "balretry.h"
-
-#include "BalBaseBAFunctionsProc.h"
 #include "msg.h"
diff --git a/src/api/burn/inc/BootstrapperApplication.h b/src/api/burn/inc/BootstrapperApplication.h
index 79b1df80..8b945b77 100644
--- a/src/api/burn/inc/BootstrapperApplication.h
+++ b/src/api/burn/inc/BootstrapperApplication.h
@@ -729,21 +729,6 @@ struct BA_ONCREATE_ARGS
 {
     DWORD dwApiVersion;
     BOOTSTRAPPER_COMMAND command;
-    // BOOTSTRAPPER_ACTION action;
-    // BOOTSTRAPPER_DISPLAY display;
-
-    // LPWSTR wzCommandLine;
-    // INT32 nCmdShow;
-
-    // BOOTSTRAPPER_RESUME_TYPE resumeType;
-    // HWND hwndSplashScreen;
-
-    // BOOTSTRAPPER_RELATION_TYPE relationType;
-    // BOOL fPassthrough;
-
-    // LPWSTR wzLayoutDirectory;
-    // LPWSTR wzBootstrapperWorkingFolder;
-    // LPWSTR wzBootstrapperApplicationDataPath;
 };
 
 struct BA_ONCREATE_RESULTS
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
index de79fe33..114ab26d 100644
--- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
@@ -37,20 +37,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ClCompile Include="BAFunctionsTests.cpp" />
     <ClCompile Include="BootstrapperApplicationTests.cpp" />
     <ClCompile Include="precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
       <!-- Warnings from referencing netstandard dlls -->
       <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="TestBAFunctions.cpp" />
     <ClCompile Include="TestBootstrapperApplication.cpp" />
   </ItemGroup>
 
   <ItemGroup>
     <ClInclude Include="precomp.h" />
-    <ClInclude Include="TestBAFunctions.h" />
     <ClInclude Include="TestBootstrapperApplication.h" />
   </ItemGroup>
 
diff --git a/src/api/burn/test/BalUtilUnitTest/precomp.h b/src/api/burn/test/BalUtilUnitTest/precomp.h
index 4cdd262c..78add593 100644
--- a/src/api/burn/test/BalUtilUnitTest/precomp.h
+++ b/src/api/burn/test/BalUtilUnitTest/precomp.h
@@ -16,11 +16,9 @@
 #include <dictutil.h>
 
 #include <IBootstrapperApplication.h>
-#include <IBAFunctions.h>
 #include <balutil.h>
 #include <balretry.h>
 
-#include "TestBAFunctions.h"
 #include "TestBootstrapperApplication.h"
 
 #pragma managed
diff --git a/src/ext/Bal/Bal.wixext.sln b/src/ext/Bal/Bal.wixext.sln
index 48eb190e..cbd66f76 100644
--- a/src/ext/Bal/Bal.wixext.sln
+++ b/src/ext/Bal/Bal.wixext.sln
@@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixiuiba", "wixiuiba\wixiui
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdbas", "stdbas\stdbas.vcxproj", "{DBBF5F32-BAEA-46A8-99A0-17277A906456}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixStdFnUnitTest", "test\WixStdFnUnitTest\WixStdFnUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}"
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Any CPU = Debug|Any CPU
@@ -137,6 +139,22 @@ Global
                 {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|x64.Build.0 = Release|x64
                 {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|x86.ActiveCfg = Release|Win32
                 {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|x86.Build.0 = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.Build.0 = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|ARM64.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|ARM64.Build.0 = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x64.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x64.Build.0 = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.Build.0 = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|Any CPU.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|Any CPU.Build.0 = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|ARM64.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|ARM64.Build.0 = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x64.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x64.Build.0 = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE
diff --git a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
index 14a898e8..a0aa0488 100644
--- a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
+++ b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
@@ -74,9 +74,6 @@ HRESULT WINAPI CreateBAFunctions(
     HRESULT hr = S_OK;
     CWixSampleBAFunctions* pBAFunctions = NULL;
 
-    // This is required to enable logging functions.
-    BalInitialize(pArgs->pEngine);
-
     pBAFunctions = new CWixSampleBAFunctions(hModule);
     ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CWixSampleBAFunctions object.");
 
diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.cpp b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp
index d26e7cce..72dc1f54 100644
--- a/src/ext/Bal/Samples/bafunctions/bafunctions.cpp
+++ b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp
@@ -26,13 +26,16 @@ extern "C" BOOL WINAPI DllMain(
 }
 
 extern "C" HRESULT WINAPI BAFunctionsCreate(
-    __in const BA_FUNCTIONS_CREATE_ARGS* /*pArgs*/,
-    __inout BA_FUNCTIONS_CREATE_RESULTS* /*pResults*/
+    __in const BA_FUNCTIONS_CREATE_ARGS* pArgs,
+    __inout BA_FUNCTIONS_CREATE_RESULTS* pResults
     )
 {
     HRESULT hr = S_OK;
-    
-    //hr = CreateBAFunctions(vhInstance, pArgs, pResults);
+
+    // This is required to enable logging functions.
+    BalInitialize(pArgs->pEngine);
+
+    hr = CreateBAFunctions(vhInstance, pArgs, pResults);
     BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
 
 LExit:
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index 7a48f6fc..df9ceca4 100644
--- a/src/ext/Bal/bal.cmd
+++ b/src/ext/Bal/bal.cmd
@@ -17,34 +17,37 @@
 @if "%_INC%"=="" call :clean
 @if NOT "%_CLEAN%"=="" goto :end
 
-@echo Building ext\BootstrapperApplications %_C% using %_N%
+@echo Building ext\Bal %_C% using %_N%
 
 :: Restore
-
 :: Build
+:: Pack
+:: Note: This test project must be restored and built directly to get all its support files laid out correctly.
+::       Everything else is built by the traversal project.
 msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj -bl:%_L%\ext_bal_build.binlog || exit /b
 
-msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog  || exit /b
+msbuild bal_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\bal_build.binlog || exit /b
 
 :: Test
 dotnet test ^
+  %_B%\x86\WixStdFnUnitTest.dll ^
   %_B%\net6.0\WixToolsetTest.BootstrapperApplications.dll ^
   --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b
 
-:: Pack
-msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.BootstrapperApplications.wixext.csproj || exit /b
-msbuild -t:Pack -Restore -p:Configuration=%_C% -tl -nologo -warnaserror wixext-backward-compatible\WixToolset.Bal.wixext.csproj || exit /b
-
 @goto :end
 
 :clean
 @rd /s/q "..\..\..\build\Bal.wixext" 2> nul
 @del "..\..\..\build\artifacts\WixToolset.Bal.wixext.*.nupkg" 2> nul
 @del "..\..\..\build\artifacts\WixToolset.BootstrapperApplications.wixext.*.nupkg" 2> nul
+@del "..\..\..\build\artifacts\WixToolset.WixStandardBootstrapperApplicationFunctionApi.*.nupkg" 2> nul
 @del "%_L%\ext_bal_build.binlog" 2> nul
+@del "%_L%\bal_fnsapi_build.binlog" 2> nul
+@del "%_L%\bal_examples_build.binlog" 2> nul
 @del "%_L%\TestResults\bal.wixext.trx" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bal.wixext" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrapperapplications.wixext" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.wixstandardbootstrapperapplicationfunctionapi" 2> nul
 @exit /b
 
 :end
diff --git a/src/ext/Bal/bal_t.proj b/src/ext/Bal/bal_t.proj
new file mode 100644
index 00000000..a0e66e97
--- /dev/null
+++ b/src/ext/Bal/bal_t.proj
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
+    <ProjectReference Include="test\WixStdFnUnitTest\WixStdFnUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
+    <ProjectReference Include="test\examples\examples.proj" Targets="Restore" />
+    <ProjectReference Include="wixext-backward-compatible\WixToolset.Bal.wixext.csproj" Targets="Restore" />
+
+    <!-- Build -->
+
+    <!-- C++/CLI projects will try to build their dependent projects in parallel with others, so they must be built first. -->
+    <ProjectReference Include="test\WixStdFnUnitTest\WixStdFnUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
+
+    <!-- wixstdfn x86 is built by WixStdFnUnitTest -->
+    <ProjectReference Include="wixstdfn\wixstdfn.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="wixstdfn\wixstdfn.vcxproj" Properties="Platform=ARM64" />
+
+    <ProjectReference Include="test\examples\examples.proj" />
+
+    <!-- Pack -->
+    <ProjectReference Include="wixstdfn\wixstdfn.vcxproj" Properties="NoBuild=true" Targets="PackNative" />
+    <ProjectReference Include="wixext\WixToolset.BootstrapperApplications.wixext.csproj" Properties="NoBuild=true" Targets="Pack" />
+    <ProjectReference Include="wixext-backward-compatible\WixToolset.Bal.wixext.csproj" Targets="Pack" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/Bal/stdbas/stdbas.vcxproj b/src/ext/Bal/stdbas/stdbas.vcxproj
index c9b1451b..12dbbc61 100644
--- a/src/ext/Bal/stdbas/stdbas.vcxproj
+++ b/src/ext/Bal/stdbas/stdbas.vcxproj
@@ -47,6 +47,10 @@
   <ImportGroup Label="Shared">
   </ImportGroup>
 
+  <PropertyGroup>
+    <ProjectAdditionalIncludeDirectories>inc;..\wixstdfn\inc</ProjectAdditionalIncludeDirectories>
+  </PropertyGroup>
+
   <ItemGroup>
     <ClInclude Include="inc\WixInternalUIBootstrapperApplication.h" />
     <ClInclude Include="inc\WixStandardBootstrapperApplication.h" />
diff --git a/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp b/src/ext/Bal/test/WixStdFnUnitTest/BAFunctionsTests.cpp
index ba04c1bb..ba04c1bb 100644
--- a/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp
+++ b/src/ext/Bal/test/WixStdFnUnitTest/BAFunctionsTests.cpp
diff --git a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.cpp b/src/ext/Bal/test/WixStdFnUnitTest/TestBAFunctions.cpp
index 3e850442..3e850442 100644
--- a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.cpp
+++ b/src/ext/Bal/test/WixStdFnUnitTest/TestBAFunctions.cpp
diff --git a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h b/src/ext/Bal/test/WixStdFnUnitTest/TestBAFunctions.h
index e25e40c3..e25e40c3 100644
--- a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h
+++ b/src/ext/Bal/test/WixStdFnUnitTest/TestBAFunctions.h
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp b/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp
new file mode 100644
index 00000000..b345ab9f
--- /dev/null
+++ b/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp
@@ -0,0 +1,30 @@
+// 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.
+
+#include "precomp.h"
+#include "BalBaseBootstrapperApplication.h"
+
+class CTestBootstrapperApplication : public CBalBaseBootstrapperApplication
+{
+public:
+    CTestBootstrapperApplication() : CBalBaseBootstrapperApplication()
+    {
+    }
+};
+
+HRESULT CreateBootstrapperApplication(
+    __out IBootstrapperApplication** ppApplication
+    )
+{
+    HRESULT hr = S_OK;
+    CTestBootstrapperApplication* pApplication = NULL;
+
+    pApplication = new CTestBootstrapperApplication();
+    ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new test bootstrapper application object.");
+
+    *ppApplication = pApplication;
+    pApplication = NULL;
+
+LExit:
+    ReleaseObject(pApplication);
+    return hr;
+}
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.h b/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.h
new file mode 100644
index 00000000..313bfede
--- /dev/null
+++ b/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.h
@@ -0,0 +1,6 @@
+#pragma once
+// 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.
+
+HRESULT CreateBootstrapperApplication(
+    __out IBootstrapperApplication** ppApplication
+    );
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/WixStdFnUnitTest.filters b/src/ext/Bal/test/WixStdFnUnitTest/WixStdFnUnitTest.filters
new file mode 100644
index 00000000..0b3b60be
--- /dev/null
+++ b/src/ext/Bal/test/WixStdFnUnitTest/WixStdFnUnitTest.filters
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="BAFunctionsTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BootstrapperApplicationTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TestBAFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TestBootstrapperApplication.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TestBAFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TestBootstrapperApplication.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/WixStdFnUnitTest.vcxproj b/src/ext/Bal/test/WixStdFnUnitTest/WixStdFnUnitTest.vcxproj
new file mode 100644
index 00000000..c0be8e11
--- /dev/null
+++ b/src/ext/Bal/test/WixStdFnUnitTest/WixStdFnUnitTest.vcxproj
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.props" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
+    <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid>
+    <RootNamespace>UnitTest</RootNamespace>
+    <Keyword>ManagedCProj</Keyword>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup>
+    <ProjectAdditionalIncludeDirectories>..\..\..\..\api\burn\inc;..\..\..\..\api\burn\balutil\inc;..\..\wixstdfn\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib;$(RootBuildFolder)api\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\balutil.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="BAFunctionsTests.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+      <!-- Warnings from referencing netstandard dlls -->
+      <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="TestBAFunctions.cpp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="TestBAFunctions.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\wixstdfn\wixstdfn.vcxproj">
+      <Project>{D786C02F-9488-421F-A5A5-D1D31E8E648B}</Project>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.targets" />
+</Project>
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/precomp.cpp b/src/ext/Bal/test/WixStdFnUnitTest/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/ext/Bal/test/WixStdFnUnitTest/precomp.cpp
@@ -0,0 +1,3 @@
+// 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.
+
+#include "precomp.h"
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/precomp.h b/src/ext/Bal/test/WixStdFnUnitTest/precomp.h
new file mode 100644
index 00000000..4cdd262c
--- /dev/null
+++ b/src/ext/Bal/test/WixStdFnUnitTest/precomp.h
@@ -0,0 +1,27 @@
+#pragma once
+// 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.
+
+
+#include <windows.h>
+
+#pragma warning(push)
+#pragma warning(disable:4458) // declaration of 'xxx' hides class member
+#include <gdiplus.h>
+#pragma warning(pop)
+
+#include <msiquery.h>
+#include <CommCtrl.h>
+
+#include <dutil.h>
+#include <dictutil.h>
+
+#include <IBootstrapperApplication.h>
+#include <IBAFunctions.h>
+#include <balutil.h>
+#include <balretry.h>
+
+#include "TestBAFunctions.h"
+#include "TestBootstrapperApplication.h"
+
+#pragma managed
+#include <vcclr.h>
diff --git a/src/ext/Bal/wixprqba/wixprqba.vcxproj b/src/ext/Bal/wixprqba/wixprqba.vcxproj
index 8c838fb5..237219b3 100644
--- a/src/ext/Bal/wixprqba/wixprqba.vcxproj
+++ b/src/ext/Bal/wixprqba/wixprqba.vcxproj
@@ -48,7 +48,7 @@
   </ImportGroup>
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\stdbas\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\stdbas\inc;$(ProjectDir)..\wixstdfn\inc</ProjectAdditionalIncludeDirectories>
     <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;stdbas.res</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj
index 1f961018..6abb3d4c 100644
--- a/src/ext/Bal/wixstdba/wixstdba.vcxproj
+++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj
@@ -48,7 +48,7 @@
   </ImportGroup>
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\stdbas\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\stdbas\inc;$(ProjectDir)..\wixstdfn\inc</ProjectAdditionalIncludeDirectories>
     <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;stdbas.res</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
diff --git a/src/api/burn/balutil/BalBaseBAFunctionsProc.cpp b/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
index 38ebf65c..38ebf65c 100644
--- a/src/api/burn/balutil/BalBaseBAFunctionsProc.cpp
+++ b/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
diff --git a/src/ext/Bal/wixstdfn/build/WixToolset.WixStandardBootstrapperApplicationFunctionApi.props b/src/ext/Bal/wixstdfn/build/WixToolset.WixStandardBootstrapperApplicationFunctionApi.props
new file mode 100644
index 00000000..7a0b08e6
--- /dev/null
+++ b/src/ext/Bal/wixstdfn/build/WixToolset.WixStandardBootstrapperApplicationFunctionApi.props
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\lib\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\lib\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) ">
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\lib\native\v14\$(PlatformTarget)\wixstdfn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/src/api/burn/balutil/inc/BAFunctions.h b/src/ext/Bal/wixstdfn/inc/BAFunctions.h
index 7908a74c..7908a74c 100644
--- a/src/api/burn/balutil/inc/BAFunctions.h
+++ b/src/ext/Bal/wixstdfn/inc/BAFunctions.h
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
index df0b7006..fd284d9c 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h
+++ b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
@@ -4,9 +4,7 @@
 #include <windows.h>
 #include <msiquery.h>
 
-#include <BootstrapperApplication.h>
-
-#include "IBAFunctions.h"
+#include <IBAFunctions.h>
 
 class CBalBaseBAFunctions : public IBAFunctions
 {
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctionsProc.h
index 65eeb0b4..65eeb0b4 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h
+++ b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctionsProc.h
diff --git a/src/api/burn/balutil/inc/IBAFunctions.h b/src/ext/Bal/wixstdfn/inc/IBAFunctions.h
index 42b64f9b..f54ae339 100644
--- a/src/api/burn/balutil/inc/IBAFunctions.h
+++ b/src/ext/Bal/wixstdfn/inc/IBAFunctions.h
@@ -2,8 +2,8 @@
 // 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.
 
 
-#include "IBootstrapperApplication.h"
-#include "BAFunctions.h"
+#include <IBootstrapperApplication.h>
+#include <BAFunctions.h>
 
 DECLARE_INTERFACE_IID_(IBAFunctions, IBootstrapperApplication, "0FB445ED-17BD-49C7-BE19-479776F8AE96")
 {
diff --git a/src/ext/Bal/wixstdfn/precomp.cpp b/src/ext/Bal/wixstdfn/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/ext/Bal/wixstdfn/precomp.cpp
@@ -0,0 +1,3 @@
+// 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.
+
+#include "precomp.h"
diff --git a/src/ext/Bal/wixstdfn/precomp.h b/src/ext/Bal/wixstdfn/precomp.h
new file mode 100644
index 00000000..ff959ed7
--- /dev/null
+++ b/src/ext/Bal/wixstdfn/precomp.h
@@ -0,0 +1,11 @@
+#pragma once
+// 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.
+
+
+#include <windows.h>
+#include <msi.h>
+
+#include <dutil.h>
+
+#include "IBAFunctions.h"
+#include "BalBaseBAFunctionsProc.h"
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
new file mode 100644
index 00000000..d7e0de41
--- /dev/null
+++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <icon>wix.png</icon>
+    <license type="expression">MS-RL</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+    <dependencies>
+      <group targetFramework="Native">
+        <dependency id="WixToolset.BootstrapperApplicationApi" version="[$version$,5)" />
+        <dependency id="WixToolset.DUtil" version="[$version$,5)" />
+      </group>
+    </dependencies>
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
+    <file src="$projectFolder$\inc\*" target="lib\native\include" />
+    <file src="..\..\v141\x86\wixstdfn.lib" target="lib\native\v14\x86" />
+    <file src="..\..\v141\x64\wixstdfn.lib" target="lib\native\v14\x64" />
+    <file src="..\..\v141\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
+  </files>
+</package>
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.vcxproj b/src/ext/Bal/wixstdfn/wixstdfn.vcxproj
new file mode 100644
index 00000000..8d522ebc
--- /dev/null
+++ b/src/ext/Bal/wixstdfn/wixstdfn.vcxproj
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D786C02F-9488-421F-A5A5-D1D31E8E648B}</ProjectGuid>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <TargetName>wixstdfn</TargetName>
+    <CharacterSet>MultiByte</CharacterSet>
+    <Description>WiX Toolset Standard BootstrapperApplication Functions API</Description>
+    <PackageId>WixToolset.WixStandardBootstrapperApplicationFunctionApi</PackageId>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
+
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+
+  <PropertyGroup>
+    <ProjectAdditionalIncludeDirectories>inc</ProjectAdditionalIncludeDirectories>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="BalBaseBAFunctionsProc.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="inc\BAFunctions.h" />
+    <ClInclude Include="inc\BalBaseBAFunctions.h" />
+    <ClInclude Include="inc\BalBaseBAFunctionsProc.h" />
+    <ClInclude Include="inc\IBAFunctions.h" />
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 2189a371..17a3b257 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -15,6 +15,7 @@
 
     <PackageVersion Include="WixToolset.BextUtil" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.BootstrapperApplicationApi" Version="{packageversion}" />
+    <PackageVersion Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" Version="{packageversion}" />
 
     <PackageVersion Include="WixToolset.Data" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Extensibility" Version="{packageversion}" />
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
index 58db7048..815b20a9 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
+    <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp
index fc9d1177..6396fa08 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp
@@ -31,7 +31,9 @@ extern "C" HRESULT WINAPI BAFunctionsCreate(
     )
 {
     HRESULT hr = S_OK;
-    
+
+    BalInitialize(pArgs->pEngine);
+
     hr = CreateBAFunctions(vhInstance, pArgs, pResults);
     BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
 
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
index b6de5844..aa6a03f7 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
@@ -62,7 +62,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
+    <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp b/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp
index fc9d1177..6396fa08 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp
@@ -31,7 +31,9 @@ extern "C" HRESULT WINAPI BAFunctionsCreate(
     )
 {
     HRESULT hr = S_OK;
-    
+
+    BalInitialize(pArgs->pEngine);
+
     hr = CreateBAFunctions(vhInstance, pArgs, pResults);
     BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
 
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
index c93f9d3f..5e26faac 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
@@ -77,8 +77,6 @@ HRESULT WINAPI CreateBAFunctions(
     HRESULT hr = S_OK;
     CPrereqBaf* pBAFunctions = NULL;
 
-    BalInitialize(pArgs->pEngine);
-
     pBAFunctions = new CPrereqBaf(hModule);
     ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CPrereqBaf object.");
 
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
index 4156a8f5..d0bce9d8 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
+    <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp
index fc9d1177..6396fa08 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp
@@ -31,7 +31,9 @@ extern "C" HRESULT WINAPI BAFunctionsCreate(
     )
 {
     HRESULT hr = S_OK;
-    
+
+    BalInitialize(pArgs->pEngine);
+
     hr = CreateBAFunctions(vhInstance, pArgs, pResults);
     BalExitOnFailure(hr, "Failed to create BAFunctions interface.");