unit tests for dotnet-cache invocation, some cleanup

2017-02-22 15:49:39 -08:00 · 2017-02-22 15:49:39 -08:00 · b85a2ec6f2
commit b85a2ec6f2
parent 3415a79940
10 changed files with 89 additions and 241 deletions
--- a/src/dotnet/commands/dotnet-cache/CacheCommand.cs
+++ b/src/dotnet/commands/dotnet-cache/CacheCommand.cs
@ -14,6 +14,8 @@ namespace Microsoft.DotNet.Tools.Cache
 {
    public partial class CacheCommand
    {
+        private string _msbuildPath;
+
        public string ProjectArgument { get; set; }
        public string Framework { get; set; }
        public string Runtime { get; set; }
@ -26,11 +28,12 @@ namespace Microsoft.DotNet.Tools.Cache

        public List<string> ExtraMSBuildArguments { get; set; }

-        private CacheCommand()
+        private CacheCommand(string msbuildPath = null)
        {
+            _msbuildPath = msbuildPath;
        }

-        public int Execute()
+        private MSBuildForwardingApp CreateForwardingApp(string msbuildPath)
        {
            var msbuildArgs = new List<string>();

@ -85,7 +88,7 @@ namespace Microsoft.DotNet.Tools.Cache

            msbuildArgs.AddRange(ExtraMSBuildArguments);

-            return new MSBuildForwardingApp(msbuildArgs).Execute();
+            return new MSBuildForwardingApp(msbuildArgs, msbuildPath);
        }
    }
 }
--- a/src/dotnet/commands/dotnet-cache/Program.cs
+++ b/src/dotnet/commands/dotnet-cache/Program.cs
@ -5,12 +5,14 @@ using System.Collections.Generic;
 using Microsoft.DotNet.Cli.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Tools.MSBuild;
+using Microsoft.DotNet.Cli;
+using System.Diagnostics;

 namespace Microsoft.DotNet.Tools.Cache
 {
    public partial class CacheCommand
    {
-        public static int Run(string[] args)
+        public static CacheCommand FromArgs(string[] args, string msbuildPath = null)
        {
            DebugHelper.HandleDebugSwitch(ref args);

@ -56,10 +58,11 @@ namespace Microsoft.DotNet.Tools.Cache

            CommandOption verbosityOption = MSBuildForwardingApp.AddVerbosityOption(app);

+            var cache = new CacheCommand(msbuildPath);
+            bool commandExecuted = false;
            app.OnExecute(() =>
            {
-                var cache = new CacheCommand();
-
+                commandExecuted = true;
                cache.Framework = frameworkOption.Value();
                cache.Runtime = runtimeOption.Value();
                cache.OutputPath = outputOption.Value();
@ -71,10 +74,43 @@ namespace Microsoft.DotNet.Tools.Cache
                cache.ExtraMSBuildArguments = app.RemainingArguments;
                cache.ProjectArgument = projectArgument.Value();
               
-                return cache.Execute();
+                return 0;
            });

-            return app.Execute(args);
+            int exitCode = app.Execute(args);
+            if (!commandExecuted)
+            {
+                throw new CommandCreationException(exitCode);
+            }
+
+            return cache;
+        }
+
+        public static int Run(string[] args)
+        {
+            DebugHelper.HandleDebugSwitch(ref args);
+
+            CacheCommand cmd;
+            try
+            {
+                cmd = FromArgs(args);
+            }
+            catch (CommandCreationException e)
+            {
+                return e.ExitCode;
+            }
+
+            return cmd.Execute();
+        }
+
+        public ProcessStartInfo GetProcessStartInfo()
+        {
+            return CreateForwardingApp(_msbuildPath).GetProcessStartInfo();
+        }
+
+        public int Execute()
+        {
+            return GetProcessStartInfo().Execute();
        }
    }
 }
--- a/test/dotnet-msbuild.Tests/GivenDotnetAddInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetAddInvocation.cs
@ -1,35 +0,0 @@
-using Microsoft.DotNet.Tools.Build;
-using FluentAssertions;
-using Xunit;
-using System;
-
-namespace Microsoft.DotNet.Cli.MSBuild.Tests
-{
-    public class GivenDotnetAddInvocation
-    {
-        [Theory(Skip = "finish me")]
-        [InlineData(new string[] { }, @"exec <msbuildpath> /m /v:m /t:Build /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "--output", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, @"exec <msbuildpath> /m /v:m /t:Build ""/p:OutputPath=foo1 foo2"" /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /clp:Summary")]
-        [InlineData(new string[] { "-f", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "--framework", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "-r", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "--runtime", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "-c", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--configuration", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"exec <msbuildpath> /m /v:m /t:Build /p:VersionSuffix=mysuffix /clp:Summary")]
-        [InlineData(new string[] { "--no-dependencies" }, @"exec <msbuildpath> /m /v:m /t:Build /p:BuildProjectReferences=false /clp:Summary")]
-        [InlineData(new string[] { "-v", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--verbosity", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag /clp:Summary")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedCommand)
-        {
-            var msbuildPath = "<msbuildpath>";
-            BuildCommand.FromArgs(args, msbuildPath)
-                .GetProcessStartInfo().Arguments.Should().Be(expectedCommand);
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/test/dotnet-msbuild.Tests/GivenDotnetCacheInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetCacheInvocation.cs
@ -1,35 +1,54 @@
-using Microsoft.DotNet.Tools.Build;
+using Microsoft.DotNet.Tools.Cache;
 using FluentAssertions;
 using Xunit;
 using System;
+using System.Linq;
+using System.IO;

 namespace Microsoft.DotNet.Cli.MSBuild.Tests
 {
    public class GivenDotnetCacheInvocation
    {
-        [Theory(Skip = "finish me")]
-        [InlineData(new string[] { }, @"exec <msbuildpath> /m /v:m /t:Build /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "--output", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, @"exec <msbuildpath> /m /v:m /t:Build ""/p:OutputPath=foo1 foo2"" /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /clp:Summary")]
-        [InlineData(new string[] { "-f", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "--framework", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "-r", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "--runtime", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "-c", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--configuration", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"exec <msbuildpath> /m /v:m /t:Build /p:VersionSuffix=mysuffix /clp:Summary")]
-        [InlineData(new string[] { "--no-dependencies" }, @"exec <msbuildpath> /m /v:m /t:Build /p:BuildProjectReferences=false /clp:Summary")]
-        [InlineData(new string[] { "-v", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--verbosity", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag /clp:Summary")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedCommand)
+        const string ExpectedPrefix = "exec <msbuildpath> /m /v:m /t:ComposeCache <project>";
+        static readonly string[] ArgsPrefix = { "-e", "<project>" };
+
+        [Theory]
+        [InlineData("-e")]
+        [InlineData("--entries")]
+        public void ItAddsProjectToMsbuildInvocation(string optionName)
        {
            var msbuildPath = "<msbuildpath>";
-            BuildCommand.FromArgs(args, msbuildPath)
-                .GetProcessStartInfo().Arguments.Should().Be(expectedCommand);
-            throw new NotImplementedException();
+            string[] args = new string[] { optionName, "<project>" };
+            CacheCommand.FromArgs(args, msbuildPath)
+                .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix}");
+        }
+
+        [Theory]
+        [InlineData(new string[] { "-f", "<framework>" }, @"/p:TargetFramework=<framework>")]
+        [InlineData(new string[] { "--framework", "<framework>" }, @"/p:TargetFramework=<framework>")]
+        [InlineData(new string[] { "-r", "<runtime>" }, @"/p:RuntimeIdentifier=<runtime>")]
+        [InlineData(new string[] { "--runtime", "<runtime>" }, @"/p:RuntimeIdentifier=<runtime>")]
+        public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
+        {
+            args = ArgsPrefix.Concat(args).ToArray();
+            expectedAdditionalArgs = (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}");
+
+            var msbuildPath = "<msbuildpath>";
+            CacheCommand.FromArgs(args, msbuildPath)
+                .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
+        }
+
+        [Theory]
+        [InlineData("-o")]
+        [InlineData("--output")]
+        public void ItAddsOutputPathToMsBuildInvocation(string optionName)
+        {
+            string path = "/some/path";
+            var args = ArgsPrefix.Concat(new string[] { optionName, path }).ToArray();
+
+            var msbuildPath = "<msbuildpath>";
+            CacheCommand.FromArgs(args, msbuildPath)
+                .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix} /p:ComposeDir={Path.GetFullPath(path)}");
        }
    }
 }
--- a/test/dotnet-msbuild.Tests/GivenDotnetListInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetListInvocation.cs
@ -1,35 +0,0 @@
-using Microsoft.DotNet.Tools.Build;
-using FluentAssertions;
-using Xunit;
-using System;
-
-namespace Microsoft.DotNet.Cli.MSBuild.Tests
-{
-    public class GivenDotnetListInvocation
-    {
-        [Theory(Skip = "finish me")]
-        [InlineData(new string[] { }, @"exec <msbuildpath> /m /v:m /t:Build /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "--output", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, @"exec <msbuildpath> /m /v:m /t:Build ""/p:OutputPath=foo1 foo2"" /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /clp:Summary")]
-        [InlineData(new string[] { "-f", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "--framework", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "-r", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "--runtime", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "-c", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--configuration", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"exec <msbuildpath> /m /v:m /t:Build /p:VersionSuffix=mysuffix /clp:Summary")]
-        [InlineData(new string[] { "--no-dependencies" }, @"exec <msbuildpath> /m /v:m /t:Build /p:BuildProjectReferences=false /clp:Summary")]
-        [InlineData(new string[] { "-v", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--verbosity", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag /clp:Summary")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedCommand)
-        {
-            var msbuildPath = "<msbuildpath>";
-            BuildCommand.FromArgs(args, msbuildPath)
-                .GetProcessStartInfo().Arguments.Should().Be(expectedCommand);
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/test/dotnet-msbuild.Tests/GivenDotnetMsbuildInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetMsbuildInvocation.cs
@ -1,35 +0,0 @@
-using Microsoft.DotNet.Tools.Build;
-using FluentAssertions;
-using Xunit;
-using System;
-
-namespace Microsoft.DotNet.Cli.MSBuild.Tests
-{
-    public class GivenDotnetMsbuildInvocation
-    {
-        [Theory(Skip = "finish me")]
-        [InlineData(new string[] { }, @"exec <msbuildpath> /m /v:m /t:Build /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "--output", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, @"exec <msbuildpath> /m /v:m /t:Build ""/p:OutputPath=foo1 foo2"" /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /clp:Summary")]
-        [InlineData(new string[] { "-f", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "--framework", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "-r", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "--runtime", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "-c", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--configuration", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"exec <msbuildpath> /m /v:m /t:Build /p:VersionSuffix=mysuffix /clp:Summary")]
-        [InlineData(new string[] { "--no-dependencies" }, @"exec <msbuildpath> /m /v:m /t:Build /p:BuildProjectReferences=false /clp:Summary")]
-        [InlineData(new string[] { "-v", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--verbosity", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag /clp:Summary")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedCommand)
-        {
-            var msbuildPath = "<msbuildpath>";
-            BuildCommand.FromArgs(args, msbuildPath)
-                .GetProcessStartInfo().Arguments.Should().Be(expectedCommand);
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/test/dotnet-msbuild.Tests/GivenDotnetRemoveInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetRemoveInvocation.cs
@ -1,35 +0,0 @@
-using Microsoft.DotNet.Tools.Build;
-using FluentAssertions;
-using Xunit;
-using System;
-
-namespace Microsoft.DotNet.Cli.MSBuild.Tests
-{
-    public class GivenDotnetRemoveInvocation
-    {
-        [Theory(Skip = "finish me")]
-        [InlineData(new string[] { }, @"exec <msbuildpath> /m /v:m /t:Build /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "--output", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, @"exec <msbuildpath> /m /v:m /t:Build ""/p:OutputPath=foo1 foo2"" /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /clp:Summary")]
-        [InlineData(new string[] { "-f", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "--framework", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "-r", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "--runtime", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "-c", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--configuration", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"exec <msbuildpath> /m /v:m /t:Build /p:VersionSuffix=mysuffix /clp:Summary")]
-        [InlineData(new string[] { "--no-dependencies" }, @"exec <msbuildpath> /m /v:m /t:Build /p:BuildProjectReferences=false /clp:Summary")]
-        [InlineData(new string[] { "-v", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--verbosity", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag /clp:Summary")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedCommand)
-        {
-            var msbuildPath = "<msbuildpath>";
-            BuildCommand.FromArgs(args, msbuildPath)
-                .GetProcessStartInfo().Arguments.Should().Be(expectedCommand);
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/test/dotnet-msbuild.Tests/GivenDotnetRunInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetRunInvocation.cs
@ -1,35 +0,0 @@
-using Microsoft.DotNet.Tools.Build;
-using FluentAssertions;
-using Xunit;
-using System;
-
-namespace Microsoft.DotNet.Cli.MSBuild.Tests
-{
-    public class GivenDotnetRunInvocation
-    {
-        [Theory(Skip = "finish me")]
-        [InlineData(new string[] { }, @"exec <msbuildpath> /m /v:m /t:Build /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "--output", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, @"exec <msbuildpath> /m /v:m /t:Build ""/p:OutputPath=foo1 foo2"" /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /clp:Summary")]
-        [InlineData(new string[] { "-f", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "--framework", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "-r", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "--runtime", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "-c", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--configuration", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"exec <msbuildpath> /m /v:m /t:Build /p:VersionSuffix=mysuffix /clp:Summary")]
-        [InlineData(new string[] { "--no-dependencies" }, @"exec <msbuildpath> /m /v:m /t:Build /p:BuildProjectReferences=false /clp:Summary")]
-        [InlineData(new string[] { "-v", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--verbosity", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag /clp:Summary")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedCommand)
-        {
-            var msbuildPath = "<msbuildpath>";
-            BuildCommand.FromArgs(args, msbuildPath)
-                .GetProcessStartInfo().Arguments.Should().Be(expectedCommand);
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/test/dotnet-msbuild.Tests/GivenDotnetSlnInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetSlnInvocation.cs
@ -1,35 +0,0 @@
-using Microsoft.DotNet.Tools.Build;
-using FluentAssertions;
-using Xunit;
-using System;
-
-namespace Microsoft.DotNet.Cli.MSBuild.Tests
-{
-    public class GivenDotnetSlnInvocation
-    {
-        [Theory(Skip = "finish me")]
-        [InlineData(new string[] { }, @"exec <msbuildpath> /m /v:m /t:Build /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "--output", "foo" }, @"exec <msbuildpath> /m /v:m /t:Build /p:OutputPath=foo /clp:Summary")]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, @"exec <msbuildpath> /m /v:m /t:Build ""/p:OutputPath=foo1 foo2"" /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /clp:Summary")]
-        [InlineData(new string[] { "-f", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "--framework", "framework" }, @"exec <msbuildpath> /m /v:m /t:Build /p:TargetFramework=framework /clp:Summary")]
-        [InlineData(new string[] { "-r", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "--runtime", "runtime" }, @"exec <msbuildpath> /m /v:m /t:Build /p:RuntimeIdentifier=runtime /clp:Summary")]
-        [InlineData(new string[] { "-c", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--configuration", "configuration" }, @"exec <msbuildpath> /m /v:m /t:Build /p:Configuration=configuration /clp:Summary")]
-        [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"exec <msbuildpath> /m /v:m /t:Build /p:VersionSuffix=mysuffix /clp:Summary")]
-        [InlineData(new string[] { "--no-dependencies" }, @"exec <msbuildpath> /m /v:m /t:Build /p:BuildProjectReferences=false /clp:Summary")]
-        [InlineData(new string[] { "-v", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--verbosity", "verbosity" }, @"exec <msbuildpath> /m /v:m /t:Build /verbosity:verbosity /clp:Summary")]
-        [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, @"exec <msbuildpath> /m /v:m /t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag /clp:Summary")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedCommand)
-        {
-            var msbuildPath = "<msbuildpath>";
-            BuildCommand.FromArgs(args, msbuildPath)
-                .GetProcessStartInfo().Arguments.Should().Be(expectedCommand);
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/test/dotnet-msbuild.Tests/GivenDotnetVsTestForwardingApp.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetVsTestForwardingApp.cs
@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
        public void ItRunsVsTestApp()
        {
            new VSTestForwardingApp(new string[0])
-                .GetProcessStartInfo().FileName.Should().EndWith("vstest.console.dll");
+                .GetProcessStartInfo().Arguments.Should().EndWith("vstest.console.dll");
        }
    }
 }