11 files changed, 72 insertions, 114 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index ddad4dae..1e1f118c 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -1,15 +1,19 @@
 @setlocal
 @pushd %~dp0
+@set _C=Release
 
 nuget restore
 
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140
 
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141
 
-msbuild -p:Configuration=Release -t:Pack src\balutil\balutil.vcxproj
-msbuild -p:Configuration=Release -t:Pack src\bextutil\bextutil.vcxproj
-msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj
+@rem msbuild -t:VSTest -p:Configuration=%_C% src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj
+
+msbuild -t:Pack -p:Configuration=%_C% src\balutil\balutil.vcxproj
+msbuild -t:Pack -p:Configuration=%_C% src\bextutil\bextutil.vcxproj
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj
+msbuild -t:Pack -p:Configuration=%_C% src\mbanative\mbanative.vcxproj
 
 @popd
 @endlocal
\ No newline at end of file
diff --git a/balutil.sln b/balutil.sln
index 73df2292..e923cf15 100644
--- a/balutil.sln
+++ b/balutil.sln
@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "src\balutil\balu
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "src\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "src\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}"
 EndProject
@@ -52,10 +52,10 @@ Global
                 {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|Win32
                 {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.ActiveCfg = Release|Win32
                 {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.Build.0 = Release|Win32
-                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.ActiveCfg = Debug|x64
-                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.Build.0 = Debug|x64
-                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.ActiveCfg = Debug|x86
-                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.Build.0 = Debug|x86
+                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.Build.0 = Debug|Any CPU
+                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.Build.0 = Debug|Any CPU
                 {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.ActiveCfg = Release|Any CPU
                 {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.Build.0 = Release|Any CPU
                 {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x86.ActiveCfg = Release|Any CPU
diff --git a/src/WixToolset.Mba.Core/Engine.cs b/src/WixToolset.Mba.Core/Engine.cs
index f2cc3947..408278ed 100644
--- a/src/WixToolset.Mba.Core/Engine.cs
+++ b/src/WixToolset.Mba.Core/Engine.cs
@@ -332,14 +332,14 @@ namespace WixToolset.Mba.Core
         internal sealed class Variables<T> : IVariables<T>
         {
             // .NET 2.0 does not support Func<T, TResult> or Action<T1, T2>.
-            internal delegate T Getter<T>(string name);
-            internal delegate void Setter<T>(string name, T value);
+            internal delegate T Getter(string name);
+            internal delegate void Setter(string name, T value);
 
-            private Getter<T> getter;
-            private Setter<T> setter;
+            private Getter getter;
+            private Setter setter;
             private Predicate<string> contains;
 
-            internal Variables(Getter<T> getter, Setter<T> setter, Predicate<string> contains)
+            internal Variables(Getter getter, Setter setter, Predicate<string> contains)
             {
                 this.getter = getter;
                 this.setter = setter;
diff --git a/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs b/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs
deleted file mode 100644
index 386748a8..00000000
--- a/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.Mba.Core.csproj b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index e88498ac..b05ea8b9 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -1,76 +1,29 @@
 <?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">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{E7E1841E-A58E-4901-B9CA-4845B807D45F}</ProjectGuid>
+    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
     <AssemblyName>WixToolset.Mba.Core</AssemblyName>
-    <OutputType>Library</OutputType>
     <RootNamespace>WixToolset.Mba.Core</RootNamespace>
-    <NoWarn>0693;1591</NoWarn>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <DebugType>embedded</DebugType>
     <Description>Managed Bootstrapper Application Core</Description>
+    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
   </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 Condition=" '$(UsingMicrosoftNETSdk)'!='true' and '$(CreateDocumentation)'!='false' ">
+    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
+
   <ItemGroup>
-    <Compile Include="BalUtil.cs" />
-    <Compile Include="BaseBootstrapperApplicationFactory.cs" />
-    <Compile Include="BootstrapperApplication.cs" />
-    <Compile Include="BootstrapperApplicationData.cs" />
-    <Compile Include="BootstrapperApplicationFactoryAttribute.cs" />
-    <Compile Include="BootstrapperCommand.cs" />
-    <Compile Include="BundleInfo.cs" />
-    <Compile Include="Engine.cs" />
-    <Compile Include="EventArgs.cs" />
-    <Compile Include="IBootstrapperApplication.cs" />
-    <Compile Include="IBootstrapperApplicationData.cs" />
-    <Compile Include="IBootstrapperApplicationFactory.cs" />
-    <Compile Include="IBootstrapperCommand.cs" />
-    <Compile Include="IBootstrapperEngine.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" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-
-  <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">
+  <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
     <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>
+      <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+      <NuspecProperties>Configuration=$(Configuration);Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
     </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
index c7f4a97d..4f3a2744 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -5,17 +5,23 @@
     <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>
+    <license type="expression">MS-RL</license>
     <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <copyright>$copyright$</copyright>
+
+    <dependencies>
+      <group>
+        <dependency id="runtime.win.WixToolset.Mba.Core" version="$version$" />
+      </group>
+      <group targetFramework=".NETFramework2.0" />
+      <group targetFramework=".NETStandard2.0" />
+    </dependencies>
   </metadata>
 
   <files>
-    <file src="build\net20\$id$.props" target="build\net20" />
-    <file src="..\..\build\$configuration$\v141\x86\mbanative.dll" target="build\net20\x86" />
-    <file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />
+    <file src="net20\$id$.dll" target="lib\net20" />
+    <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
   </files>
 </package>
diff --git a/src/WixToolset.Mba.Core/build/net20/WixToolset.Mba.Core.props b/src/WixToolset.Mba.Core/build/net20/WixToolset.Mba.Core.props
deleted file mode 100644
index c0018e0d..00000000
--- a/src/WixToolset.Mba.Core/build/net20/WixToolset.Mba.Core.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-  <PropertyGroup>
-    <WixToolsetMbaNativePath Condition=" '$(WixToolsetMbaNativePath)' == '' ">$(MSBuildThisFileDirectory)x86\mbanative.dll</WixToolsetMbaNativePath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="$(WixToolsetMbaNativePath)" CopyToOutputDirectory="Always" />
-  </ItemGroup>
-</Project>
diff --git a/src/WixToolset.Mba.Core/packages.config b/src/WixToolset.Mba.Core/packages.config
deleted file mode 100644
index 03e866cf..00000000
--- a/src/WixToolset.Mba.Core/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index f86c7fef..0a740a9f 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.vcxproj
@@ -31,12 +31,17 @@
     <CharacterSet>Unicode</CharacterSet>
     <TargetName>mbanative</TargetName>
     <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
+    <Description>Native component of WixToolset.Mba.Core</Description>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="..\NativeMultiTargeting.Build.props" />
 
+  <ImportGroup Label="Shared">
+    <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+  </ImportGroup>
+
   <PropertyGroup>
     <ProjectAdditionalIncludeDirectories>..\balutil\inc</ProjectAdditionalIncludeDirectories>
     <ProjectAdditionalLinkLibraries>balutil.lib</ProjectAdditionalLinkLibraries>
@@ -63,8 +68,11 @@
     <ProjectReference Include="..\balutil\balutil.vcxproj" />
   </ItemGroup>
 
+  <Target Name="Pack" DependsOnTargets="GetBuildVersion">
+    <Exec Command='nuget pack runtime.win.WixToolset.Mba.Core.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Mba.Core;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' />
+  </Target>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <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>
diff --git a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
new file mode 100644
index 00000000..a8546092
--- /dev/null
+++ b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
@@ -0,0 +1,19 @@
+<?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>
+    <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+  </metadata>
+
+  <files>
+    <file src="v141\x86\mbanative.dll" target="runtimes\win-x86\native" />
+    <file src="v141\x86\mbanative.pdb" target="runtimes\win-x86\native" />
+  </files>
+</package>
diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index 9959e261..8691f89f 100644
--- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
-    <Platforms>AnyCPU;x86;x64</Platforms>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
   </PropertyGroup>
 
   <PropertyGroup>