Move wixstdba functions to Bal.wixext build

13 files changed, 4 insertions, 33 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/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/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/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")
 {