Move the entry point from Mba.Core to Mba.Host.

9 files changed, 1 insertions, 452 deletions

diff --git a/src/WixToolset.Mba.Core/BootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Core/BootstrapperApplicationFactory.cs
deleted file mode 100644
index 55f0e83b..00000000
--- a/src/WixToolset.Mba.Core/BootstrapperApplicationFactory.cs
+++ /dev/null
@@ -1,84 +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.
-
-namespace WixToolset.Mba.Core
-{
-    using System;
-    using System.Configuration;
-    using System.Reflection;
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// Entry point for the MBA host to create and return the BA to the engine.
-    /// </summary>
-    [ClassInterface(ClassInterfaceType.None)]
-    public sealed class BootstrapperApplicationFactory : MarshalByRefObject, IBootstrapperApplicationFactory
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="BootstrapperApplicationFactory"/> class.
-        /// </summary>
-        public BootstrapperApplicationFactory()
-        {
-        }
-
-        /// <summary>
-        /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method.
-        /// </summary>
-        /// <param name="pArgs">Pointer to BOOTSTRAPPER_CREATE_ARGS struct.</param>
-        /// <param name="pResults">Pointer to BOOTSTRAPPER_CREATE_RESULTS struct.</param>
-        /// <exception cref="MissingAttributeException">The bootstrapper application assembly
-        /// does not define the <see cref="BootstrapperApplicationFactoryAttribute"/>.</exception>
-        public void Create(IntPtr pArgs, IntPtr pResults)
-        {
-            // Get the wix.boostrapper section group to get the name of the bootstrapper application assembly to host.
-            var section = ConfigurationManager.GetSection("wix.bootstrapper/host") as HostSection;
-            if (null == section)
-            {
-                throw new MissingAttributeException(); // TODO: throw a more specific exception than this.
-            }
-
-            // Load the BA's IBootstrapperApplicationFactory.
-            var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(section.AssemblyName);
-            var baFactory = (IBootstrapperApplicationFactory)Activator.CreateInstance(baFactoryType);
-            if (null == baFactory)
-            {
-                throw new InvalidBootstrapperApplicationFactoryException();
-            }
-
-            baFactory.Create(pArgs, pResults);
-        }
-
-        /// <summary>
-        /// Locates the <see cref="BootstrapperApplicationFactoryAttribute"/> and returns the specified type.
-        /// </summary>
-        /// <param name="assemblyName">The assembly that defines the IBootstrapperApplicationFactory implementation.</param>
-        /// <returns>The bootstrapper application factory <see cref="Type"/>.</returns>
-        private static Type GetBAFactoryTypeFromAssembly(string assemblyName)
-        {
-            Type baFactoryType = null;
-
-            // Load the requested assembly.
-            Assembly asm = AppDomain.CurrentDomain.Load(assemblyName);
-
-            // If an assembly was loaded and is not the current assembly, check for the required attribute.
-            // This is done to avoid using the BootstrapperApplicationFactoryAttribute which we use at build time
-            // to specify the BootstrapperApplicationFactory assembly in the manifest.
-            if (!Assembly.GetExecutingAssembly().Equals(asm))
-            {
-                // There must be one and only one BootstrapperApplicationFactoryAttribute.
-                // The attribute prevents multiple declarations already.
-                var attrs = (BootstrapperApplicationFactoryAttribute[])asm.GetCustomAttributes(typeof(BootstrapperApplicationFactoryAttribute), false);
-                if (null != attrs)
-                {
-                    baFactoryType = attrs[0].BootstrapperApplicationFactoryType;
-                }
-            }
-
-            if (null == baFactoryType)
-            {
-                throw new MissingAttributeException();
-            }
-
-            return baFactoryType;
-        }
-    }
-}
diff --git a/src/WixToolset.Mba.Core/BootstrapperSectionGroup.cs b/src/WixToolset.Mba.Core/BootstrapperSectionGroup.cs
deleted file mode 100644
index f307e53e..00000000
--- a/src/WixToolset.Mba.Core/BootstrapperSectionGroup.cs
+++ /dev/null
@@ -1,29 +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.
-
-namespace WixToolset.Mba.Core
-{
-    using System;
-    using System.Configuration;
-
-    /// <summary>
-    /// Handler for the wix.bootstrapper configuration section group.
-    /// </summary>
-    public class BootstrapperSectionGroup : ConfigurationSectionGroup
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="BootstrapperSectionGroup"/> class.
-        /// </summary>
-        public BootstrapperSectionGroup()
-        {
-        }
-
-        /// <summary>
-        /// Gets the <see cref="HostSection"/> handler for the mba configuration section.
-        /// </summary>
-        [ConfigurationProperty("host")]
-        public HostSection Host
-        {
-            get { return (HostSection)base.Sections["host"]; }
-        }
-    }
-}
diff --git a/src/WixToolset.Mba.Core/Exceptions.cs b/src/WixToolset.Mba.Core/Exceptions.cs
deleted file mode 100644
index 72669a42..00000000
--- a/src/WixToolset.Mba.Core/Exceptions.cs
+++ /dev/null
@@ -1,145 +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.
-
-namespace WixToolset.Mba.Core
-{
-    using System;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// Base class for exception returned to the bootstrapper application host.
-    /// </summary>
-    [Serializable]
-    public abstract class BootstrapperException : Exception
-    {
-        /// <summary>
-        /// Creates an instance of the <see cref="BootstrapperException"/> base class with the given HRESULT.
-        /// </summary>
-        /// <param name="hr">The HRESULT for the exception that is used by the bootstrapper application host.</param>
-        public BootstrapperException(int hr)
-        {
-            this.HResult = hr;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BootstrapperException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message.</param>
-        public BootstrapperException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BootstrapperException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        /// <param name="innerException">Inner exception associated with this one</param>
-        public BootstrapperException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BootstrapperException"/> class.
-        /// </summary>
-        /// <param name="info">Serialization information for this exception</param>
-        /// <param name="context">Streaming context to serialize to</param>
-        protected BootstrapperException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-
-    /// <summary>
-    /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the
-    /// <see cref="BootstrapperApplicationFactoryAttribute"/> class.
-    /// </summary>
-    /// <seealso cref="BootstrapperApplicationFactoryAttribute"/>
-    [Serializable]
-    public class MissingAttributeException : BootstrapperException
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        public MissingAttributeException()
-            : base(NativeMethods.E_NOTFOUND)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message.</param>
-        public MissingAttributeException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        /// <param name="innerException">Inner exception associated with this one</param>
-        public MissingAttributeException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        /// <param name="info">Serialization information for this exception</param>
-        /// <param name="context">Streaming context to serialize to</param>
-        protected MissingAttributeException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-
-    /// <summary>
-    /// The bootstrapper application factory specified by the <see cref="BootstrapperApplicationFactoryAttribute"/>
-    ///  does not extend the <see cref="IBootstrapperApplicationFactory"/> base class.
-    /// </summary>
-    /// <seealso cref="BaseBootstrapperApplicationFactory"/>
-    /// <seealso cref="BootstrapperApplicationFactoryAttribute"/>
-    [Serializable]
-    public class InvalidBootstrapperApplicationFactoryException : BootstrapperException
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        public InvalidBootstrapperApplicationFactoryException()
-            : base(NativeMethods.E_UNEXPECTED)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message.</param>
-        public InvalidBootstrapperApplicationFactoryException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        /// <param name="innerException">Inner exception associated with this one</param>
-        public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        /// <param name="info">Serialization information for this exception</param>
-        /// <param name="context">Streaming context to serialize to</param>
-        protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-}
diff --git a/src/WixToolset.Mba.Core/HostSection.cs b/src/WixToolset.Mba.Core/HostSection.cs
deleted file mode 100644
index 2586f565..00000000
--- a/src/WixToolset.Mba.Core/HostSection.cs
+++ /dev/null
@@ -1,47 +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.
-
-namespace WixToolset.Mba.Core
-{
-    using System;
-    using System.Configuration;
-
-    /// <summary>
-    /// Handler for the Host configuration section.
-    /// </summary>
-    public sealed class HostSection : ConfigurationSection
-    {
-        private static readonly ConfigurationProperty assemblyNameProperty = new ConfigurationProperty("assemblyName", typeof(string), null, ConfigurationPropertyOptions.IsRequired);
-        private static readonly ConfigurationProperty supportedFrameworksProperty = new ConfigurationProperty("", typeof(SupportedFrameworkElementCollection), null, ConfigurationPropertyOptions.IsDefaultCollection);
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="HostSection"/> class.
-        /// </summary>
-        public HostSection()
-        {
-        }
-
-        /// <summary>
-        /// Gets the name of the assembly that contians the <see cref="BootstrapperApplication"/> child class.
-        /// </summary>
-        /// <remarks>
-        /// The assembly specified by this name must contain the <see cref="BootstrapperApplicationFactoryAttribute"/> to identify
-        /// the type of the <see cref="BootstrapperApplication"/> child class.
-        /// </remarks>
-        [ConfigurationProperty("assemblyName", IsRequired = true)]
-        public string AssemblyName
-        {
-            get { return (string)base[assemblyNameProperty]; }
-            set { base[assemblyNameProperty] = value; }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="SupportedFrameworkElementCollection"/> of supported frameworks for the host configuration.
-        /// </summary>
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        [ConfigurationCollection(typeof(SupportedFrameworkElement))]
-        public SupportedFrameworkElementCollection SupportedFrameworks
-        {
-            get { return (SupportedFrameworkElementCollection)base[supportedFrameworksProperty]; }
-        }
-    }
-}
diff --git a/src/WixToolset.Mba.Core/SupportedFrameworkElement.cs b/src/WixToolset.Mba.Core/SupportedFrameworkElement.cs
deleted file mode 100644
index 7eae8bbf..00000000
--- a/src/WixToolset.Mba.Core/SupportedFrameworkElement.cs
+++ /dev/null
@@ -1,47 +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.
-
-namespace WixToolset.Mba.Core
-{
-    using System;
-    using System.Configuration;
-
-    /// <summary>
-    /// Handler for the supportedFramework configuration section.
-    /// </summary>
-    public sealed class SupportedFrameworkElement : ConfigurationElement
-    {
-        private static readonly ConfigurationProperty versionProperty = new ConfigurationProperty("version", typeof(string), null, ConfigurationPropertyOptions.IsRequired);
-        private static readonly ConfigurationProperty runtimeVersionProperty = new ConfigurationProperty("runtimeVersion", typeof(string));
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="SupportedFrameworkElement"/> class.
-        /// </summary>
-        public SupportedFrameworkElement()
-        {
-        }
-
-        /// <summary>
-        /// Gets the version of the supported framework.
-        /// </summary>
-        /// <remarks>
-        /// The assembly specified by this name must contain a value matching the NETFX version registry key under
-        /// "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP".
-        /// </remarks>
-        [ConfigurationProperty("version", IsRequired = true)]
-        public string Version
-        {
-            get { return (string)base[versionProperty]; }
-            set { base[versionProperty] = value; }
-        }
-
-        /// <summary>
-        /// Gets the runtime version required by this supported framework.
-        /// </summary>
-        [ConfigurationProperty("runtimeVersion", IsRequired = false)]
-        public string RuntimeVersion
-        {
-            get { return (string)base[runtimeVersionProperty]; }
-            set { base[runtimeVersionProperty] = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Mba.Core/SupportedFrameworkElementCollection.cs b/src/WixToolset.Mba.Core/SupportedFrameworkElementCollection.cs
deleted file mode 100644
index 88a9b4dd..00000000
--- a/src/WixToolset.Mba.Core/SupportedFrameworkElementCollection.cs
+++ /dev/null
@@ -1,36 +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.
-
-namespace WixToolset.Mba.Core
-{
-    using System;
-    using System.Configuration;
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// Handler for the supportedFramework collection.
-    /// </summary>
-    [SuppressMessage("Microsoft.Design", "CA1010:CollectionsShouldImplementGenericInterface")]
-    [ConfigurationCollection(typeof(SupportedFrameworkElement), AddItemName = "supportedFramework", CollectionType = ConfigurationElementCollectionType.BasicMap)]
-    public sealed class SupportedFrameworkElementCollection : ConfigurationElementCollection
-    {
-        public override ConfigurationElementCollectionType CollectionType
-        {
-            get { return ConfigurationElementCollectionType.BasicMap; }
-        }
-
-        protected override string ElementName
-        {
-            get { return "supportedFramework"; }
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new SupportedFrameworkElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return (element as SupportedFrameworkElement).Version;
-        }
-    }
-}
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config
deleted file mode 100644
index 81b49347..00000000
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config
+++ /dev/null
@@ -1,26 +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. -->
-
-
-<configuration>
-    <configSections>
-        <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Core.BootstrapperSectionGroup, WixToolset.Mba.Core">
-            <section name="host" type="WixToolset.Mba.Core.HostSection, WixToolset.Mba.Core" />
-        </sectionGroup>
-    </configSections>
-    <startup useLegacyV2RuntimeActivationPolicy="true">
-        <supportedRuntime version="v4.0" />
-        <supportedRuntime version="v2.0.50727" />
-    </startup>
-    <wix.bootstrapper>
-        <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. -->
-        <!--
-        <supportedFramework version="v4\Client" />
-        <supportedFramework version="v3.5" />
-        <supportedFramework version="v3.0" />
-        -->
-
-        <!-- Example only. Replace the host/@assemblyName attribute with assembly that implements IBootstrapperApplicationFactory. -->
-        <host assemblyName="AssemblyWithClassThatInheritsFromBootstrapperApplicationFactory" />
-    </wix.bootstrapper>
-</configuration>
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index 4b14a545..e88498ac 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -10,7 +10,7 @@
     <RootNamespace>WixToolset.Mba.Core</RootNamespace>
     <NoWarn>0693;1591</NoWarn>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <Description>Managed Bootstrapper Application entry point</Description>
+    <Description>Managed Bootstrapper Application Core</Description>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
@@ -27,15 +27,11 @@
     <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="IBootstrapperApplication.cs" />
     <Compile Include="IBootstrapperApplicationData.cs" />
     <Compile Include="IBootstrapperApplicationFactory.cs" />
@@ -49,13 +45,6 @@
     <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" />
@@ -66,33 +55,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </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>
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
index bbac204f..d773bcf9 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -14,10 +14,8 @@
   </metadata>
 
   <files>
-    <file src="..\..\build\$configuration$\$id$.config" target="samples" />
     <file src="build\net20\$id$.props" target="build\net20" />
     <file src="..\..\build\$configuration$\v141_xp\x86\mbanative.dll" target="build\net20\x86" />
-    <file src="..\..\build\$configuration$\$id$.h" target="build\native\include" />
     <file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />
   </files>
 </package>