Integrate Extensibility.Data namespace change

4 files changed, 16 insertions, 20 deletions

diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs
index 02b33522..33842e44 100644
--- a/src/WixToolset.BuildTasks/DoIt.cs
+++ b/src/WixToolset.BuildTasks/DoIt.cs
@@ -10,6 +10,7 @@ namespace WixToolset.BuildTasks
     using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     /// <summary>
@@ -168,13 +169,10 @@ namespace WixToolset.BuildTasks
             var arguments = serviceProvider.GetService<ICommandLineArguments>();
             arguments.Populate(commandLineString);
 
-            var context = serviceProvider.GetService<ICommandLineContext>();
-            context.Messaging = messaging;
-            context.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
-            context.Arguments = arguments;
-
-            var commandLine = serviceProvider.GetService<ICommandLine>();
-            var command = commandLine.ParseStandardCommandLine(context);
+            var commandLine = serviceProvider.GetService<ICommandLineParser>();
+            commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
+            commandLine.Arguments = arguments;
+            var command = commandLine.ParseStandardCommandLine();
             command?.Execute();
         }
 
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index ec16f8b1..8a5c388d 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -40,12 +40,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' " />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
     <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 5ec5b7fd..99da83cd 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -7,7 +7,7 @@
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 </Project>
diff --git a/src/wix/Program.cs b/src/wix/Program.cs
index 134900e9..2a092ffc 100644
--- a/src/wix/Program.cs
+++ b/src/wix/Program.cs
@@ -9,6 +9,7 @@ namespace WixToolset.Tools
     using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     /// <summary>
@@ -46,13 +47,10 @@ namespace WixToolset.Tools
             var arguments = serviceProvider.GetService<ICommandLineArguments>();
             arguments.Populate(args);
 
-            var context = serviceProvider.GetService<ICommandLineContext>();
-            context.Messaging = messaging;
-            context.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
-            context.Arguments = arguments;
-
-            var commandLine = serviceProvider.GetService<ICommandLine>();
-            var command = commandLine.ParseStandardCommandLine(context);
+            var commandLine = serviceProvider.GetService<ICommandLineParser>();
+            commandLine.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
+            commandLine.Arguments = arguments;
+            var command = commandLine.ParseStandardCommandLine();
             return command?.Execute() ?? 1;
         }