allow hosting pre-built test package this scenario

pending NuGet/Home#4254. Without this, we have no way to create a NuGet package that doesn't contain a package reference to Microsoft.DotNet.Cli.Utils, preventing a proper repro of https://github.com/dotnet/cli/issues/4214.
jonsequitur · Jan 19, 2017 · 248b585 · 248b585
1 parent b31b461
commit 248b585
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 22 deletions.
diff --git a/...ckages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj b/...ckages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj
@@ -38,8 +38,4 @@
                       Version="15.1.0-preview-000458-02" />
   </ItemGroup>
 
-  <Target Name="PackNuspec" AfterTargets="Pack">
-    <Exec Command="dotnet nuget pack PackagedTaskWithCliDependencyConflict.nuspec" />
-  </Target>
-
 </Project>
diff --git a/...PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets b/...PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask TaskName="TaskFoundOnlyInOneVersion" 
-             AssemblyFile="$(MSBuildThisFileDirectory)/../bin/Debug/netcoreapp1.0/DependsOn.Other.Microsoft.DotNet.Cli.Utils.dll" />
+             AssemblyFile="$(MSBuildThisFileDirectory)/../lib/netcoreapp1.0/DependsOn.Other.Microsoft.DotNet.Cli.Utils.dll" />
 
   <PropertyGroup>
     <ApplicationName>$(AssemblyName)</ApplicationName>

diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets
@@ -185,17 +185,6 @@
         <Clean>True</Clean>
         <Frameworks>netcoreapp1.0</Frameworks>
       </BaseTestPackageProject>
-      <BaseTestPackageProject Include="TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict">
-        <Name>PackagedTaskWithCliDependencyConflict</Name>
-        <ProjectName>PackagedTaskWithCliDependencyConflict.csproj</ProjectName>
-        <NuPkgName>PackagedTaskWithCliDependencyConflict</NuPkgName>
-        <IsTool>False</IsTool>
-        <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>preview</VersionSuffix>
-        <Clean>True</Clean>
-        <Frameworks>netcoreapp1.0</Frameworks>
-      </BaseTestPackageProject>
       <BaseTestPackageProject Include="TestAssets/TestPackages/ToolWithOutputName">
         <Name>dotnet-tool-with-output-name</Name>
         <ProjectName>ToolWithOutputName.csproj</ProjectName>

diff --git 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");