From 22263a6a6ca49222d9c46acf8e99a68ffc699a54 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 15 Feb 2019 19:12:01 -0600
Subject: WIXFEAT:3815 - Create WixBAFactory to address changes in
 BootstrapperCore.

---
 src/WixToolset.WixBA/Properties/AssemblyInfo.cs |  4 ++--
 src/WixToolset.WixBA/WixBA.cs                   |  6 ++++++
 src/WixToolset.WixBA/WixBAFactory.cs            | 14 ++++++++++++++
 src/WixToolset.WixBA/WixDistribution.cs         |  2 +-
 src/WixToolset.WixBA/WixToolset.WixBA.csproj    |  3 ++-
 src/WixToolset.WixBA/packages.config            |  2 +-
 6 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 src/WixToolset.WixBA/WixBAFactory.cs

diff --git a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs b/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
index 566bc9f2..9c40cc07 100644
--- a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
+++ b/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
@@ -17,6 +17,6 @@ using WixToolset.WixBA;
 [assembly: Guid("0ffc4944-9295-40b7-adac-3a6864b5219b")]
 [assembly: CLSCompliantAttribute(true)]
 
-// Identifies the class that derives from BootstrapperApplication and is the BA class that gets
+// Identifies the class that derives from IBootstrapperApplicationFactory and is the BAFactory class that gets
 // instantiated by the interop layer
-[assembly: BootstrapperApplication(typeof(WixBA))]
+[assembly: BootstrapperApplicationFactory(typeof(WixBAFactory))]
diff --git a/src/WixToolset.WixBA/WixBA.cs b/src/WixToolset.WixBA/WixBA.cs
index e0444f06..6b64b252 100644
--- a/src/WixToolset.WixBA/WixBA.cs
+++ b/src/WixToolset.WixBA/WixBA.cs
@@ -19,6 +19,12 @@ namespace WixToolset.WixBA
     /// </summary>
     public class WixBA : BootstrapperApplication
     {
+        public WixBA(Engine engine, Command command)
+            : base(engine, command)
+        {
+
+        }
+
         /// <summary>
         /// Gets the global model.
         /// </summary>
diff --git a/src/WixToolset.WixBA/WixBAFactory.cs b/src/WixToolset.WixBA/WixBAFactory.cs
new file mode 100644
index 00000000..66012521
--- /dev/null
+++ b/src/WixToolset.WixBA/WixBAFactory.cs
@@ -0,0 +1,14 @@
+// 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.WixBA
+{
+    using WixToolset.BootstrapperCore;
+
+    public class WixBAFactory : BaseBootstrapperApplicationFactory
+    {
+        protected override IBootstrapperApplication Create(Engine engine, ref Command command)
+        {
+            return new WixBA(engine, command);
+        }
+    }
+}
diff --git a/src/WixToolset.WixBA/WixDistribution.cs b/src/WixToolset.WixBA/WixDistribution.cs
index 6b7ed4f0..0d20e585 100644
--- a/src/WixToolset.WixBA/WixDistribution.cs
+++ b/src/WixToolset.WixBA/WixDistribution.cs
@@ -41,7 +41,7 @@ namespace WixToolset
         /// <summary>
         /// Telemetry URL format for the distribution.
         /// </summary>
-        public static string TelemetryUrlFormat = "http://wixtoolset.org/telemetry/v{0}/?r={1}";
+        public static string TelemetryUrlFormat = "http://wixtoolset.org/integrationtelemetry/v{0}/?r={1}";
 
         /// <summary>
         /// VS Extensions Landing page Url for the distribution.
diff --git a/src/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
index 4ce98a03..083d4e6e 100644
--- a/src/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -16,6 +16,7 @@
     <Compile Include="ProgressViewModel.cs" />
     <Compile Include="RelayCommand.cs" />
     <Compile Include="InstallationViewModel.cs" />
+    <Compile Include="WixBAFactory.cs" />
     <Compile Include="WixDistribution.cs" />
     <Page Include="Styles.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -56,7 +57,7 @@
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
     <Reference Include="WixToolset.BootstrapperCore">
-      <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.3\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
+      <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.4\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/WixToolset.WixBA/packages.config b/src/WixToolset.WixBA/packages.config
index e1757432..3ca82077 100644
--- a/src/WixToolset.WixBA/packages.config
+++ b/src/WixToolset.WixBA/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="net45" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb