repro of issue #4214

jonsequitur · Dec 23, 2016 · e19f72f · e19f72f
1 parent b4ef34b
commit e19f72f
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 1 deletion.
diff --git a/...s/TestPackages/Other.Microsoft.DotNet.Cli.Utils/ClassThatIsntInMicrosoftDotNetCliUtils.cs b/...s/TestPackages/Other.Microsoft.DotNet.Cli.Utils/ClassThatIsntInMicrosoftDotNetCliUtils.cs
@@ -0,0 +1,8 @@
+
+namespace Microsoft.DotNet.Cli.Utils 
+{
+	public static class ClassThatIsntInMicrosoftDotNetCliUtils 
+	{
+		public static string GetValue() => "Hello there!";
+	}
+}
diff --git a/...ets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/Other.Microsoft.DotNet.Cli.Utils.csproj b/...ets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/Other.Microsoft.DotNet.Cli.Utils.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>Microsoft.DotNet.Cli.Utils</AssemblyName>
+    <Version>123.0.0.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/Banana.cs b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/Banana.cs
@@ -0,0 +1,17 @@
+using Microsoft.Build.Framework;
+using Microsoft.DotNet.Cli.Utils;
+
+namespace Banana.Task
+{
+    public class Banana : Microsoft.Build.Utilities.Task
+    {
+        [Output]
+        public string TaskOutput { get; private set; }
+
+        public override bool Execute()
+        {
+			TaskOutput = ClassThatIsntInMicrosoftDotNetCliUtils.GetValue();
+          	return true;
+        }
+    }
+}
diff --git a/...ckages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj b/...ckages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj
@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+	  <AssemblyName>DependsOn.Other.Microsoft.DotNet.Cli.Utils</AssemblyName>
+    <PackageId>PackagedTaskWithCliDependencyConflict</PackageId>
+    <Version>1.0.0-preview</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference 
+      Include="..\Other.Microsoft.DotNet.Cli.Utils\Other.Microsoft.DotNet.Cli.Utils.csproj" 
+      TreatAsPackageReference="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="build\PackagedTaskWithCliDependencyConflict.targets" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="build\*.targets">
+      <Pack>true</Pack>
+      <PackagePath>build\</PackagePath>
+    </Content>
+    <Content Include="..\Other.Microsoft.DotNet.Cli.Utils\bin\Debug\netcoreapp1.0\Microsoft.DotNet.Cli.Utils.dll">
+      <Pack>true</Pack>
+      <PackagePath>lib\$(TargetFramework)</PackagePath>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App">
+      <Version>1.0.1</Version>
+    </PackageReference>
+	  <PackageReference Include="Microsoft.Build.Framework">
+      <Version>15.1.0-preview-000458-02</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Utilities.Core">
+      <Version>15.1.0-preview-000458-02</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <Target Name="PackNuspec" AfterTargets="Pack">
+    <Exec Command="dotnet nuget pack PackagedTaskWithCliDependencyConflict.nuspec" />
+  </Target>
+
+</Project>
diff --git a/...ckages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.nuspec b/...ckages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.nuspec
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>PackagedTaskWithCliDependencyConflict</id>
+    <version>1.0.0-preview</version>
+    <authors>DependsOn.Other.Microsoft.DotNet.Cli.Utils</authors>
+    <owners>DependsOn.Other.Microsoft.DotNet.Cli.Utils</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Package Description</description>
+	<files>
+		<file src="bin/$configuration$/netcoreapp1.0/*.dll" target="lib" />
+		<file src="build/PackagedTaskWithCliDependencyConflict.targets"  />
+  </files>
+  </metadata>
+</package>
+
+
diff --git a/...PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets b/...PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets
@@ -0,0 +1,12 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="Banana" AssemblyFile="$(MSBuildThisFileDirectory)/../bin/Debug/netcoreapp1.0/DependsOn.Other.Microsoft.DotNet.Cli.Utils.dll" />
+
+  <PropertyGroup>
+    <ApplicationName>$(AssemblyName)</ApplicationName>
+    <ApplicationName Condition="'$(AssemblyName)' == ''">$(MsBuildProjectName)</ApplicationName>
+  </PropertyGroup>
+
+  <Target Name="Banana">
+    <Banana />
+  </Target>
+</Project>
diff --git a/...ssets/TestProjects/AppWithCliConflictingDependency/AppWithCliConflictingDependency.csproj b/...ssets/TestProjects/AppWithCliConflictingDependency/AppWithCliConflictingDependency.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+    <PackageReference Include="PackagedTaskWithCliDependencyConflict" Version="1.0.0-preview" />
+  </ItemGroup>
+
+</Project>
diff --git a/TestAssets/TestProjects/AppWithCliConflictingDependency/NuGet.Config b/TestAssets/TestProjects/AppWithCliConflictingDependency/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="test-packages" value="../../../artifacts/testpackages" />
+  </packageSources>
+</configuration>
diff --git a/TestAssets/TestProjects/AppWithCliConflictingDependency/Program.cs b/TestAssets/TestProjects/AppWithCliConflictingDependency/Program.cs
@@ -0,0 +1,9 @@
+using System;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        Console.WriteLine("Here I am!");
+    }
+}
diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets
@@ -165,6 +165,17 @@
         <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/Microsoft.DotNet.ProjectJsonMigration.Tests/MigrationBackupPlanTests.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/MigrationBackupPlanTests.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 {
-    public partial class MigrationBackupPlanTests
+    public class MigrationBackupPlanTests
     {
         [Fact]
         public void TheRootBackupDirectoryIsASiblingOfTheRootProject()