WIXFEAT:3815 - Create WixBAFactory to address changes in BootstrapperCore.
Sean Hall committed
Feb 15, 2019 at 19:12 UTC
22263a6a6ca49222d9c46acf8e99a68ffc699a54
6 files changed
+26
-5
src/WixToolset.WixBA/Properties/AssemblyInfo.cs
+2
-2
@@ -17,6 +17,6 @@ using WixToolset.WixBA;
17
[assembly: Guid("0ffc4944-9295-40b7-adac-3a6864b5219b")]
18
[assembly: CLSCompliantAttribute(true)]
19
20
-// Identifies the class that derives from BootstrapperApplication and is the BA class that gets
20
+// Identifies the class that derives from IBootstrapperApplicationFactory and is the BAFactory class that gets
21
// instantiated by the interop layer
22
-[assembly: BootstrapperApplication(typeof(WixBA))]
22
+[assembly: BootstrapperApplicationFactory(typeof(WixBAFactory))]
src/WixToolset.WixBA/WixBA.cs
+6
@@ -19,6 +19,12 @@ namespace WixToolset.WixBA
19
/// </summary>
20
public class WixBA : BootstrapperApplication
21
{
22
+ public WixBA(Engine engine, Command command)
23
+ : base(engine, command)
24
+ {
25
+
26
+ }
27
+
28
/// <summary>
29
/// Gets the global model.
30
/// </summary>
src/WixToolset.WixBA/WixBAFactory.cs
new
+14
@@ -0,0 +1,14 @@
1
+// 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.
2
+
3
+namespace WixToolset.WixBA
4
+{
5
+ using WixToolset.BootstrapperCore;
6
+
7
+ public class WixBAFactory : BaseBootstrapperApplicationFactory
8
+ {
9
+ protected override IBootstrapperApplication Create(Engine engine, ref Command command)
10
+ {
11
+ return new WixBA(engine, command);
12
+ }
13
+ }
14
+}
src/WixToolset.WixBA/WixDistribution.cs
+1
-1
@@ -41,7 +41,7 @@ namespace WixToolset
41
/// <summary>
42
/// Telemetry URL format for the distribution.
43
/// </summary>
44
- public static string TelemetryUrlFormat = "http://wixtoolset.org/telemetry/v{0}/?r={1}";
44
+ public static string TelemetryUrlFormat = "http://wixtoolset.org/integrationtelemetry/v{0}/?r={1}";
45
46
/// <summary>
47
/// VS Extensions Landing page Url for the distribution.
src/WixToolset.WixBA/WixToolset.WixBA.csproj
+2
-1
@@ -16,6 +16,7 @@
16
<Compile Include="ProgressViewModel.cs" />
17
<Compile Include="RelayCommand.cs" />
18
<Compile Include="InstallationViewModel.cs" />
19
+ <Compile Include="WixBAFactory.cs" />
20
<Compile Include="WixDistribution.cs" />
21
<Page Include="Styles.xaml">
22
<Generator>MSBuild:Compile</Generator>
@@ -56,7 +57,7 @@
57
<Reference Include="System.Xaml" />
58
<Reference Include="WindowsBase" />
59
<Reference Include="WixToolset.BootstrapperCore">
59
- <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.3\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
60
+ <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.4\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
61
</Reference>
62
</ItemGroup>
63
<ItemGroup>
src/WixToolset.WixBA/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="net45" />
4
+ <package id="WixToolset.BootstrapperCore" version="4.0.4" targetFramework="net45" />
5
</packages>
\ No newline at end of file