Setup WixToolset.Mba.Core project and nuget package.

10 files changed, 173 insertions, 7 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index ee397c4a..1aceb3b0 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -8,6 +8,7 @@ msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp
 msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp
 
 msbuild -p:Configuration=Release -t:Pack src\balutil\balutil.vcxproj
+msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj
 
 @popd
 @endlocal
\ No newline at end of file
diff --git a/balutil.sln b/balutil.sln
index 58f61391..9ed8e3f5 100644
--- a/balutil.sln
+++ b/balutil.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "src\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|x64 = Debug|x64
@@ -21,6 +23,14 @@ Global
                 {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64
                 {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32
                 {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.Build.0 = Debug|Any CPU
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.Build.0 = Debug|Any CPU
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.ActiveCfg = Release|Any CPU
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.Build.0 = Release|Any 
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.ActiveCfg = Release|Any CPU
+                {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE
diff --git a/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs b/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..386748a8
--- /dev/null
+++ b/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Managed Bootstrapper Application Core (WiX)")]
+[assembly: AssemblyDescription("Managed Bootstrapper Application Core")]
+[assembly: AssemblyProduct("WiX Toolset")]
+[assembly: AssemblyCompany("WiX Toolset Team")]
+[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")]
+
+// Types should not be visible to COM by default.
+[assembly: ComVisible(false)]
+[assembly: Guid("6f4e0cc9-8ad4-4b5a-a669-3aafff67a76f")]
+
+[assembly: CLSCompliantAttribute(true)]
diff --git a/src/WixToolset.Mba.Core/WixToolset.BootstrapperCore.config b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config
index 1e284001..1e284001 100644
--- a/src/WixToolset.Mba.Core/WixToolset.BootstrapperCore.config
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
new file mode 100644
index 00000000..16d278b0
--- /dev/null
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -0,0 +1,111 @@
+<?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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{E7E1841E-A58E-4901-B9CA-4845B807D45F}</ProjectGuid>
+    <AssemblyName>WixToolset.Mba.Core</AssemblyName>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolset.Mba.Core</RootNamespace>
+    <NoWarn>0693;1591</NoWarn>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <Description>Managed Bootstrapper Application entry point</Description>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>false</Optimize>
+    <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>true</Optimize>
+    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="BaseBootstrapperApplicationFactory.cs" />
+    <Compile Include="BootstrapperApplication.cs" />
+    <Compile Include="BootstrapperApplicationData.cs" />
+    <Compile Include="BootstrapperApplicationFactory.cs" />
+    <Compile Include="BootstrapperApplicationFactoryAttribute.cs" />
+    <Compile Include="BootstrapperCommand.cs" />
+    <Compile Include="BootstrapperSectionGroup.cs" />
+    <Compile Include="BundleInfo.cs" />
+    <Compile Include="Engine.cs" />
+    <Compile Include="EventArgs.cs" />
+    <Compile Include="Exceptions.cs" />
+    <Compile Include="HostSection.cs" />
+    <Compile Include="IBootstrapperApplicationData.cs" />
+    <Compile Include="IBootstrapperApplicationFactory.cs" />
+    <Compile Include="IBootstrapperCommand.cs" />
+    <Compile Include="IBundleInfo.cs" />
+    <Compile Include="IDefaultBootstrapperApplication.cs" />
+    <Compile Include="IEngine.cs" />
+    <Compile Include="IPackageInfo.cs" />
+    <Compile Include="IVariables.cs" />
+    <Compile Include="NativeMethods.cs" />
+    <Compile Include="PackageInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SupportedFrameworkElementCollection.cs" />
+    <Compile Include="SupportedFrameworkElement.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="WixToolset.Mba.Core.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WixToolset.BootstrapperCore">
+      <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <HeaderPath Include="$(BaseOutputPath)$(Configuration)\$(AssemblyName).h">
+      <Visible>False</Visible>
+    </HeaderPath>
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+
+  <Target Name="GenerateIdentityHeader" AfterTargets="Build" Inputs="$(TargetPath)" Outputs="@(HeaderPath)">
+    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
+      <Output TaskParameter="Assemblies" ItemName="AssemblyIdentity" />
+    </GetAssemblyIdentity>
+    <ItemGroup>
+      <Line Include="#define MBA_ASSEMBLY_FULL_NAME L&quot;%(AssemblyIdentity.Identity)&quot;" />
+      <Line Include="#define MBA_ASSEMBLY_NAME L&quot;%(AssemblyIdentity.Name)&quot;" />
+      <Line Include="#define MBA_ASSEMBLY_VERSION L&quot;%(AssemblyIdentity.Version)&quot;" />
+      <Line Include="#define MBA_ASSEMBLY_CULTURE L&quot;%(AssemblyIdentity.Culture)&quot;" Condition="'%(AssemblyIdentity.Culture)'!=''" />
+      <Line Include="#define MBA_ASSEMBLY_CULTURE L&quot;neutral&quot;" Condition="'%(AssemblyIdentity.Culture)'==''" />
+      <Line Include="#define MBA_ASSEMBLY_PUBLICKEYTOKEN L&quot;%(AssemblyIdentity.PublicKeyToken)&quot;" />
+    </ItemGroup>
+    <Message Importance="normal" Text="Generating identity definitions into @(HeaderPath->'%(FullPath)')" />
+    <WriteLinesToFile File="@(HeaderPath)" Lines="@(Line)" Overwrite="True" />
+    <ItemGroup>
+      <FileWrites Include="@(HeaderPath)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="Pack" DependsOnTargets="GetBuildVersion">
+    <Exec Command='nuget pack $(AssemblyName).nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=$(AssemblyName);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
+  </Target>
+
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
+
+  <PropertyGroup Condition=" '$(CreateDocumentation)'!='false' ">
+    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
new file mode 100644
index 00000000..04eee9ec
--- /dev/null
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>WiX Toolset Team</authors>
+    <owners>WiX Toolset Team</owners>
+    <!-- <license type="expression">MS-RL</license> -->
+    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
+    <projectUrl>https://github.com/wixtoolset/BootstrapperCore</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+  </metadata>
+
+  <files>
+    <file src="..\..\build\$configuration$\$id$.config" target="samples" />
+    <file src="..\..\build\$configuration$\$id$.h" target="build\native\include" />
+    <file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />
+  </files>
+</package>
diff --git a/src/WixToolset.Mba.Core/packages.config b/src/WixToolset.Mba.Core/packages.config
new file mode 100644
index 00000000..3702a604
--- /dev/null
+++ b/src/WixToolset.Mba.Core/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.8" targetFramework="net20" />
+</packages>
\ No newline at end of file
diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec
index 67ed9bde..0a26004a 100644
--- a/src/balutil/balutil.nuspec
+++ b/src/balutil/balutil.nuspec
@@ -12,7 +12,7 @@
     <description>$description$</description>
     <copyright>$copyright$</copyright>
     <dependencies>
-        <dependency id="WixToolset.BootstrapperCore" version="[4,5)" />
+        <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
         <dependency id="WixToolset.DUtil" version="[4,5)" />
     </dependencies>
   </metadata>
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index a8b97615..42aa909e 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -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. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -70,6 +70,7 @@
     <ClInclude Include="inc\balretry.h" />
     <ClInclude Include="inc\balutil.h" />
     <ClInclude Include="inc\IBAFunctions.h" />
+    <ClInclude Include="inc\IBootstrapperApplicationFactory.h" />
     <ClInclude Include="precomp.h" />
   </ItemGroup>
 
@@ -87,8 +88,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
 </Project>
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 52c84cf0..769c5a6e 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore" version="4.0.1" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.8" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file