From b3f5174f0004c5e00e44852d1fff975d965e046e Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Tue, 9 Aug 2016 14:49:13 -0700
Subject: [PATCH] PR Feedback

---
 build/Microsoft.DotNet.Cli.Compile.targets      | 17 +++++++++++------
 .../Microsoft.NETCore.ImportBefore.props        |  0
 .../Microsoft.NuGet.ImportBefore.props          |  0
 .../Microsoft.NETCore.ImportAfter.targets       |  0
 .../Microsoft.NuGet.ImportAfter.targets         |  0
 .../Microsoft.DotNet.Core.Sdk.props             |  0
 .../Microsoft.DotNet.Core.Sdk.targets           |  0
 .../Microsoft.NETCore.ImportBefore.props        | 17 -----------------
 .../Microsoft.NuGet.ImportBefore.props          | 17 -----------------
 .../Microsoft.NETCore.ImportAfter.targets       | 17 -----------------
 .../Microsoft.NuGet.ImportAfter.targets         | 17 -----------------
 .../project.json                                |  2 +-
 src/csc/Program.cs                              | 11 -----------
 .../dotnet-build3/MSBuildForwardingApp.cs       | 10 ----------
 .../dotnet-restore/NuGetForwardingApp.cs        |  5 -----
 src/redist/project.json                         | 13 ++++++++++---
 src/{csc => tool_csc}/project.json              |  0
 src/{nuget => tool_nuget}/project.json          | 10 ----------
 18 files changed, 22 insertions(+), 114 deletions(-)
 rename resources/{core-sdk/14.1 => MSBuildImports/15.0}/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props (100%)
 rename resources/{core-sdk/14.1 => MSBuildImports/15.0}/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props (100%)
 rename resources/{core-sdk/14.1 => MSBuildImports/15.0}/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets (100%)
 rename resources/{core-sdk/14.1 => MSBuildImports/15.0}/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets (100%)
 rename resources/{core-sdk => MSBuildImports}/Microsoft.DotNet.Core.Sdk.props (100%)
 rename resources/{core-sdk => MSBuildImports}/Microsoft.DotNet.Core.Sdk.targets (100%)
 delete mode 100644 resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
 delete mode 100644 resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
 delete mode 100644 resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
 delete mode 100644 resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
 delete mode 100644 src/csc/Program.cs
 rename src/{csc => tool_csc}/project.json (100%)
 rename src/{nuget => tool_nuget}/project.json (54%)

diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
index 3d4ad94f0..c45734c14 100644
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Microsoft.DotNet.Cli.Compile.targets
@@ -5,7 +5,7 @@
 
   <PropertyGroup>
     <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
-    <CoreSDKDir>$(RepoRoot)/resources/core-sdk</CoreSDKDir>
+    <CoreSDKDir>$(RepoRoot)/resources/MSBuildImports</CoreSDKDir>
   </PropertyGroup>
 
   <ItemGroup>
@@ -80,10 +80,10 @@
         <SharedFramework Remove="*" />
         <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
 
-        <BinariesToRemove Remove="*" />
-        <BinariesToRemove Include="csc" />
-        <BinariesToRemove Include="vbc" />
-        <BinariesToRemove Include="MSBuild" />
+        <AssetsToRemoveFromDeps Remove="*" />
+        <AssetsToRemoveFromDeps Include="csc" />
+        <AssetsToRemoveFromDeps Include="vbc" />
+        <AssetsToRemoveFromDeps Include="MSBuild" />
       </ItemGroup>
 
       <Delete Files="@(BinObj)" />
@@ -131,7 +131,7 @@
 
       <RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
                                    SectionName="runtimeTargets"
-                                   AssetPath="$(BinaryToCorehostifyRelDir)/%(BinariesToRemove.Identity).exe" />
+                                   AssetPath="$(BinaryToCorehostifyRelDir)/%(AssetsToRemoveFromDeps.Identity).exe" />
 
       <Copy SourceFiles="$(SdkOutputDirectory)/%(FilesToMove.Identity)"
             DestinationFiles="$(SdkOutputDirectory)/%(FilesToMove.Filename).dll" />
@@ -212,6 +212,11 @@
       <Copy SourceFiles="@(MSBuildTargetsToCopy)"
             DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
 
+      <!-- Temporary workaround for MSBuild placing their .props files in the old 14.1 directory -->
+      <Move SourceFiles="$(SdkOutputDirectory)/14.1/Microsoft.Common.props"
+            DestinationFolder="$(SdkOutputDirectory)/15.0" />
+      <RemoveDir Directories="$(SdkOutputDirectory)/14.1" />
+
       <ItemGroup>
         <FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
       </ItemGroup>
diff --git a/resources/core-sdk/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props b/resources/MSBuildImports/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
similarity index 100%
rename from resources/core-sdk/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
rename to resources/MSBuildImports/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
diff --git a/resources/core-sdk/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props b/resources/MSBuildImports/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
similarity index 100%
rename from resources/core-sdk/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
rename to resources/MSBuildImports/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
diff --git a/resources/core-sdk/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
similarity index 100%
rename from resources/core-sdk/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
rename to resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
diff --git a/resources/core-sdk/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
similarity index 100%
rename from resources/core-sdk/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
rename to resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
diff --git a/resources/core-sdk/Microsoft.DotNet.Core.Sdk.props b/resources/MSBuildImports/Microsoft.DotNet.Core.Sdk.props
similarity index 100%
rename from resources/core-sdk/Microsoft.DotNet.Core.Sdk.props
rename to resources/MSBuildImports/Microsoft.DotNet.Core.Sdk.props
diff --git a/resources/core-sdk/Microsoft.DotNet.Core.Sdk.targets b/resources/MSBuildImports/Microsoft.DotNet.Core.Sdk.targets
similarity index 100%
rename from resources/core-sdk/Microsoft.DotNet.Core.Sdk.targets
rename to resources/MSBuildImports/Microsoft.DotNet.Core.Sdk.targets
diff --git a/resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props b/resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
deleted file mode 100644
index 8d4b59d14..000000000
--- a/resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-***********************************************************************************************
-Microsoft.NETCore.ImportBefore.props
-
-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. 
-***********************************************************************************************
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NETCoreProps Condition="'$(NETCoreProps)'==''">$(MSBuildExtensionsPath)\Microsoft.DotNet.Core.Sdk.props</NETCoreProps>
-  </PropertyGroup>
-  <Import Condition="Exists('$(NETCoreProps)')" Project="$(NETCoreProps)" />
-</Project>
diff --git a/resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props b/resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
deleted file mode 100644
index b535067fb..000000000
--- a/resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-***********************************************************************************************
-Microsoft.NuGet.ImportBefore.props
-
-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. 
-***********************************************************************************************
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetProps Condition="'$(NuGetProps)'==''">$(MSBuildExtensionsPath)\Microsoft.NuGet.props</NuGetProps>
-  </PropertyGroup>
-  <Import Condition="Exists('$(NuGetProps)')" Project="$(NuGetProps)" />
-</Project>
diff --git a/resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets b/resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
deleted file mode 100644
index 7f2fab3de..000000000
--- a/resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-***********************************************************************************************
-Microsoft.NETCore.ImportAfter.targets
-
-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. 
-***********************************************************************************************
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NETCoreTargets Condition="'$(NETCoreTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.DotNet.Core.Sdk.targets</NETCoreTargets>
-  </PropertyGroup>
-  <Import Condition="Exists('$(NETCoreTargets)')" Project="$(NETCoreTargets)" />
-</Project>
diff --git a/resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets b/resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
deleted file mode 100644
index b1da40f46..000000000
--- a/resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-***********************************************************************************************
-Microsoft.NuGet.ImportAfter.targets
-
-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. 
-***********************************************************************************************
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetTargets Condition="'$(NuGetTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.NuGet.targets</NuGetTargets>
-  </PropertyGroup>
-  <Import Condition="Exists('$(NuGetTargets)')" Project="$(NuGetTargets)" />
-</Project>
diff --git a/src/Microsoft.DotNet.Core.Build.Tasks/project.json b/src/Microsoft.DotNet.Core.Build.Tasks/project.json
index 58b48191e..3a8744936 100644
--- a/src/Microsoft.DotNet.Core.Build.Tasks/project.json
+++ b/src/Microsoft.DotNet.Core.Build.Tasks/project.json
@@ -8,7 +8,7 @@
     "Microsoft.Extensions.DependencyModel": {
       "target": "project"
     },
-    "NuGet.ProjectModel": "3.5.0-rc1-1653"
+    "NuGet.ProjectModel": "3.5.0-rc1-1697"
   },
   "frameworks": {
     "net451": {
diff --git a/src/csc/Program.cs b/src/csc/Program.cs
deleted file mode 100644
index 4aa370b90..000000000
--- a/src/csc/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace ConsoleApplication
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/dotnet/commands/dotnet-build3/MSBuildForwardingApp.cs b/src/dotnet/commands/dotnet-build3/MSBuildForwardingApp.cs
index 2550aa17f..d06bbbd81 100644
--- a/src/dotnet/commands/dotnet-build3/MSBuildForwardingApp.cs
+++ b/src/dotnet/commands/dotnet-build3/MSBuildForwardingApp.cs
@@ -52,16 +52,6 @@ namespace Microsoft.DotNet.Cli
             return new Muxer().MuxerPath;
         }
 
-        private static string GetRuntimeConfig()
-        {
-            return Path.Combine(AppContext.BaseDirectory, "msbuild.runtimeconfig.json");
-        }
-
-        private static string GetDepsFile()
-        {
-            return Path.Combine(AppContext.BaseDirectory, "msbuild.deps.json");
-        }
-
         private static string GetMSBuildExePath()
         {
             return Path.Combine(
diff --git a/src/dotnet/commands/dotnet-restore/NuGetForwardingApp.cs b/src/dotnet/commands/dotnet-restore/NuGetForwardingApp.cs
index aacbb8d53..a43e591e1 100644
--- a/src/dotnet/commands/dotnet-restore/NuGetForwardingApp.cs
+++ b/src/dotnet/commands/dotnet-restore/NuGetForwardingApp.cs
@@ -29,11 +29,6 @@ namespace Microsoft.DotNet.Tools.Restore
             return _forwardingApp.Execute();
         }
 
-        private static string GetHostPath()
-        {
-            return new Muxer().MuxerPath;
-        }
-
         private static string GetNuGetExePath()
         {
             return Path.Combine(
diff --git a/src/redist/project.json b/src/redist/project.json
index 1a82d2be8..42f112267 100644
--- a/src/redist/project.json
+++ b/src/redist/project.json
@@ -8,10 +8,17 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "csc": "1.0.0-featmsbuild-*",
+    "tool_csc": "1.0.0-featmsbuild-*",
     "dotnet": "1.0.0-featmsbuild-*",
-    "nuget": "1.0.0-featmsbuild-*",    
-    "tool_msbuild": "1.0.0-featmsbuild-*"
+    "tool_nuget": "1.0.0-featmsbuild-*",
+    "tool_msbuild": "1.0.0-featmsbuild-*",
+
+    "MSBuild": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Framework": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Targets": "0.1.0-preview-00029-160805",
+    "Microsoft.Build": "0.1.0-preview-00029-160805"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/src/csc/project.json b/src/tool_csc/project.json
similarity index 100%
rename from src/csc/project.json
rename to src/tool_csc/project.json
diff --git a/src/nuget/project.json b/src/tool_nuget/project.json
similarity index 54%
rename from src/nuget/project.json
rename to src/tool_nuget/project.json
index a1cd2078d..7af3cf800 100644
--- a/src/nuget/project.json
+++ b/src/tool_nuget/project.json
@@ -8,20 +8,10 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "NuGet.Commands": {
-      "version": "3.5.0-rc1-1697",
-      "exclude": "compile"
-    },
     "NuGet.CommandLine.XPlat": "3.5.0-rc1-1697"
   },
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "netstandardapp1.5",
-        "portable-net45+win8",
-        "portable-net45+wp80+win8+wpa81+dnxcore50"
-      ]
     }
   }
 }