From 53a017579875dc45232c530685d656932426322f Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 14 Apr 2017 17:39:03 -0700
Subject: [PATCH 01/11] Add option to not include "main project" info in deps
 file

---
 .../GivenADependencyContextBuilder.cs         |  3 +-
 .../DependencyContextBuilder.cs               | 37 +++++++++++++++----
 .../GenerateDepsFile.cs                       | 23 ++++++++----
 .../build/Microsoft.NET.Publish.targets       |  2 +
 .../build/Microsoft.NET.Sdk.targets           |  5 +++
 5 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs
index e6860b12e721..dd0f869bbc9a 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs
@@ -52,7 +52,8 @@ public void ItBuildsDependencyContextsFromProjectLockFiles(
                 Constants.DefaultPlatformLibrary,
                 isSelfContained: !string.IsNullOrEmpty(runtime));
 
-            DependencyContext dependencyContext = new DependencyContextBuilder(mainProject, projectContext)
+            DependencyContext dependencyContext = new DependencyContextBuilder(projectContext)
+                .WithMainProject(mainProject)
                 .WithDirectReferences(directReferences)
                 .WithCompilationOptions(compilationOptions)
                 .Build();
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
index 58f5c0e1980f..257178a8eb00 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
@@ -18,7 +18,7 @@ namespace Microsoft.NET.Build.Tasks
     internal class DependencyContextBuilder
     {
         private readonly VersionFolderPathResolver _versionFolderPathResolver;
-        private readonly SingleProjectInfo _mainProjectInfo;
+        private SingleProjectInfo _mainProjectInfo;
         private readonly ProjectContext _projectContext;
         private IEnumerable<ReferenceInfo> _frameworkReferences;
         private IEnumerable<ReferenceInfo> _directReferences;
@@ -28,15 +28,20 @@ internal class DependencyContextBuilder
         private string _referenceAssembliesPath;
         private Dictionary<PackageIdentity, StringBuilder> _filteredPackages;
 
-        public DependencyContextBuilder(SingleProjectInfo mainProjectInfo, ProjectContext projectContext)
+        public DependencyContextBuilder(ProjectContext projectContext)
         {
-            _mainProjectInfo = mainProjectInfo;
             _projectContext = projectContext;
 
             // This resolver is only used for building file names, so that base path is not required.
             _versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
         }
 
+        public DependencyContextBuilder WithMainProject(SingleProjectInfo mainProjectInfo)
+        {
+            _mainProjectInfo = mainProjectInfo;
+            return this;
+        }
+
         public DependencyContextBuilder WithFrameworkReferences(IEnumerable<ReferenceInfo> frameworkReferences)
         {
             // note: Framework libraries only export compile-time stuff
@@ -106,7 +111,7 @@ public DependencyContext Build()
                 _projectContext,
                 dependencyLookup);
             IEnumerable<RuntimeLibrary> runtimeLibraries =
-                new[] { projectRuntimeLibrary }
+                (projectRuntimeLibrary == null ? Enumerable.Empty<RuntimeLibrary>() : new[] { projectRuntimeLibrary })
                 .Concat(GetLibraries(runtimeExports, libraryLookup, dependencyLookup, runtime: true).Cast<RuntimeLibrary>())
                 .Concat(GetDirectReferenceRuntimeLibraries());
 
@@ -118,7 +123,7 @@ public DependencyContext Build()
                     _projectContext,
                     dependencyLookup);
                 compilationLibraries =
-                    new[] { projectCompilationLibrary }
+                    (projectCompilationLibrary == null ? Enumerable.Empty<CompilationLibrary>() : new[] { projectCompilationLibrary })
                     .Concat(GetFrameworkLibraries())
                     .Concat(GetLibraries(compilationExports, libraryLookup, dependencyLookup, runtime: false).Cast<CompilationLibrary>())
                     .Concat(GetDirectReferenceCompilationLibraries());
@@ -233,6 +238,11 @@ private RuntimeLibrary GetProjectRuntimeLibrary(
             ProjectContext projectContext,
             Dictionary<string, Dependency> dependencyLookup)
         {
+            if (projectInfo == null)
+            {
+                return null;
+            }
+
             RuntimeAssetGroup[] runtimeAssemblyGroups = new[] { new RuntimeAssetGroup(string.Empty, projectInfo.OutputName) };
 
             List<Dependency> dependencies = GetProjectDependencies(projectContext, dependencyLookup);
@@ -254,6 +264,11 @@ private CompilationLibrary GetProjectCompilationLibrary(
             ProjectContext projectContext,
             Dictionary<string, Dependency> dependencyLookup)
         {
+            if (projectInfo == null)
+            {
+                return null;
+            }
+
             List<Dependency> dependencies = GetProjectDependencies(projectContext, dependencyLookup);
 
             return new CompilationLibrary(
@@ -523,8 +538,16 @@ private SingleProjectInfo GetProjectInfo(LockFileLibrary library)
                 throw new BuildErrorException(Strings.CannotFindProjectInfo, library.Name);
             }
 
-            string mainProjectDirectory = Path.GetDirectoryName(_mainProjectInfo.ProjectPath);
-            string fullProjectPath = Path.GetFullPath(Path.Combine(mainProjectDirectory, projectPath));
+            string fullProjectPath;
+            if (_mainProjectInfo != null)
+            {
+                string mainProjectDirectory = Path.GetDirectoryName(_mainProjectInfo.ProjectPath);
+                fullProjectPath = Path.GetFullPath(Path.Combine(mainProjectDirectory, projectPath));
+            }
+            else
+            {
+                fullProjectPath = Path.GetFullPath(projectPath);
+            }
 
             SingleProjectInfo referenceProjectInfo = null;
             if (_referenceProjectInfos?.TryGetValue(fullProjectPath, out referenceProjectInfo) != true ||
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
index 9db941e80a6a..da1529bf889a 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
@@ -49,6 +49,9 @@ public class GenerateDepsFile : TaskBase
         [Required]
         public ITaskItem[] AssemblySatelliteAssemblies { get; set; }
 
+        [Required]
+        public bool IncludeMainProject { get; set; }
+
         [Required]
         public ITaskItem[] ReferencePaths { get; set; }
 
@@ -116,12 +119,17 @@ protected override void ExecuteCore()
             LockFile lockFile = new LockFileCache(BuildEngine4).GetLockFile(AssetsFilePath);
             CompilationOptions compilationOptions = CompilationOptionsConverter.ConvertFrom(CompilerOptions);
 
-            SingleProjectInfo mainProject = SingleProjectInfo.Create(
-                ProjectPath,
-                AssemblyName,
-                AssemblyExtension,
-                AssemblyVersion,
-                AssemblySatelliteAssemblies);
+            SingleProjectInfo mainProject = null;
+
+            if (IncludeMainProject)
+            {
+                mainProject = SingleProjectInfo.Create(
+                    ProjectPath,
+                    AssemblyName,
+                    AssemblyExtension,
+                    AssemblyVersion,
+                    AssemblySatelliteAssemblies);
+            }
 
             IEnumerable<ReferenceInfo> frameworkReferences =
                 ReferenceInfo.CreateFrameworkReferenceInfos(ReferencePaths);
@@ -141,7 +149,8 @@ protected override void ExecuteCore()
                 PlatformLibraryName,
                 IsSelfContained);
 
-            DependencyContext dependencyContext = new DependencyContextBuilder(mainProject, projectContext)
+            DependencyContext dependencyContext = new DependencyContextBuilder(projectContext)
+                .WithMainProject(mainProject)
                 .WithFrameworkReferences(frameworkReferences)
                 .WithDirectReferences(directReferences)
                 .WithReferenceProjectInfos(referenceProjects)
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets
index 7eb92b5e6378..7ef0be1ed896 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets
@@ -468,6 +468,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <PropertyGroup>
       <PublishDepsFilePath Condition=" '$(PublishDepsFilePath)' == '' ">$(PublishDir)$(ProjectDepsFileName)</PublishDepsFilePath>
+      <IncludeMainProjectInDepsFile Condition=" '$(IncludeMainProjectInDepsFile)' == '' ">true</IncludeMainProjectInDepsFile>
     </PropertyGroup>
 
     <GenerateDepsFile ProjectPath="$(MSBuildProjectFullPath)"
@@ -480,6 +481,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       AssemblySatelliteAssemblies="@(IntermediateSatelliteAssembliesWithTargetPath)"
                       ReferencePaths="@(ReferencePath)"
                       ReferenceSatellitePaths="@(ReferenceSatellitePaths)"
+                      IncludeMainProject="$(IncludeMainProjectInDepsFile)"
                       RuntimeIdentifier="$(RuntimeIdentifier)"
                       PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"
                       FilesToSkip="@(_ConflictPackageFiles);@(_PublishConflictPackageFiles)"
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
index ad3014cb878e..bf27be9de083 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
@@ -86,6 +86,10 @@ Copyright (c) .NET Foundation. All rights reserved.
           Inputs="$(ProjectAssetsFile)"
           Outputs="$(ProjectDepsFilePath)">
 
+    <PropertyGroup>
+      <IncludeMainProjectInDepsFile Condition=" '$(IncludeMainProjectInDepsFile)' == '' ">true</IncludeMainProjectInDepsFile>
+    </PropertyGroup>
+    
     <!-- 
     Explicitly not passing any PrivateAssets information during 'Build', since these dependencies
     should be included during 'Build'.  They are only excluded on 'Publish'.
@@ -100,6 +104,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       AssemblySatelliteAssemblies="@(IntermediateSatelliteAssembliesWithTargetPath)"
                       ReferencePaths="@(ReferencePath)"
                       ReferenceSatellitePaths="@(ReferenceSatellitePaths)"
+                      IncludeMainProject="$(IncludeMainProjectInDepsFile)"
                       RuntimeIdentifier="$(RuntimeIdentifier)"
                       PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"
                       FilesToSkip="@(_ConflictPackageFiles)"

From c5a64e772cb24051865dbf28f9efa69c542d05b7 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 17 Apr 2017 07:40:16 -0700
Subject: [PATCH 02/11] Add GenerateDeps.proj to be used to generate .deps.json
 files for .NET CLI tools

---
 build/Nuget/Microsoft.NET.Sdk.Nuget.targets   |  4 ++
 .../build/GenerateDeps/GenerateDeps.proj      | 44 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj

diff --git a/build/Nuget/Microsoft.NET.Sdk.Nuget.targets b/build/Nuget/Microsoft.NET.Sdk.Nuget.targets
index f4da317fe41b..a2a7a38b8fd2 100644
--- a/build/Nuget/Microsoft.NET.Sdk.Nuget.targets
+++ b/build/Nuget/Microsoft.NET.Sdk.Nuget.targets
@@ -48,6 +48,10 @@ vs.localizedResources
       <SdkSwrLines Include='$(SdkSwrBlankLine)folder "InstallDir:MSBuild\Sdks\Microsoft.NET.Sdk\build"' />
       <SdkSwrLines Include='%20%20file source="%24(OutputPath)PackagesLayout\build\%(LaidOutSdk_BuildFiles.Filename)%(LaidOutSdk_BuildFiles.Extension)"' />
 
+      <LaidOutSdk_BuildGenerateDepsFiles Include="$(PackagesLayoutDir)build\GenerateDeps\*" />
+      <SdkSwrLines Include='$(SdkSwrBlankLine)folder "InstallDir:MSBuild\Sdks\Microsoft.NET.Sdk\build\GenerateDeps"' />
+      <SdkSwrLines Include='%20%20file source="%24(OutputPath)PackagesLayout\build\GenerateDeps\%(LaidOutSdk_BuildGenerateDepsFiles.Filename)%(LaidOutSdk_BuildGenerateDepsFiles.Extension)"' />
+
       <LaidOutSdk_BuildCrossTargetingFiles Include="$(PackagesLayoutDir)buildCrossTargeting\*" />
       <SdkSwrLines Include='$(SdkSwrBlankLine)folder "InstallDir:MSBuild\Sdks\Microsoft.NET.Sdk\buildCrossTargeting"' />
       <SdkSwrLines Include='%20%20file source="%24(OutputPath)PackagesLayout\buildCrossTargeting\%(LaidOutSdk_BuildCrossTargetingFiles.Filename)%(LaidOutSdk_BuildCrossTargetingFiles.Extension)"' />      
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj b/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
new file mode 100644
index 000000000000..d7e237077338
--- /dev/null
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="BuildDepsJson">
+  <!--
+***********************************************************************************************
+GenerateDeps.proj
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved. 
+***********************************************************************************************
+-->
+  
+  <!--
+    This project is built by the .NET CLI in order to create .deps.json files for .NET CLI tools.
+    Properties to be passed in by the .NET CLI:
+      - ProjectAssetsFile: Full path to the project.assets.json file for the tool under the NuGet .tools folder
+      - ToolName: The simple name of the tool DLL, for example, "dotnet-mytool"
+      - AdditionalImport: The full path to the .props file from the platform package which will be imported, which
+        should include the PackageConflictPlatformManifests file.      
+        This is a workaround until NuGet can generate .props and .targets files for imports from packages referenced
+        by tools, which is tracked by https://github.com/NuGet/Home/issues/5037.
+  -->
+
+  <Import Project="$(AdditionalImport)"
+          Condition=" '$(AdditionalImport)' != '' And Exists($(AdditionalImport))" />
+  
+  <PropertyGroup>
+    <TargetFramework>netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</TargetFramework>
+
+    <ToolFolder>$([System.IO.Path]::GetDirectoryName($(ProjectAssetsFile)))</ToolFolder>
+    <ProjectDepsFilePath>$(ToolFolder)\$(ToolName).deps.json</ProjectDepsFilePath>
+    
+    <OutputType>Exe</OutputType>
+    <IncludeMainProjectInDepsFile>false</IncludeMainProjectInDepsFile>
+  </PropertyGroup>
+
+  <Target Name="BuildDepsJson" DependsOnTargets="$(ResolvePackageDependenciesForBuildDependsOn);GenerateBuildDependencyFile" />
+
+  <Target Name="DontRestore" BeforeTargets="Restore">
+    <Error Text="This project should not be restored" />
+  </Target>
+
+</Project>

From 645556befcca8960e44b7336923e090586e4fdcc Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 17 Apr 2017 22:12:52 -0700
Subject: [PATCH 03/11] Set the TFM used to restore .NET CLI tools to match the
 version of .NET Core bundled in the CLI

Also include GenerateDeps.proj in tasks project
---
 .../Microsoft.NET.Build.Tasks.csproj                         | 3 +++
 .../build/Microsoft.NET.Sdk.targets                          | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
index 131c60ecb85f..6355c740dc98 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -188,6 +188,9 @@
       <DependentUpon>Strings.resx</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="build\GenerateDeps\GenerateDeps.proj" />
+  </ItemGroup>
   <!-- Remove files from copy local that would not be published as they are provided by the platform package -->
   <!-- https://github.com/dotnet/sdk/issues/933 tracks a first class feature for this -->
   <Target Name="FilterCopyLocal" DependsOnTargets="RunResolvePublishAssemblies" BeforeTargets="ResolveLockFileCopyLocalProjectDeps">
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
index bf27be9de083..db5cbac2332a 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
@@ -62,6 +62,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_DotNetHostPolicyLibraryName>$(_NativeLibraryPrefix)hostpolicy$(_NativeLibraryExtension)</_DotNetHostPolicyLibraryName>
     <_DotNetHostFxrLibraryName>$(_NativeLibraryPrefix)hostfxr$(_NativeLibraryExtension)</_DotNetHostFxrLibraryName>
   </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(DotnetCliToolTargetFramework)' == '' And '$(BundledNETCoreAppTargetFrameworkVersion)' != ''">
+    <!-- Set the TFM used to restore .NET CLI tools to match the version of .NET Core bundled in the CLI -->
+    <DotnetCliToolTargetFramework>netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</DotnetCliToolTargetFramework>
+  </PropertyGroup>
 
   <PropertyGroup>
     <CoreBuildDependsOn>

From 0478a81a93feb39e49401af58dbd4d8316a5a995 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 18 Apr 2017 22:17:09 -0700
Subject: [PATCH 04/11] Include GenerateDeps.proj in SDK layout, and set
 property for .NET CLI to use to get the path to it in the SDK

---
 .../Microsoft.NET.Build.Tasks.csproj                         | 4 +++-
 .../build/GenerateDeps/GenerateDeps.proj                     | 2 +-
 .../Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props  | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
index 6355c740dc98..9f0a4b2eb4fa 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -189,7 +189,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="build\GenerateDeps\GenerateDeps.proj" />
+    <None Include="build\GenerateDeps\GenerateDeps.proj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <!-- Remove files from copy local that would not be published as they are provided by the platform package -->
   <!-- https://github.com/dotnet/sdk/issues/933 tracks a first class feature for this -->
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj b/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
index d7e237077338..583c9c0aea26 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
@@ -29,7 +29,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <TargetFramework>netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</TargetFramework>
 
     <ToolFolder>$([System.IO.Path]::GetDirectoryName($(ProjectAssetsFile)))</ToolFolder>
-    <ProjectDepsFilePath>$(ToolFolder)\$(ToolName).deps.json</ProjectDepsFilePath>
+    <ProjectDepsFilePath Condition="'$(ProjectDepsFilePath)' == ''">$(ToolFolder)\$(ToolName).deps.json</ProjectDepsFilePath>
     
     <OutputType>Exe</OutputType>
     <IncludeMainProjectInDepsFile>false</IncludeMainProjectInDepsFile>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props
index 8333c8e1f879..fe7f2001550f 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props
@@ -103,6 +103,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <DebugSymbols Condition="'$(DebugSymbols)'==''">false</DebugSymbols>
     <CheckForOverflowUnderflow Condition="'$(CheckForOverflowUnderflow)'==''">false</CheckForOverflowUnderflow>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Path to project that the .NET CLI will build in order to generate deps.json files for .NET CLI tools -->
+    <ToolDepsJsonGeneratorProject>$(MSBuildThisFileDirectory)GenerateDeps\GenerateDeps.proj</ToolDepsJsonGeneratorProject>
+  </PropertyGroup>
   
   <!-- Default item includes (globs and implicit references) -->
   <Import Project="Microsoft.NET.Sdk.DefaultItems.props" />

From 9e7d1b805758c817bc9c33c4bf82cd5aa9d78150 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 24 Apr 2017 16:32:19 -0700
Subject: [PATCH 05/11] Set DotnetCliToolTargetFramework in crosstargeting
 builds

---
 .../build/Microsoft.NET.Sdk.Common.targets                   | 4 ++++
 .../build/Microsoft.NET.Sdk.targets                          | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.Common.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.Common.targets
index 1cdc34e1eca1..fe9b99e822ea 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.Common.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.Common.targets
@@ -28,6 +28,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     <DefaultImplicitPackages>Microsoft.NETCore.App;NETStandard.Library</DefaultImplicitPackages>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(DotnetCliToolTargetFramework)' == '' And '$(BundledNETCoreAppTargetFrameworkVersion)' != ''">
+    <!-- Set the TFM used to restore .NET CLI tools to match the version of .NET Core bundled in the CLI -->
+    <DotnetCliToolTargetFramework>netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</DotnetCliToolTargetFramework>
+  </PropertyGroup>
 
   <UsingTask TaskName="GetNearestTargetFramework" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
   <UsingTask TaskName="NETSdkError" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
index db5cbac2332a..01d9ee7920a7 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
@@ -63,11 +63,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_DotNetHostFxrLibraryName>$(_NativeLibraryPrefix)hostfxr$(_NativeLibraryExtension)</_DotNetHostFxrLibraryName>
   </PropertyGroup>
   
-  <PropertyGroup Condition="'$(DotnetCliToolTargetFramework)' == '' And '$(BundledNETCoreAppTargetFrameworkVersion)' != ''">
-    <!-- Set the TFM used to restore .NET CLI tools to match the version of .NET Core bundled in the CLI -->
-    <DotnetCliToolTargetFramework>netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</DotnetCliToolTargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup>
     <CoreBuildDependsOn>
       $(CoreBuildDependsOn);

From 4d1ab8cf5d805493430baff69609efb02a976691 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 27 Apr 2017 00:38:12 -0700
Subject: [PATCH 06/11] Apply code review feedback

---
 .../GivenADependencyContextBuilder.cs         |  3 +-
 .../DependencyContextBuilder.cs               | 74 +++++++++----------
 .../GenerateDepsFile.cs                       | 13 +---
 .../build/GenerateDeps/GenerateDeps.proj      |  2 -
 .../build/Microsoft.NET.Publish.targets       |  1 -
 .../build/Microsoft.NET.Sdk.targets           |  5 +-
 6 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs
index dd0f869bbc9a..e6860b12e721 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs
@@ -52,8 +52,7 @@ public void ItBuildsDependencyContextsFromProjectLockFiles(
                 Constants.DefaultPlatformLibrary,
                 isSelfContained: !string.IsNullOrEmpty(runtime));
 
-            DependencyContext dependencyContext = new DependencyContextBuilder(projectContext)
-                .WithMainProject(mainProject)
+            DependencyContext dependencyContext = new DependencyContextBuilder(mainProject, projectContext)
                 .WithDirectReferences(directReferences)
                 .WithCompilationOptions(compilationOptions)
                 .Build();
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
index 257178a8eb00..74e9659d3a3b 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
@@ -18,7 +18,7 @@ namespace Microsoft.NET.Build.Tasks
     internal class DependencyContextBuilder
     {
         private readonly VersionFolderPathResolver _versionFolderPathResolver;
-        private SingleProjectInfo _mainProjectInfo;
+        private readonly SingleProjectInfo _mainProjectInfo;
         private readonly ProjectContext _projectContext;
         private IEnumerable<ReferenceInfo> _frameworkReferences;
         private IEnumerable<ReferenceInfo> _directReferences;
@@ -27,18 +27,20 @@ internal class DependencyContextBuilder
         private CompilationOptions _compilationOptions;
         private string _referenceAssembliesPath;
         private Dictionary<PackageIdentity, StringBuilder> _filteredPackages;
+        private bool _includeMainProjectInDepsFile = true;
 
-        public DependencyContextBuilder(ProjectContext projectContext)
+        public DependencyContextBuilder(SingleProjectInfo mainProjectInfo, ProjectContext projectContext)
         {
+            _mainProjectInfo = mainProjectInfo;
             _projectContext = projectContext;
 
             // This resolver is only used for building file names, so that base path is not required.
             _versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
         }
 
-        public DependencyContextBuilder WithMainProject(SingleProjectInfo mainProjectInfo)
+        public DependencyContextBuilder WithMainProjectInDepsFile(bool includeMainProjectInDepsFile)
         {
-            _mainProjectInfo = mainProjectInfo;
+            _includeMainProjectInDepsFile = includeMainProjectInDepsFile;
             return this;
         }
 
@@ -106,32 +108,40 @@ public DependencyContext Build()
 
             var runtimeSignature = GenerateRuntimeSignature(runtimeExports);
 
-            RuntimeLibrary projectRuntimeLibrary = GetProjectRuntimeLibrary(
-                _mainProjectInfo,
-                _projectContext,
-                dependencyLookup);
-            IEnumerable<RuntimeLibrary> runtimeLibraries =
-                (projectRuntimeLibrary == null ? Enumerable.Empty<RuntimeLibrary>() : new[] { projectRuntimeLibrary })
+            IEnumerable<RuntimeLibrary> runtimeLibraries = Enumerable.Empty<RuntimeLibrary>();
+            if (_includeMainProjectInDepsFile)
+            {
+                runtimeLibraries = runtimeLibraries.Concat(new[]
+                {
+                    GetProjectRuntimeLibrary(
+                        _mainProjectInfo,
+                        _projectContext,
+                        dependencyLookup)
+                });
+            }
+            runtimeLibraries = runtimeLibraries
                 .Concat(GetLibraries(runtimeExports, libraryLookup, dependencyLookup, runtime: true).Cast<RuntimeLibrary>())
                 .Concat(GetDirectReferenceRuntimeLibraries());
 
-            IEnumerable<CompilationLibrary> compilationLibraries;
+            IEnumerable<CompilationLibrary> compilationLibraries = Enumerable.Empty<CompilationLibrary>();
             if (includeCompilationLibraries)
             {
-                CompilationLibrary projectCompilationLibrary = GetProjectCompilationLibrary(
-                    _mainProjectInfo,
-                    _projectContext,
-                    dependencyLookup);
-                compilationLibraries =
-                    (projectCompilationLibrary == null ? Enumerable.Empty<CompilationLibrary>() : new[] { projectCompilationLibrary })
+                if (_includeMainProjectInDepsFile)
+                {
+                    compilationLibraries = compilationLibraries.Concat(new[]
+                    {
+                        GetProjectCompilationLibrary(
+                            _mainProjectInfo,
+                            _projectContext,
+                            dependencyLookup)
+                    });
+                }
+
+                compilationLibraries = compilationLibraries
                     .Concat(GetFrameworkLibraries())
                     .Concat(GetLibraries(compilationExports, libraryLookup, dependencyLookup, runtime: false).Cast<CompilationLibrary>())
                     .Concat(GetDirectReferenceCompilationLibraries());
             }
-            else
-            {
-                compilationLibraries = Enumerable.Empty<CompilationLibrary>();
-            }
 
             var targetInfo = new TargetInfo(
                 _projectContext.LockFileTarget.TargetFramework.DotNetFrameworkName,
@@ -238,11 +248,6 @@ private RuntimeLibrary GetProjectRuntimeLibrary(
             ProjectContext projectContext,
             Dictionary<string, Dependency> dependencyLookup)
         {
-            if (projectInfo == null)
-            {
-                return null;
-            }
-
             RuntimeAssetGroup[] runtimeAssemblyGroups = new[] { new RuntimeAssetGroup(string.Empty, projectInfo.OutputName) };
 
             List<Dependency> dependencies = GetProjectDependencies(projectContext, dependencyLookup);
@@ -264,11 +269,6 @@ private CompilationLibrary GetProjectCompilationLibrary(
             ProjectContext projectContext,
             Dictionary<string, Dependency> dependencyLookup)
         {
-            if (projectInfo == null)
-            {
-                return null;
-            }
-
             List<Dependency> dependencies = GetProjectDependencies(projectContext, dependencyLookup);
 
             return new CompilationLibrary(
@@ -538,16 +538,8 @@ private SingleProjectInfo GetProjectInfo(LockFileLibrary library)
                 throw new BuildErrorException(Strings.CannotFindProjectInfo, library.Name);
             }
 
-            string fullProjectPath;
-            if (_mainProjectInfo != null)
-            {
-                string mainProjectDirectory = Path.GetDirectoryName(_mainProjectInfo.ProjectPath);
-                fullProjectPath = Path.GetFullPath(Path.Combine(mainProjectDirectory, projectPath));
-            }
-            else
-            {
-                fullProjectPath = Path.GetFullPath(projectPath);
-            }
+            string mainProjectDirectory = Path.GetDirectoryName(_mainProjectInfo.ProjectPath);
+            string fullProjectPath = Path.GetFullPath(Path.Combine(mainProjectDirectory, projectPath));
 
             SingleProjectInfo referenceProjectInfo = null;
             if (_referenceProjectInfos?.TryGetValue(fullProjectPath, out referenceProjectInfo) != true ||
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
index da1529bf889a..5d6d39a76290 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
@@ -119,17 +119,12 @@ protected override void ExecuteCore()
             LockFile lockFile = new LockFileCache(BuildEngine4).GetLockFile(AssetsFilePath);
             CompilationOptions compilationOptions = CompilationOptionsConverter.ConvertFrom(CompilerOptions);
 
-            SingleProjectInfo mainProject = null;
-
-            if (IncludeMainProject)
-            {
-                mainProject = SingleProjectInfo.Create(
+            SingleProjectInfo mainProject = SingleProjectInfo.Create(
                     ProjectPath,
                     AssemblyName,
                     AssemblyExtension,
                     AssemblyVersion,
-                    AssemblySatelliteAssemblies);
-            }
+                    AssemblySatelliteAssemblies);            
 
             IEnumerable<ReferenceInfo> frameworkReferences =
                 ReferenceInfo.CreateFrameworkReferenceInfos(ReferencePaths);
@@ -149,8 +144,8 @@ protected override void ExecuteCore()
                 PlatformLibraryName,
                 IsSelfContained);
 
-            DependencyContext dependencyContext = new DependencyContextBuilder(projectContext)
-                .WithMainProject(mainProject)
+            DependencyContext dependencyContext = new DependencyContextBuilder(mainProject, projectContext)
+                .WithMainProjectInDepsFile(IncludeMainProject)
                 .WithFrameworkReferences(frameworkReferences)
                 .WithDirectReferences(directReferences)
                 .WithReferenceProjectInfos(referenceProjects)
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj b/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
index 583c9c0aea26..9a6ba50b67f6 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/GenerateDeps/GenerateDeps.proj
@@ -26,8 +26,6 @@ Copyright (c) .NET Foundation. All rights reserved.
           Condition=" '$(AdditionalImport)' != '' And Exists($(AdditionalImport))" />
   
   <PropertyGroup>
-    <TargetFramework>netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</TargetFramework>
-
     <ToolFolder>$([System.IO.Path]::GetDirectoryName($(ProjectAssetsFile)))</ToolFolder>
     <ProjectDepsFilePath Condition="'$(ProjectDepsFilePath)' == ''">$(ToolFolder)\$(ToolName).deps.json</ProjectDepsFilePath>
     
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets
index 7ef0be1ed896..fa42fc1ae9ba 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets
@@ -468,7 +468,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <PropertyGroup>
       <PublishDepsFilePath Condition=" '$(PublishDepsFilePath)' == '' ">$(PublishDir)$(ProjectDepsFileName)</PublishDepsFilePath>
-      <IncludeMainProjectInDepsFile Condition=" '$(IncludeMainProjectInDepsFile)' == '' ">true</IncludeMainProjectInDepsFile>
     </PropertyGroup>
 
     <GenerateDepsFile ProjectPath="$(MSBuildProjectFullPath)"
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
index 01d9ee7920a7..87fe47cbbaa7 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
@@ -45,6 +45,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ProjectRuntimeConfigFileName Condition="'$(ProjectRuntimeConfigFileName)' == ''">$(AssemblyName).runtimeconfig.json</ProjectRuntimeConfigFileName>
     <ProjectRuntimeConfigFilePath Condition="'$(ProjectRuntimeConfigFilePath)' == ''">$(TargetDir)$(ProjectRuntimeConfigFileName)</ProjectRuntimeConfigFilePath>
     <ProjectRuntimeConfigDevFilePath Condition="'$(ProjectRuntimeConfigDevFilePath)' == ''">$(TargetDir)$(AssemblyName).runtimeconfig.dev.json</ProjectRuntimeConfigDevFilePath>
+    <IncludeMainProjectInDepsFile Condition=" '$(IncludeMainProjectInDepsFile)' == '' ">true</IncludeMainProjectInDepsFile>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -86,10 +87,6 @@ Copyright (c) .NET Foundation. All rights reserved.
           Inputs="$(ProjectAssetsFile)"
           Outputs="$(ProjectDepsFilePath)">
 
-    <PropertyGroup>
-      <IncludeMainProjectInDepsFile Condition=" '$(IncludeMainProjectInDepsFile)' == '' ">true</IncludeMainProjectInDepsFile>
-    </PropertyGroup>
-    
     <!-- 
     Explicitly not passing any PrivateAssets information during 'Build', since these dependencies
     should be included during 'Build'.  They are only excluded on 'Publish'.

From 60e0b73f45f91583bb9672126905bf4f8b86adf3 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 27 Apr 2017 07:37:40 -0700
Subject: [PATCH 07/11] Add tests for tool deps file generation

---
 ...tToExcludeTheMainProjectFromTheDepsFile.cs |  62 +++++
 ...enThatWeWantToGenerateADepsFileForATool.cs | 239 ++++++++++++++++++
 .../Commands/MSBuildTest.cs                   |   5 +-
 test/Microsoft.NET.TestFramework/RepoInfo.cs  |  12 +-
 4 files changed, 313 insertions(+), 5 deletions(-)
 create mode 100644 test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs
 create mode 100644 test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs
new file mode 100644
index 000000000000..72977de498e7
--- /dev/null
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs
@@ -0,0 +1,62 @@
+using FluentAssertions;
+using Microsoft.NET.TestFramework;
+using Microsoft.NET.TestFramework.Assertions;
+using Microsoft.NET.TestFramework.Commands;
+using Microsoft.NET.TestFramework.ProjectConstruction;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml.Linq;
+using Xunit;
+
+using static Microsoft.NET.TestFramework.Commands.MSBuildTest;
+
+namespace Microsoft.NET.Build.Tests
+{
+    public class GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile : SdkTest
+    {
+        [Fact]
+        public void It_builds_successfully()
+        {
+            TestProject testProject = new TestProject()
+            {
+                Name = "ExcludeMainProjectFromDeps",
+                IsSdkProject = true,
+                TargetFrameworks = "netcoreapp2.0",
+                IsExe = true,
+            };
+
+            TestProject referencedProject = new TestProject()
+            {
+                Name = "ReferencedProject",
+                IsSdkProject = true,
+                TargetFrameworks = "netstandard2.0",
+                IsExe = false
+            };
+
+            testProject.ReferencedProjects.Add(referencedProject);
+
+            var testProjectInstance = _testAssetsManager.CreateTestProject(testProject, testProject.Name)
+                .WithProjectChanges((path, project) =>
+                {
+                    if (Path.GetFileNameWithoutExtension(path) == testProject.Name)
+                    {
+                        var ns = project.Root.Name.Namespace;
+
+                        var propertyGroup = new XElement(ns + "PropertyGroup");
+                        project.Root.Add(propertyGroup);
+
+                        propertyGroup.Add(new XElement(ns + "IncludeMainProjectInDepsFile", "false"));
+                    }
+                })
+                .Restore(testProject.Name);
+
+            var buildCommand = new BuildCommand(Stage0MSBuild, testProjectInstance.TestRoot, testProject.Name);
+
+            buildCommand.Execute()
+                .Should()
+                .Pass();
+        }
+    }
+}
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
new file mode 100644
index 000000000000..0bb04837637d
--- /dev/null
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
@@ -0,0 +1,239 @@
+using FluentAssertions;
+using Microsoft.DotNet.Cli.Utils;
+using Microsoft.NET.TestFramework;
+using Microsoft.NET.TestFramework.Assertions;
+using Microsoft.NET.TestFramework.Commands;
+using Microsoft.NET.TestFramework.ProjectConstruction;
+using NuGet.Packaging;
+using NuGet.ProjectModel;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Xml.Linq;
+using Xunit;
+using static Microsoft.NET.TestFramework.Commands.MSBuildTest;
+
+namespace Microsoft.NET.Build.Tests
+{
+    public class GivenThatWeWantToGenerateADepsFileForATool : SdkTest
+    {
+        [Fact]
+        public void It_creates_a_deps_file_for_the_tool_and_the_tool_runs()
+        {
+            TestProject toolProject = new TestProject()
+            {
+                Name = "TestTool",
+                IsSdkProject = true,
+                TargetFrameworks = "netcoreapp2.0",
+                IsExe = true
+            };
+
+            GenerateDepsAndRunTool(toolProject)
+                .Should()
+                .Pass()
+                .And.HaveStdOutContaining("Hello World!");
+        }
+
+        [Fact]
+        public void It_handles_conflicts_when_creating_a_tool_deps_file()
+        {
+            TestProject toolProject = new TestProject()
+            {
+                Name = "DependencyContextTool",
+                IsSdkProject = true,
+                TargetFrameworks = "netcoreapp2.0",
+                IsExe = true
+            };
+
+            toolProject.PackageReferences.Add(new TestPackageReference("Microsoft.Extensions.DependencyModel", "2.0.0-preview1-002022", null));
+
+            string toolSource = @"
+using System;
+using System.Linq;
+using Microsoft.Extensions.DependencyModel;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        if(DependencyContext.Default?.RuntimeGraph?.Any() == true)
+        {
+            Console.WriteLine(""Successfully loaded runtime graph"");
+        }
+        else
+        {
+            Console.WriteLine(""Couldn't load runtime graph"");
+        }
+    }
+}";
+
+            toolProject.SourceFiles.Add("Program.cs", toolSource);
+
+            GenerateDepsAndRunTool(toolProject, "ToolConflictResolution")
+                .Should()
+                .Pass()
+                .And.HaveStdOutContaining("Successfully loaded runtime graph");
+        }
+
+        //  This method duplicates a lot of logic from the CLI in order to test generating deps files for tools in the SDK repo
+        private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMemberName] string callingMethod = "")
+        {
+            DeleteFolder(Path.Combine(RepoInfo.NuGetCachePath, toolProject.Name.ToLowerInvariant()));
+            DeleteFolder(Path.Combine(RepoInfo.NuGetCachePath, ".tools", toolProject.Name.ToLowerInvariant()));
+
+            var toolProjectInstance = _testAssetsManager.CreateTestProject(toolProject, callingMethod, identifier: toolProject.Name)
+                .Restore(toolProject.Name);
+
+            var packCommand = new PackCommand(Stage0MSBuild, Path.Combine(toolProjectInstance.TestRoot, toolProject.Name));
+
+            packCommand.Execute()
+                .Should()
+                .Pass();
+
+            string nupkgPath = Path.Combine(packCommand.ProjectRootPath, "bin", "Debug");
+
+            TestProject toolReferencer = new TestProject()
+            {
+                Name = "ToolReferencer",
+                IsSdkProject = true,
+                TargetFrameworks = "netcoreapp2.0"
+            };
+
+            var toolReferencerInstance = _testAssetsManager.CreateTestProject(toolReferencer, callingMethod, identifier: toolReferencer.Name)
+                .WithProjectChanges(project =>
+                {
+                    var ns = project.Root.Name.Namespace;
+
+                    var itemGroup = new XElement(ns + "ItemGroup");
+                    project.Root.Add(itemGroup);
+
+                    itemGroup.Add(new XElement(ns + "DotNetCliToolReference",
+                        new XAttribute("Include", toolProject.Name),
+                        new XAttribute("Version", "1.0.0")));
+                });
+
+            var restoreCommand = toolReferencerInstance.GetRestoreCommand(toolReferencer.Name);
+            restoreCommand.AddSource(nupkgPath);
+            restoreCommand.Execute().Should().Pass();
+
+            string toolAssetsFilePath = Path.Combine(RepoInfo.NuGetCachePath, ".tools", toolProject.Name, "1.0.0", toolProject.TargetFrameworks, "project.assets.json");
+            var toolAssetsFile = new LockFileFormat().Read(toolAssetsFilePath);
+
+            var args = new List<string>();
+
+            string generateDepsProjectPath = Path.Combine(RepoInfo.SdksPath, "Microsoft.NET.Sdk", "build", "GenerateDeps", "GenerateDeps.proj");
+            args.Add(generateDepsProjectPath);
+            
+            args.Add($"/p:ProjectAssetsFile=\"{toolAssetsFilePath}\"");
+
+            args.Add($"/p:ToolName={toolProject.Name}");
+
+            string depsFilePath = Path.Combine(Path.GetDirectoryName(toolAssetsFilePath), toolProject.Name + ".deps.json");
+            args.Add($"/p:ProjectDepsFilePath={depsFilePath}");
+
+            var toolTargetFramework = toolAssetsFile.Targets.First().TargetFramework.GetShortFolderName();
+            args.Add($"/p:TargetFramework={toolProject.TargetFrameworks}");
+
+            //  Look for the .props file in the Microsoft.NETCore.App package, until NuGet
+            //  generates .props and .targets files for tool restores (https://github.com/NuGet/Home/issues/5037)
+            var platformLibrary = toolAssetsFile.Targets
+                .Single()
+                .Libraries
+                .FirstOrDefault(e => e.Name.Equals("Microsoft.NETCore.App", StringComparison.OrdinalIgnoreCase));
+
+            if (platformLibrary != null)
+            {
+                string buildRelativePath = platformLibrary.Build.FirstOrDefault()?.Path;
+
+                var platformLibraryPath = GetPackageDirectory(toolAssetsFile, platformLibrary);
+
+                if (platformLibraryPath != null && buildRelativePath != null)
+                {
+                    //  Get rid of "_._" filename
+                    buildRelativePath = Path.GetDirectoryName(buildRelativePath);
+
+                    string platformLibraryBuildFolderPath = Path.Combine(platformLibraryPath, buildRelativePath);
+                    var platformLibraryPropsFile = Directory.GetFiles(platformLibraryBuildFolderPath, "*.props").FirstOrDefault();
+
+                    if (platformLibraryPropsFile != null)
+                    {
+                        args.Add($"/p:AdditionalImport={platformLibraryPropsFile}");
+                    }
+                }
+            }
+
+            var generateDepsCommand = Stage0MSBuild.CreateCommandForTarget("BuildDepsJson", args.ToArray());
+
+            generateDepsCommand.Execute()
+                .Should()
+                .Pass();
+
+            var toolLibrary = toolAssetsFile.Targets
+                .Single()
+                .Libraries.FirstOrDefault(
+                    l => StringComparer.OrdinalIgnoreCase.Equals(l.Name, toolProject.Name));
+
+            var toolAssembly = toolLibrary?.RuntimeAssemblies
+                .FirstOrDefault(r => Path.GetFileNameWithoutExtension(r.Path) == toolProject.Name);
+
+            var toolPackageDirectory = GetPackageDirectory(toolAssetsFile, toolLibrary);
+
+            var toolAssemblyPath = Path.Combine(
+                toolPackageDirectory,
+                toolAssembly.Path);
+
+            var dotnetArgs = new List<string>();
+            dotnetArgs.Add("exec");
+
+            dotnetArgs.Add("--depsfile");
+            dotnetArgs.Add(depsFilePath);
+
+            foreach (var packageFolder in GetNormalizedPackageFolders(toolAssetsFile))
+            {
+                dotnetArgs.Add("--additionalprobingpath");
+                dotnetArgs.Add(packageFolder);
+            }
+
+            dotnetArgs.Add(toolAssemblyPath);
+
+            ICommand toolCommand = Command.Create(RepoInfo.DotNetHostPath, dotnetArgs)
+                .CaptureStdOut();
+            toolCommand = RepoInfo.AddTestEnvironmentVariables(toolCommand);
+
+
+            var toolResult = toolCommand.Execute();
+
+            return toolResult;
+        }
+
+        private static void DeleteFolder(string path)
+        {
+            if (Directory.Exists(path))
+            {
+                Directory.Delete(path, true);
+            }
+        }
+
+        private static IEnumerable<string> GetNormalizedPackageFolders(LockFile lockFile)
+        {
+            return lockFile.PackageFolders.Select(pf => pf.Path.TrimEnd(Path.DirectorySeparatorChar));
+        }
+
+        private static string GetPackageDirectory(LockFile lockFile, LockFileTargetLibrary library)
+        {
+            var packageFolders = GetNormalizedPackageFolders(lockFile);
+
+            var packageFoldersCount = packageFolders.Count();
+            var userPackageFolder = packageFoldersCount == 1 ? string.Empty : packageFolders.First();
+            var fallbackPackageFolders = packageFoldersCount > 1 ? packageFolders.Skip(1) : packageFolders;
+
+            var packageDirectory = new FallbackPackagePathResolver(userPackageFolder, fallbackPackageFolders)
+                .GetPackageDirectory(library.Name, library.Version);
+
+            return packageDirectory;
+        }
+    }
+}
diff --git a/test/Microsoft.NET.TestFramework/Commands/MSBuildTest.cs b/test/Microsoft.NET.TestFramework/Commands/MSBuildTest.cs
index 66b1884912d2..e53a4a7acde4 100644
--- a/test/Microsoft.NET.TestFramework/Commands/MSBuildTest.cs
+++ b/test/Microsoft.NET.TestFramework/Commands/MSBuildTest.cs
@@ -45,10 +45,7 @@ private ICommand CreateCommand(params string[] args)
                 command = Command.Create(DotNetHostPath, newArgs);
             }
 
-            //  Set NUGET_PACKAGES environment variable to match value from build.ps1
-            command = command.EnvironmentVariable("NUGET_PACKAGES", Path.Combine(RepoInfo.RepoRoot, "packages"));
-
-            command = command.EnvironmentVariable("MSBuildSDKsPath", RepoInfo.SdksPath);
+            command = RepoInfo.AddTestEnvironmentVariables(command);
 
             return command;
         }
diff --git a/test/Microsoft.NET.TestFramework/RepoInfo.cs b/test/Microsoft.NET.TestFramework/RepoInfo.cs
index c66df5cade78..df036583141e 100644
--- a/test/Microsoft.NET.TestFramework/RepoInfo.cs
+++ b/test/Microsoft.NET.TestFramework/RepoInfo.cs
@@ -69,7 +69,7 @@ public static string PackagesPath
 
         public static string NuGetCachePath
         {
-            get { return Path.Combine(RepoRoot, "Packages"); }
+            get { return Path.Combine(RepoRoot, "packages"); }
         }
 
 
@@ -102,5 +102,15 @@ public static string GetBaseDirectory()
 
             return directory;
         }
+
+        public static ICommand AddTestEnvironmentVariables(ICommand command)
+        {
+            //  Set NUGET_PACKAGES environment variable to match value from build.ps1
+            command = command.EnvironmentVariable("NUGET_PACKAGES", Path.Combine(RepoInfo.RepoRoot, "packages"));
+
+            command = command.EnvironmentVariable("MSBuildSDKsPath", RepoInfo.SdksPath);
+
+            return command;
+        }
     }
 }
\ No newline at end of file

From 3aaabde484204de9602c267940eaa3116a43b0ef Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 27 Apr 2017 08:03:04 -0700
Subject: [PATCH 08/11] Fix path casing for deps file generation test

---
 .../GivenThatWeWantToGenerateADepsFileForATool.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
index 0bb04837637d..b1536c4aed89 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
@@ -119,7 +119,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem
             restoreCommand.AddSource(nupkgPath);
             restoreCommand.Execute().Should().Pass();
 
-            string toolAssetsFilePath = Path.Combine(RepoInfo.NuGetCachePath, ".tools", toolProject.Name, "1.0.0", toolProject.TargetFrameworks, "project.assets.json");
+            string toolAssetsFilePath = Path.Combine(RepoInfo.NuGetCachePath, ".tools", toolProject.Name.ToLowerInvariant(), "1.0.0", toolProject.TargetFrameworks, "project.assets.json");
             var toolAssetsFile = new LockFileFormat().Read(toolAssetsFilePath);
 
             var args = new List<string>();

From dc9139b9658dcfd19c7550ad6efd24f0b7a14693 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 27 Apr 2017 08:04:10 -0700
Subject: [PATCH 09/11] Use common variable for nuget cache path

---
 test/Microsoft.NET.TestFramework/RepoInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.NET.TestFramework/RepoInfo.cs b/test/Microsoft.NET.TestFramework/RepoInfo.cs
index df036583141e..1b13366c1f80 100644
--- a/test/Microsoft.NET.TestFramework/RepoInfo.cs
+++ b/test/Microsoft.NET.TestFramework/RepoInfo.cs
@@ -106,7 +106,7 @@ public static string GetBaseDirectory()
         public static ICommand AddTestEnvironmentVariables(ICommand command)
         {
             //  Set NUGET_PACKAGES environment variable to match value from build.ps1
-            command = command.EnvironmentVariable("NUGET_PACKAGES", Path.Combine(RepoInfo.RepoRoot, "packages"));
+            command = command.EnvironmentVariable("NUGET_PACKAGES", RepoInfo.NuGetCachePath);
 
             command = command.EnvironmentVariable("MSBuildSDKsPath", RepoInfo.SdksPath);
 

From cb5afa91bbebf8fb4f21123639f7539e8c056067 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 27 Apr 2017 08:33:42 -0700
Subject: [PATCH 10/11] Disable deps file generation tests on full framework
 MSBuild

---
 ...tToExcludeTheMainProjectFromTheDepsFile.cs | 10 ++++++++++
 ...enThatWeWantToGenerateADepsFileForATool.cs | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs
index 72977de498e7..d8f51e3be650 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile.cs
@@ -19,6 +19,16 @@ public class GivenThatWeWantToExcludeTheMainProjectFromTheDepsFile : SdkTest
         [Fact]
         public void It_builds_successfully()
         {
+            if (UsingFullFrameworkMSBuild)
+            {
+                //  Fullframework NuGet versioning on Jenkins infrastructure issue
+                //        https://github.com/dotnet/sdk/issues/1041
+
+                //  Disabled on full framework MSBuild until CI machines have VS with bundled .NET Core / .NET Standard versions
+                //  See https://github.com/dotnet/sdk/issues/1077
+                return;
+            }
+
             TestProject testProject = new TestProject()
             {
                 Name = "ExcludeMainProjectFromDeps",
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
index b1536c4aed89..517c9a0b09a4 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
@@ -23,6 +23,16 @@ public class GivenThatWeWantToGenerateADepsFileForATool : SdkTest
         [Fact]
         public void It_creates_a_deps_file_for_the_tool_and_the_tool_runs()
         {
+            if (UsingFullFrameworkMSBuild)
+            {
+                //  Fullframework NuGet versioning on Jenkins infrastructure issue
+                //        https://github.com/dotnet/sdk/issues/1041
+
+                //  Disabled on full framework MSBuild until CI machines have VS with bundled .NET Core / .NET Standard versions
+                //  See https://github.com/dotnet/sdk/issues/1077
+                return;
+            }
+
             TestProject toolProject = new TestProject()
             {
                 Name = "TestTool",
@@ -40,6 +50,16 @@ public void It_creates_a_deps_file_for_the_tool_and_the_tool_runs()
         [Fact]
         public void It_handles_conflicts_when_creating_a_tool_deps_file()
         {
+            if (UsingFullFrameworkMSBuild)
+            {
+                //  Fullframework NuGet versioning on Jenkins infrastructure issue
+                //        https://github.com/dotnet/sdk/issues/1041
+
+                //  Disabled on full framework MSBuild until CI machines have VS with bundled .NET Core / .NET Standard versions
+                //  See https://github.com/dotnet/sdk/issues/1077
+                return;
+            }
+
             TestProject toolProject = new TestProject()
             {
                 Name = "DependencyContextTool",

From ec5d03c574497d9533ae4d30181ac2acd3c42c50 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 27 Apr 2017 08:44:55 -0700
Subject: [PATCH 11/11] Use released version of
 Microsoft.Extensions.DependencyModel for test

---
 .../GivenThatWeWantToGenerateADepsFileForATool.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
index 517c9a0b09a4..13b62906055b 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
@@ -68,7 +68,7 @@ public void It_handles_conflicts_when_creating_a_tool_deps_file()
                 IsExe = true
             };
 
-            toolProject.PackageReferences.Add(new TestPackageReference("Microsoft.Extensions.DependencyModel", "2.0.0-preview1-002022", null));
+            toolProject.PackageReferences.Add(new TestPackageReference("Microsoft.Extensions.DependencyModel", "1.1.0", null));
 
             string toolSource = @"
 using System;