diff --git a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj index dd0c1a8a726..09693097c1d 100644 --- a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj +++ b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj @@ -38,8 +38,4 @@ Version="15.1.0-preview-000458-02" /> - - - - diff --git a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets index 749e3308981..726a33d60f9 100644 --- a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets +++ b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets @@ -1,6 +1,6 @@  + AssemblyFile="$(MSBuildThisFileDirectory)/../lib/netcoreapp1.0/DependsOn.Other.Microsoft.DotNet.Cli.Utils.dll" /> $(AssemblyName) diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index 092715dccb4..e09a73bdbc2 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -185,17 +185,6 @@ True netcoreapp1.0 - - PackagedTaskWithCliDependencyConflict - PackagedTaskWithCliDependencyConflict.csproj - PackagedTaskWithCliDependencyConflict - False - True - 1.0.0 - preview - True - netcoreapp1.0 - dotnet-tool-with-output-name ToolWithOutputName.csproj diff --git a/test/msbuild.IntegrationTests/GivenDotnetInvokesMSBuild.cs b/test/msbuild.IntegrationTests/GivenDotnetInvokesMSBuild.cs index 3883311b522..8e935595770 100644 --- a/test/msbuild.IntegrationTests/GivenDotnetInvokesMSBuild.cs +++ b/test/msbuild.IntegrationTests/GivenDotnetInvokesMSBuild.cs @@ -130,12 +130,6 @@ public void WhenBuildTargetDependsOnADifferentVersionOfAnAssemblyTheCliDependsOn .WithSourceFiles() .WithRestoreFiles(); - // var restore = new DotnetCommand() - // .WithWorkingDirectory(testInstance.Root) - // .Execute("restore"); - - // restore.Should().Pass(); - var msbuild = new DotnetCommand() .WithWorkingDirectory(testInstance.Root) .ExecuteWithCapturedOutput($"msbuild /t:TaskFoundOnlyInOneVersion");