fix #438 by adding support for dependency targets

Targets can be used to restrict a dependency so that it can only be
satisfied by a particular type of library.

.gitignore

@@ -3,7 +3,7 @@
 TestResults/
 .nuget/
 _ReSharper.*/
-/packages
+packages/
 artifacts/
 TestOutput/
 PublishProfiles/

misc/DependencyTargets/DependencyTargets.sln

@@ -0,0 +1,33 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AC1AC331-AE09-4FDC-8C0C-07BDB3F5FEDE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D86121D1-15A1-4082-9066-F4E5D3803601}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+		NuGet.Config = NuGet.Config
+	EndProjectSection
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "A", "src\A\A.xproj", "{0FA61EE7-5B67-441A-8097-6F8EDCAB1337}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0FA61EE7-5B67-441A-8097-6F8EDCAB1337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FA61EE7-5B67-441A-8097-6F8EDCAB1337}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FA61EE7-5B67-441A-8097-6F8EDCAB1337}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FA61EE7-5B67-441A-8097-6F8EDCAB1337}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{0FA61EE7-5B67-441A-8097-6F8EDCAB1337} = {AC1AC331-AE09-4FDC-8C0C-07BDB3F5FEDE}
+	EndGlobalSection
+EndGlobal

misc/DependencyTargets/NuGet.Config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>

misc/DependencyTargets/global.json

@@ -0,0 +1,4 @@
+{
+    "packages": "packages",
+    "projects": [ "src", "test" ]
+}

misc/DependencyTargets/src/A/A.xproj

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>0fa61ee7-5b67-441a-8097-6f8edcab1337</ProjectGuid>
+    <RootNamespace>A</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

misc/DependencyTargets/src/A/Helper.cs

@@ -0,0 +1,14 @@
+namespace A
+{
+    public static class Helper
+    {
+        public static string GetValue()
+        {
+#if PACKAGE
+            return "This is Package A";
+#else
+            return "This is Project A";
+#endif
+        }
+    }
+}

misc/DependencyTargets/src/A/project.json

@@ -0,0 +1,18 @@
+{
+    "version": "1.0.0",
+
+    "configurations": {
+        "package": {
+            "compilationOptions": { "define": [ "PACKAGE" ] }
+        }
+    },
+
+    "frameworks": {
+        "dnx451": { },
+        "dnxcore50": {
+            "dependencies": {
+                "System.Runtime": "4.0.0-beta-*"
+            }
+        }
+    }
+}

misc/DependencyTargets/src/App/App.xproj

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>036baeb2-6d3a-422c-ba4a-0656718927aa</ProjectGuid>
+    <RootNamespace>App</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

misc/DependencyTargets/src/App/Program.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace App
+{
+    public class Program
+    {
+        public void Main(string[] args)
+        {
+            Console.WriteLine($"A: {A.Helper.GetValue()}");
+            Console.WriteLine($"B: {B.Helper.GetValue()}");
+        }
+    }
+}

misc/DependencyTargets/src/App/project.json

@@ -0,0 +1,25 @@
+{
+    "version": "1.0.0",
+
+    "dependencies": {
+        "A": { "target": "project" },
+        "B": {
+            "version": "1.0.0-*",
+            "target": "package"
+        }
+    },
+
+    "commands": {
+        "App": "App"
+    },
+
+    "frameworks": {
+        "dnx451": { },
+        "dnxcore50": {
+            "dependencies": {
+                "System.Runtime": "4.0.0-beta-*",
+                "System.Console": "4.0.0-beta-*"
+            }
+        }
+    }
+}

misc/DependencyTargets/src/B/B.xproj

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>3532117e-5ffc-4d31-9ad6-e953005d3974</ProjectGuid>
+    <RootNamespace>B</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

misc/DependencyTargets/src/B/Helper.cs

@@ -0,0 +1,14 @@
+namespace B
+{
+    public static class Helper
+    {
+        public static string GetValue()
+        {
+#if PACKAGE
+            return "This is Package B";
+#else
+            return "This is Project B";
+#endif
+        }
+    }
+}

misc/DependencyTargets/src/B/project.json

@@ -0,0 +1,18 @@
+{
+    "version": "1.0.0",
+
+    "configurations": {
+        "package": {
+            "compilationOptions": { "define": [ "PACKAGE" ] }
+        }
+    },
+
+    "frameworks": {
+        "dnx451": { },
+        "dnxcore50": {
+            "dependencies": {
+                "System.Runtime": "4.0.0-beta-*"
+            }
+        }
+    }
+}

src/Microsoft.Dnx.Runtime.Abstractions/DependencyTargets.cs

@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.Dnx.Runtime
+{
+    public static class DependencyTargets
+    {
+        public static readonly string Project = nameof(Project);
+        public static readonly string Package = nameof(Package);
+
+        private const string NoTargetDisplayName = "Dependency";
+
+        public static string GetDisplayForTarget(string target)
+        {
+            // Normalize the case of the known targets
+            if (string.Equals(target, Project, StringComparison.OrdinalIgnoreCase))
+            {
+                return Project;
+            }
+            else if (string.Equals(target, Package, StringComparison.OrdinalIgnoreCase))
+            {
+                return Package;
+            }
+            else
+            {
+                return NoTargetDisplayName;
+            }
+        }
+
+        public static bool SupportsPackage(string target)
+        {
+            return string.IsNullOrEmpty(target) || string.Equals(target, Package, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public static bool SupportsProject(string target)
+        {
+            return string.IsNullOrEmpty(target) || string.Equals(target, Project, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}

src/Microsoft.Dnx.Runtime.Abstractions/LibraryTypes.cs

@@ -7,5 +7,6 @@ public static class LibraryTypes
         public static readonly string ReferenceAssembly = "Assembly"; //Can't use 'nameof(ReferenceAssembly)' because of WTE compat for now. Logged with tooling.
         public static readonly string GlobalAssemblyCache = nameof(GlobalAssemblyCache);
         public static readonly string Unresolved = nameof(Unresolved);
+        public static readonly string Implicit = nameof(Implicit);
     }
 }

src/Microsoft.Dnx.Runtime/DependencyManagement/LibraryRange.cs

@@ -22,6 +22,8 @@ public class LibraryRange : IEquatable<LibraryRange>
 
         public int Column { get; set; }
 
+        public string Target { get; set; }
+
         public LibraryRange(string name, bool frameworkReference)
         {
             Name = name;

src/Microsoft.Dnx.Runtime/ProjectReader.cs

@@ -199,10 +199,11 @@ private static void PopulateDependencies(
                     var dependencyValue = dependencies.Value(dependencyKey);
                     var dependencyTypeValue = LibraryDependencyType.Default;
                     JsonString dependencyVersionAsString = null;
+                    string target = null;
 
                     if (dependencyValue is JsonObject)
                     {
-                        // "dependencies" : { "Name" : { "version": "1.0", "type": "build" } }
+                        // "dependencies" : { "Name" : { "version": "1.0", "type": "build", "target": "project" } }
                         var dependencyValueAsObject = (JsonObject)dependencyValue;
                         dependencyVersionAsString = dependencyValueAsObject.ValueAsString("version");
 
@@ -212,6 +213,9 @@ private static void PopulateDependencies(
                         {
                             dependencyTypeValue = LibraryDependencyType.Parse(type.Value);
                         }
+
+                        // Read the target if specified
+                        target = dependencyValueAsObject.ValueAsString("target")?.Value;
                     }
                     else if (dependencyValue is JsonString)
                     {
@@ -249,7 +253,8 @@ private static void PopulateDependencies(
                             VersionRange = dependencyVersionRange,
                             FileName = projectPath,
                             Line = dependencyValue.Line,
-                            Column = dependencyValue.Column
+                            Column = dependencyValue.Column,
+                            Target = target
                         },
                         Type = dependencyTypeValue
                     });

src/Microsoft.Dnx.Tooling/Restore/ImplicitPackagesWalkProvider.cs

@@ -97,6 +97,7 @@ public Task<WalkProviderMatch> FindLibrary(LibraryRange libraryRange, FrameworkN
                 return Task.FromResult(new WalkProviderMatch()
                 {
                     Provider = this,
+                    LibraryType = LibraryTypes.Implicit,
                     Library = new LibraryIdentity(ImplicitRuntimePackageId, ImplicitRuntimePackageVersion, isGacOrFrameworkReference: false)
                 });
             }

src/Microsoft.Dnx.Tooling/Restore/LocalWalkProvider.cs

@@ -34,6 +34,7 @@ public Task<WalkProviderMatch> FindLibrary(LibraryRange libraryRange, FrameworkN
             return Task.FromResult(new WalkProviderMatch
             {
                 Library = description.Identity,
+                LibraryType = description.Type,
                 Path = description.Path,
                 Provider = this,
             });

src/Microsoft.Dnx.Tooling/Restore/NuGetDependencyResolver.cs

@@ -29,7 +29,7 @@ public IEnumerable<string> GetAttemptedPaths(FrameworkName targetFramework)
 
         public LibraryDescription GetDescription(LibraryRange libraryRange, FrameworkName targetFramework)
         {
-            if (libraryRange.IsGacOrFrameworkReference)
+            if(!DependencyTargets.SupportsPackage(libraryRange.Target))
             {
                 return null;
             }

src/Microsoft.Dnx.Tooling/Restore/ProjectReferenceDependencyProvider.cs

@@ -31,6 +31,11 @@ public LibraryDescription GetDescription(LibraryRange libraryRange, FrameworkNam
                 return null;
             }
 
+            if (!DependencyTargets.SupportsProject(libraryRange.Target))
+            {
+                return null;
+            }
+
             string name = libraryRange.Name;
 
             Runtime.Project project;

src/Microsoft.Dnx.Tooling/Restore/RemoteWalkProvider.cs

@@ -28,6 +28,11 @@ public RemoteWalkProvider(IPackageFeed source)
 
         public async Task<WalkProviderMatch> FindLibrary(LibraryRange libraryRange, FrameworkName targetFramework, bool includeUnlisted)
         {
+            if(!DependencyTargets.SupportsPackage(libraryRange.Target))
+            {
+                return null;
+            }
+
             var results = await _source.FindPackagesByIdAsync(libraryRange.Name);
             PackageInfo bestResult = null;
             if(!includeUnlisted)
@@ -54,6 +59,7 @@ public async Task<WalkProviderMatch> FindLibrary(LibraryRange libraryRange, Fram
             return new WalkProviderMatch
             {
                 Library = new LibraryIdentity(bestResult.Id, bestResult.Version, isGacOrFrameworkReference: false),
+                LibraryType = LibraryTypes.Package,
                 Path = bestResult.ContentUri,
                 Provider = this,
             };