From e19f72fa2b7e39ae651b7aedbd2c398a30104a6b Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Thu, 22 Dec 2016 19:25:38 -0800 Subject: [PATCH] repro of issue #4214 --- .../ClassThatIsntInMicrosoftDotNetCliUtils.cs | 8 +++ .../Other.Microsoft.DotNet.Cli.Utils.csproj | 18 +++++++ .../Banana.cs | 17 ++++++ ...ckagedTaskWithCliDependencyConflict.csproj | 52 +++++++++++++++++++ ...ckagedTaskWithCliDependencyConflict.nuspec | 17 ++++++ ...kagedTaskWithCliDependencyConflict.targets | 12 +++++ .../AppWithCliConflictingDependency.csproj | 17 ++++++ .../NuGet.Config | 6 +++ .../Program.cs | 9 ++++ build/test/TestPackageProjects.targets | 11 ++++ .../MigrationBackupPlanTests.cs | 2 +- 11 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 TestAssets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/ClassThatIsntInMicrosoftDotNetCliUtils.cs create mode 100755 TestAssets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/Other.Microsoft.DotNet.Cli.Utils.csproj create mode 100644 TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/Banana.cs create mode 100644 TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj create mode 100644 TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.nuspec create mode 100644 TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets create mode 100755 TestAssets/TestProjects/AppWithCliConflictingDependency/AppWithCliConflictingDependency.csproj create mode 100644 TestAssets/TestProjects/AppWithCliConflictingDependency/NuGet.Config create mode 100755 TestAssets/TestProjects/AppWithCliConflictingDependency/Program.cs diff --git a/TestAssets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/ClassThatIsntInMicrosoftDotNetCliUtils.cs b/TestAssets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/ClassThatIsntInMicrosoftDotNetCliUtils.cs new file mode 100644 index 00000000000..cff5e29873b --- /dev/null +++ b/TestAssets/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!"; + } +} \ No newline at end of file diff --git a/TestAssets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/Other.Microsoft.DotNet.Cli.Utils.csproj b/TestAssets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/Other.Microsoft.DotNet.Cli.Utils.csproj new file mode 100755 index 00000000000..eef43310435 --- /dev/null +++ b/TestAssets/TestPackages/Other.Microsoft.DotNet.Cli.Utils/Other.Microsoft.DotNet.Cli.Utils.csproj @@ -0,0 +1,18 @@ + + + + Library + netcoreapp1.0 + Microsoft.DotNet.Cli.Utils + 123.0.0.0 + + + + + + + + + + + diff --git a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/Banana.cs b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/Banana.cs new file mode 100644 index 00000000000..321ad33cf6d --- /dev/null +++ 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/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj new file mode 100644 index 00000000000..83f71aa6e31 --- /dev/null +++ b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.csproj @@ -0,0 +1,52 @@ + + + + Library + netcoreapp1.0 + DependsOn.Other.Microsoft.DotNet.Cli.Utils + PackagedTaskWithCliDependencyConflict + 1.0.0-preview + + + + + + + + + + + + + + + + + true + build\ + + + true + lib\$(TargetFramework) + + + + + + 1.0.1 + + + 15.1.0-preview-000458-02 + + + 15.1.0-preview-000458-02 + + + + + + + + diff --git a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.nuspec b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.nuspec new file mode 100644 index 00000000000..2b396054bac --- /dev/null +++ b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/PackagedTaskWithCliDependencyConflict.nuspec @@ -0,0 +1,17 @@ + + + + PackagedTaskWithCliDependencyConflict + 1.0.0-preview + DependsOn.Other.Microsoft.DotNet.Cli.Utils + DependsOn.Other.Microsoft.DotNet.Cli.Utils + false + Package Description + + + + + + + + diff --git a/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets new file mode 100644 index 00000000000..9d0ef3d652f --- /dev/null +++ b/TestAssets/TestPackages/PackagedTaskWithCliDependencyConflict/build/PackagedTaskWithCliDependencyConflict.targets @@ -0,0 +1,12 @@ + + + + + $(AssemblyName) + $(MsBuildProjectName) + + + + + + diff --git a/TestAssets/TestProjects/AppWithCliConflictingDependency/AppWithCliConflictingDependency.csproj b/TestAssets/TestProjects/AppWithCliConflictingDependency/AppWithCliConflictingDependency.csproj new file mode 100755 index 00000000000..936512b81bb --- /dev/null +++ b/TestAssets/TestProjects/AppWithCliConflictingDependency/AppWithCliConflictingDependency.csproj @@ -0,0 +1,17 @@ + + + + Exe + netcoreapp1.0 + + + + + + + + + + + + diff --git a/TestAssets/TestProjects/AppWithCliConflictingDependency/NuGet.Config b/TestAssets/TestProjects/AppWithCliConflictingDependency/NuGet.Config new file mode 100644 index 00000000000..b8e876fcb71 --- /dev/null +++ b/TestAssets/TestProjects/AppWithCliConflictingDependency/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/TestAssets/TestProjects/AppWithCliConflictingDependency/Program.cs b/TestAssets/TestProjects/AppWithCliConflictingDependency/Program.cs new file mode 100755 index 00000000000..8dacd0024eb --- /dev/null +++ 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 index 4e127a8742c..0cdce8a68b7 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -165,6 +165,17 @@ 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/Microsoft.DotNet.ProjectJsonMigration.Tests/MigrationBackupPlanTests.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/MigrationBackupPlanTests.cs index b54f265b002..9cbd5d2ce1c 100644 --- 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()