Implement integrated build process

6 files changed, 39 insertions, 27 deletions

diff --git a/src/ext/Bal/wixlib/BalExtension_arm64.wxs b/src/ext/Bal/wixlib/BalExtension_arm64.wxs
index 1b9e11d2..9a1ca60c 100644
--- a/src/ext/Bal/wixlib/BalExtension_arm64.wxs
+++ b/src/ext/Bal/wixlib/BalExtension_arm64.wxs
@@ -1,7 +1,7 @@
 <!-- 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">
     <?define platform=arm64 ?>
     <?include BalExtension_platform.wxi ?>
+    <?include Mbahost_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi
index 33122fb2..6978ba99 100644
--- a/src/ext/Bal/wixlib/BalExtension_platform.wxi
+++ b/src/ext/Bal/wixlib/BalExtension_platform.wxi
@@ -16,20 +16,6 @@
         </BootstrapperApplication>
         <BootstrapperApplicationRef Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)" />
     </Fragment>
-    
-    <Fragment>
-        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
-            <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
-            <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" />
-            <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
-        </BootstrapperApplication>
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)">
-            <PayloadGroupRef Id="MbaPreqStandardPayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixManagedBootstrapperApplicationHost$(var.Suffix)" />
-    </Fragment>
 
     <Fragment>
         <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)">
diff --git a/src/ext/Bal/wixlib/BalExtension_x64.wxs b/src/ext/Bal/wixlib/BalExtension_x64.wxs
index 69a597ae..e5252718 100644
--- a/src/ext/Bal/wixlib/BalExtension_x64.wxs
+++ b/src/ext/Bal/wixlib/BalExtension_x64.wxs
@@ -4,4 +4,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x64 ?>
     <?include BalExtension_platform.wxi ?>
+    <?include Mbahost_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/BalExtension_x86.wxs b/src/ext/Bal/wixlib/BalExtension_x86.wxs
index 3cdd4015..1045160d 100644
--- a/src/ext/Bal/wixlib/BalExtension_x86.wxs
+++ b/src/ext/Bal/wixlib/BalExtension_x86.wxs
@@ -4,4 +4,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x86 ?>
     <?include BalExtension_platform.wxi ?>
+    <?include Mbahost_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/Mbahost_platform.wxi b/src/ext/Bal/wixlib/Mbahost_platform.wxi
new file mode 100644
index 00000000..06d7f1fc
--- /dev/null
+++ b/src/ext/Bal/wixlib/Mbahost_platform.wxi
@@ -0,0 +1,19 @@
+<!-- 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 xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?include caDecor.wxi ?>
+    <Fragment>
+        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
+            <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
+            <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" />
+            <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
+        </BootstrapperApplication>
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)">
+            <PayloadGroupRef Id="MbaPreqStandardPayloads" />
+        </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixManagedBootstrapperApplicationHost$(var.Suffix)" />
+    </Fragment>
+</Include>
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj
index fdcc7475..147b1a74 100644
--- a/src/ext/Bal/wixlib/bal.wixproj
+++ b/src/ext/Bal/wixlib/bal.wixproj
@@ -1,10 +1,11 @@
 <!-- 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="WixToolset.Sdk" ToolsVersion="4.0">
+<Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <BindFiles>true</BindFiles>
     <Cultures>en-us</Cultures>
   </PropertyGroup>
+
   <ItemGroup>
     <BindInputPaths Include="..\wixstdba\Resources\" />
     <BindInputPaths Include="$(OutputPath)netcoreapp3.1" />
@@ -13,24 +14,28 @@
     <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
     <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" />
-    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=ARM64" />
-    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=ARM64" />
-    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" />
-    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x64" />
-    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
+
   <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
   <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
     <PropertyGroup>
       <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
     </PropertyGroup>
   </Target>
-</Project>
\ No newline at end of file
+</Project>