Integrate Extensibility.Data namespace change
Rob Mensching committed
Jul 23, 2018 at 14:42 UTC
54225eca5faab731a209303f56c0149492852167
4 files changed
+16
-20
src/WixToolset.BuildTasks/DoIt.cs
+5
-7
@@ -10,6 +10,7 @@ namespace WixToolset.BuildTasks
10
using WixToolset.Core;
11
using WixToolset.Data;
12
using WixToolset.Extensibility;
13
+ using WixToolset.Extensibility.Data;
14
using WixToolset.Extensibility.Services;
15
16
/// <summary>
@@ -168,13 +169,10 @@ namespace WixToolset.BuildTasks
169
var arguments = serviceProvider.GetService<ICommandLineArguments>();
170
arguments.Populate(commandLineString);
171
171
- var context = serviceProvider.GetService<ICommandLineContext>();
172
- context.Messaging = messaging;
173
- context.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
174
- context.Arguments = arguments;
175
-
176
- var commandLine = serviceProvider.GetService<ICommandLine>();
177
- var command = commandLine.ParseStandardCommandLine(context);
172
+ var commandLine = serviceProvider.GetService<ICommandLineParser>();
173
+ commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
174
+ commandLine.Arguments = arguments;
175
+ var command = commandLine.ParseStandardCommandLine();
176
command?.Execute();
177
}
178
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+2
-2
@@ -40,12 +40,12 @@
40
41
<ItemGroup>
42
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' " />
43
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
43
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
44
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
45
</ItemGroup>
46
47
<ItemGroup>
48
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
48
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
49
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
50
</ItemGroup>
51
</Project>
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+4
-4
@@ -7,7 +7,7 @@
7
<IsPackable>false</IsPackable>
8
<DebugType>embedded</DebugType>
9
</PropertyGroup>
10
-
10
+
11
<ItemGroup>
12
<Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
13
<Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
@@ -25,8 +25,8 @@
25
</ItemGroup>
26
27
<ItemGroup>
28
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
29
- <PackageReference Include="xunit" Version="2.3.1" />
30
- <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
28
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
29
+ <PackageReference Include="xunit" Version="2.4.0" />
30
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
31
</ItemGroup>
32
</Project>
src/wix/Program.cs
+5
-7
@@ -9,6 +9,7 @@ namespace WixToolset.Tools
9
using WixToolset.Core;
10
using WixToolset.Data;
11
using WixToolset.Extensibility;
12
+ using WixToolset.Extensibility.Data;
13
using WixToolset.Extensibility.Services;
14
15
/// <summary>
@@ -46,13 +47,10 @@ namespace WixToolset.Tools
47
var arguments = serviceProvider.GetService<ICommandLineArguments>();
48
arguments.Populate(args);
49
49
- var context = serviceProvider.GetService<ICommandLineContext>();
50
- context.Messaging = messaging;
51
- context.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
52
- context.Arguments = arguments;
53
-
54
- var commandLine = serviceProvider.GetService<ICommandLine>();
55
- var command = commandLine.ParseStandardCommandLine(context);
50
+ var commandLine = serviceProvider.GetService<ICommandLineParser>();
51
+ commandLine.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
52
+ commandLine.Arguments = arguments;
53
+ var command = commandLine.ParseStandardCommandLine();
54
return command?.Execute() ?? 1;
55
}
56