Move the BootstrapperApplication out of proc

8 files changed, 148 insertions, 170 deletions

diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
index 5229f278..5e9fb936 100644
--- a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
+++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
@@ -13,11 +13,11 @@ namespace WixToolset.Bal
         WixBalCondition,
         WixBalPackageInfo,
         WixDncOptions,
-        WixMbaPrereqInformation,
+        WixPrereqInformation,
         WixStdbaCommandLine,
         WixStdbaOptions,
         WixStdbaOverridableVariable,
-        WixMbaPrereqOptions,
+        WixPrereqOptions,
         WixBalBootstrapperApplication,
     }
 
@@ -37,8 +37,10 @@ namespace WixToolset.Bal
         {
             switch (type)
             {
+#pragma warning disable 0612 // obsolete
                 case BalSymbolDefinitionType.WixBalBAFactoryAssembly:
                     return BalSymbolDefinitions.WixBalBAFactoryAssembly;
+#pragma warning restore 0612
 
                 case BalSymbolDefinitionType.WixBalBAFunctions:
                     return BalSymbolDefinitions.WixBalBAFunctions;
@@ -49,11 +51,8 @@ namespace WixToolset.Bal
                 case BalSymbolDefinitionType.WixBalPackageInfo:
                     return BalSymbolDefinitions.WixBalPackageInfo;
 
-                case BalSymbolDefinitionType.WixDncOptions:
-                    return BalSymbolDefinitions.WixDncOptions;
-
-                case BalSymbolDefinitionType.WixMbaPrereqInformation:
-                    return BalSymbolDefinitions.WixMbaPrereqInformation;
+                case BalSymbolDefinitionType.WixPrereqInformation:
+                    return BalSymbolDefinitions.WixPrereqInformation;
 
                 case BalSymbolDefinitionType.WixStdbaCommandLine:
                     return BalSymbolDefinitions.WixStdbaCommandLine;
@@ -64,8 +63,8 @@ namespace WixToolset.Bal
                 case BalSymbolDefinitionType.WixStdbaOverridableVariable:
                     return BalSymbolDefinitions.WixStdbaOverridableVariable;
 
-                case BalSymbolDefinitionType.WixMbaPrereqOptions:
-                    return BalSymbolDefinitions.WixMbaPrereqOptions;
+                case BalSymbolDefinitionType.WixPrereqOptions:
+                    return BalSymbolDefinitions.WixPrereqOptions;
 
                 case BalSymbolDefinitionType.WixBalBootstrapperApplication:
                     return BalSymbolDefinitions.WixBalBootstrapperApplication;
@@ -77,16 +76,17 @@ namespace WixToolset.Bal
 
         static BalSymbolDefinitions()
         {
+#pragma warning disable 0612 // obsolete
             WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+#pragma warning restore 0612
             WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
             WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
             WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
-            WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
-            WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
             WixStdbaCommandLine.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
             WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
             WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
-            WixMbaPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
         }
     }
 }
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
index 52042e4c..3ce535a3 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
@@ -2,11 +2,13 @@
 
 namespace WixToolset.Bal
 {
+    using System;
     using WixToolset.Data;
     using WixToolset.Bal.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
+        [Obsolete]
         public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition(
             BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(),
             new[]
@@ -20,14 +22,17 @@ namespace WixToolset.Bal
 
 namespace WixToolset.Bal.Symbols
 {
+    using System;
     using WixToolset.Data;
 
+    [Obsolete]
     public enum WixBalBAFactorySymbolFields
     {
         PayloadId,
         FilePath,
     }
 
+    [Obsolete]
     public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol
     {
         public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null)
@@ -52,4 +57,4 @@ namespace WixToolset.Bal.Symbols
             set => this.Set((int)WixBalBAFactorySymbolFields.FilePath, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
index 7096930d..47e930c2 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
@@ -19,15 +19,19 @@ namespace WixToolset.Bal
 
 namespace WixToolset.Bal.Symbols
 {
+    using System;
     using WixToolset.Data;
 
     public enum WixBalBootstrapperApplicationType
     {
         Unknown,
         Standard,
+        [Obsolete]
         ManagedHost,
+        [Obsolete]
         DotNetCoreHost,
         InternalUi,
+        Prerequisite,
     }
 
     public enum WixBalBootstrapperApplicationSymbolFields
diff --git a/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs
deleted file mode 100644
index b9a41c21..00000000
--- a/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.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.Bal
-{
-    using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
-
-    public static partial class BalSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition(
-            BalSymbolDefinitionType.WixDncOptions.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number),
-            },
-            typeof(WixDncOptionsSymbol));
-    }
-}
-
-namespace WixToolset.Bal.Symbols
-{
-    using WixToolset.Data;
-
-    public enum WixDncOptionsSymbolFields
-    {
-        SelfContainedDeployment,
-    }
-
-    public class WixDncOptionsSymbol : IntermediateSymbol
-    {
-        public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null)
-        {
-        }
-
-        public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index];
-
-        public int SelfContainedDeployment
-        {
-            get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber();
-            set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs
deleted file mode 100644
index e4d78da0..00000000
--- a/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs
+++ /dev/null
@@ -1,63 +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.Bal
-{
-    using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
-
-    public static partial class BalSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition(
-            BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String),
-            },
-            typeof(WixMbaPrereqInformationSymbol));
-    }
-}
-
-namespace WixToolset.Bal.Symbols
-{
-    using WixToolset.Data;
-
-    public enum WixMbaPrereqInformationSymbolFields
-    {
-        PackageId,
-        LicenseFile,
-        LicenseUrl,
-    }
-
-    public class WixMbaPrereqInformationSymbol : IntermediateSymbol
-    {
-        public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null)
-        {
-        }
-
-        public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index];
-
-        public string PackageId
-        {
-            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString();
-            set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value);
-        }
-
-        public string LicenseFile
-        {
-            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString();
-            set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value);
-        }
-
-        public string LicenseUrl
-        {
-            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString();
-            set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs
deleted file mode 100644
index 66374579..00000000
--- a/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.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.Bal
-{
-    using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
-
-    public static partial class BalSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixMbaPrereqOptions = new IntermediateSymbolDefinition(
-            BalSymbolDefinitionType.WixMbaPrereqOptions.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs), IntermediateFieldType.Number),
-            },
-            typeof(WixMbaPrereqOptionsSymbol));
-    }
-}
-
-namespace WixToolset.Bal.Symbols
-{
-    using WixToolset.Data;
-
-    public enum WixMbaPrereqOptionsSymbolFields
-    {
-        AlwaysInstallPrereqs,
-    }
-
-    public class WixMbaPrereqOptionsSymbol : IntermediateSymbol
-    {
-        public WixMbaPrereqOptionsSymbol() : base(BalSymbolDefinitions.WixMbaPrereqOptions, null, null)
-        {
-        }
-
-        public WixMbaPrereqOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqOptions, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[WixMbaPrereqOptionsSymbolFields index] => this.Fields[(int)index];
-
-        public int AlwaysInstallPrereqs
-        {
-            get => this.Fields[(int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs].AsNumber();
-            set => this.Set((int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs, value);
-        }
-    }
-}
diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs
new file mode 100644
index 00000000..4b5e301e
--- /dev/null
+++ b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs
@@ -0,0 +1,63 @@
+// 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.Bal
+{
+    using WixToolset.Data;
+    using WixToolset.Bal.Symbols;
+
+    public static partial class BalSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixPrereqInformation = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixPrereqInformation.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String),
+            },
+            typeof(WixPrereqInformationSymbol));
+    }
+}
+
+namespace WixToolset.Bal.Symbols
+{
+    using WixToolset.Data;
+
+    public enum WixPrereqInformationSymbolFields
+    {
+        PackageId,
+        LicenseFile,
+        LicenseUrl,
+    }
+
+    public class WixPrereqInformationSymbol : IntermediateSymbol
+    {
+        public WixPrereqInformationSymbol() : base(BalSymbolDefinitions.WixPrereqInformation, null, null)
+        {
+        }
+
+        public WixPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixPrereqInformation, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPrereqInformationSymbolFields index] => this.Fields[(int)index];
+
+        public string PackageId
+        {
+            get => this.Fields[(int)WixPrereqInformationSymbolFields.PackageId].AsString();
+            set => this.Set((int)WixPrereqInformationSymbolFields.PackageId, value);
+        }
+
+        public string LicenseFile
+        {
+            get => this.Fields[(int)WixPrereqInformationSymbolFields.LicenseFile].AsString();
+            set => this.Set((int)WixPrereqInformationSymbolFields.LicenseFile, value);
+        }
+
+        public string LicenseUrl
+        {
+            get => this.Fields[(int)WixPrereqInformationSymbolFields.LicenseUrl].AsString();
+            set => this.Set((int)WixPrereqInformationSymbolFields.LicenseUrl, value);
+        }
+    }
+}
diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs
new file mode 100644
index 00000000..a351d7da
--- /dev/null
+++ b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs
@@ -0,0 +1,63 @@
+// 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.Bal
+{
+    using WixToolset.Data;
+    using WixToolset.Bal.Symbols;
+
+    public static partial class BalSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixPrereqOptions = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixPrereqOptions.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPrereqOptionsSymbolFields.Primary), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPrereqOptionsSymbolFields.HandleHelp), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPrereqOptionsSymbolFields.HandleLayout), IntermediateFieldType.Number),
+            },
+            typeof(WixPrereqOptionsSymbol));
+    }
+}
+
+namespace WixToolset.Bal.Symbols
+{
+    using WixToolset.Data;
+
+    public enum WixPrereqOptionsSymbolFields
+    {
+        Primary,
+        HandleHelp,
+        HandleLayout,
+    }
+
+    public class WixPrereqOptionsSymbol : IntermediateSymbol
+    {
+        public WixPrereqOptionsSymbol() : base(BalSymbolDefinitions.WixPrereqOptions, null, null)
+        {
+        }
+
+        public WixPrereqOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixPrereqOptions, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPrereqOptionsSymbolFields index] => this.Fields[(int)index];
+
+        public int Primary
+        {
+            get => this.Fields[(int)WixPrereqOptionsSymbolFields.Primary].AsNumber();
+            set => this.Set((int)WixPrereqOptionsSymbolFields.Primary, value);
+        }
+
+        public int? HandleHelp
+        {
+            get => (int?)this.Fields[(int)WixPrereqOptionsSymbolFields.HandleHelp];
+            set => this.Set((int)WixPrereqOptionsSymbolFields.HandleHelp, value);
+        }
+
+        public int? HandleLayout
+        {
+            get => (int?)this.Fields[(int)WixPrereqOptionsSymbolFields.HandleLayout];
+            set => this.Set((int)WixPrereqOptionsSymbolFields.HandleLayout, value);
+        }
+    }
+}