From bccff16c183821fde3a75aa7fa51cdb82fe41654 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed, 20 Jul 2016 13:53:57 -0500
Subject: [PATCH] Round 2: rename the SDK NuGet package and add
 ImportBeforeAfter files to load them.

---
 Microsoft.DotNet.Cli.sln                      |  2 +-
 ....xproj => Microsoft.DotNet.Core.Sdk.xproj} |  0
 ....props => Microsoft.DotNet.Core.Sdk.props} | 38 +++++--------------
 ...gets => Microsoft.DotNet.Core.Sdk.targets} | 34 ++++++++---------
 .../Microsoft.NETCore.ImportBefore.props      | 17 +++++++++
 .../Microsoft.NETCore.ImportAfter.targets     | 17 +++++++++
 src/dotnet/project.json                       |  7 +++-
 7 files changed, 66 insertions(+), 49 deletions(-)
 rename src/Microsoft.DotNet.Core.MSBuild/{Microsoft.DotNet.Core.MSBuild.xproj => Microsoft.DotNet.Core.Sdk.xproj} (100%)
 rename src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/{Microsoft.DotNet.Core.MSBuild.props => Microsoft.DotNet.Core.Sdk.props} (64%)
 rename src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/{Microsoft.DotNet.Core.MSBuild.targets => Microsoft.DotNet.Core.Sdk.targets} (79%)
 create mode 100644 src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
 create mode 100644 src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 51b4b1340..bab871a95 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -147,7 +147,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2
 		build\test\TestPackageProjects.props = build\test\TestPackageProjects.props
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Core.MSBuild", "src\Microsoft.DotNet.Core.MSBuild\Microsoft.DotNet.Core.MSBuild.xproj", "{556554CA-6EC9-4007-A2C3-AB03DCF8F741}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Core.Sdk", "src\Microsoft.DotNet.Core.MSBuild\Microsoft.DotNet.Core.Sdk.xproj", "{556554CA-6EC9-4007-A2C3-AB03DCF8F741}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Core.Build.Tasks", "src\Microsoft.DotNet.Core.Build.Tasks\Microsoft.DotNet.Core.Build.Tasks.xproj", "{E8E7D24B-4830-4662-80A8-255D6FE3B0BE}"
 EndProject
diff --git a/src/Microsoft.DotNet.Core.MSBuild/Microsoft.DotNet.Core.MSBuild.xproj b/src/Microsoft.DotNet.Core.MSBuild/Microsoft.DotNet.Core.Sdk.xproj
similarity index 100%
rename from src/Microsoft.DotNet.Core.MSBuild/Microsoft.DotNet.Core.MSBuild.xproj
rename to src/Microsoft.DotNet.Core.MSBuild/Microsoft.DotNet.Core.Sdk.xproj
diff --git a/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.MSBuild.props b/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.props
similarity index 64%
rename from src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.MSBuild.props
rename to src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.props
index 4edfef47f..03ea8f6f0 100644
--- a/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.MSBuild.props
+++ b/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.props
@@ -1,32 +1,3 @@
-<!--<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <PlatformTarget Condition=" '$(PlatformTarget)' == '' ">x64</PlatformTarget>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
-    <TargetFrameworkIdentifier>NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <OutputPath>bin\$(Configuration)\netcoreapp1.0</OutputPath>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <NoStdLib>true</NoStdLib>
-    <NoLogo>true</NoLogo> -->
-<!-- Temp Hack: https://github.com/dotnet/roslyn/issues/12167 -->
-<!--
-    <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
-    -->
-<!-- Temp Hack: Being passed through from cli, where should this come from? -->
-<!--
-    <BaseNuGetRuntimeIdentifier Condition=" '$(BaseNuGetRuntimeIdentifier)' == '' ">win7</BaseNuGetRuntimeIdentifier>
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>none</DebugType>
-
-
-  </PropertyGroup>
-
-</Project>-->
-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
@@ -64,6 +35,15 @@
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
 
+  <!-- Default settings for .NET Core build logic -->
+  <PropertyGroup>
+    <GenerateDependencyFile Condition=" '$(GenerateDependencyFile)' == '' ">true</GenerateDependencyFile>
+    <GenerateRuntimeConfigurationFiles Condition=" '$(GenerateRuntimeConfigurationFiles)' == '' ">true</GenerateRuntimeConfigurationFiles>
+    
+    <!-- This will turn off the base 'ResolveNuGetPackages' target since it is UWP specific, and .NET Core needs it to be split up -->
+    <!--<ResolveNuGetPackages>false</ResolveNuGetPackages>-->
+  </PropertyGroup>
+  
   <PropertyGroup>
     <NoStdLib>true</NoStdLib>
     <!-- TODO: Need to figure out runtimes -->
diff --git a/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.MSBuild.targets b/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.targets
similarity index 79%
rename from src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.MSBuild.targets
rename to src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.targets
index 50df9b056..41ef7ce7a 100644
--- a/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.MSBuild.targets
+++ b/src/Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.targets
@@ -19,15 +19,15 @@
   <UsingTask TaskName="MakeNetCoreRunnable" AssemblyFile="$(MicrosoftDotNetCoreBuildTasksDirectory)/Microsoft.DotNet.Core.Build.Tasks.dll" />
              
   <PropertyGroup>
-    <!-- TODO Condition="IsNetCore" -->
     <CoreBuildDependsOn>
-      NetCorePreCoreBuild;
       $(CoreBuildDependsOn);
-      NetCorePostCoreBuild
+      GenerateDependencyFile;
+      GenerateRuntimeConfigurationFiles
     </CoreBuildDependsOn>
   </PropertyGroup>
 
-  <Target Name="MakeCompilationOutputRunnable">
+  <Target Name="GenerateDependencyFile"
+          Condition=" '$(GenerateDependencyFile)' == 'true'">
     <!--
     TODO: Is this the best way? Should we just tell CSC to output $(AssemblyName).dll directly?
     -->
@@ -42,10 +42,12 @@
                          OutputType="$(OutputType)" />
   </Target>
 
-  <Target Name="NetCorePreCoreBuild" />
+  <Target Name="GenerateRuntimeConfigurationFiles"
+        Condition=" '$(GenerateRuntimeConfigurationFiles)' == 'true'">
 
-  <Target Name="NetCorePostCoreBuild"
-          DependsOnTargets="MakeCompilationOutputRunnable" />
+    <!-- TODO: Split up MakeNetCoreRunnable and implement this target-->
+    <!-- Putting this here to show the structure that we should use in production -->
+  </Target>
 
   <!--
     ============================================================
@@ -57,23 +59,19 @@
 
   <PropertyGroup>
     <PublishDependsOn>
-      NetCorePublishPreBuild;
       Build;
-      NetCorePublishPostBuild
+      CopyPublishArtifacts
     </PublishDependsOn>
+
+    <PublishDir Condition=" '$(PublishDir)' == '' ">$(OutDir)publish\</PublishDir>
   </PropertyGroup>
+
   <Target
       Name="Publish"
       DependsOnTargets="$(PublishDependsOn)" />
 
-  <Target Name="NetCorePublishPreBuild">
-    <PropertyGroup>
-      <PublishDir Condition=" '$(PublishDir)' == '' ">$(OutDir)publish\</PublishDir>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="NetCorePublishPostBuild">
-    <Message Text="ERIC NetCorePublishPostBuild" />
-
+  <Target Name="CopyPublishArtifacts">
+    <Message Text="ERIC CopyPublishArtifacts" />
+    <!--<Copy ... ="/>" />-->
   </Target>
 </Project>
diff --git a/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props b/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
new file mode 100644
index 000000000..77f2e496a
--- /dev/null
+++ b/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
@@ -0,0 +1,17 @@
+<!--
+***********************************************************************************************
+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)\NETCore\Microsoft.DotNet.Core.Sdk.props</NETCoreProps>
+  </PropertyGroup>
+  <Import Condition="Exists('$(NETCoreProps)')" Project="$(NETCoreProps)" />
+</Project>
diff --git a/src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets b/src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
new file mode 100644
index 000000000..10dd74d67
--- /dev/null
+++ b/src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
@@ -0,0 +1,17 @@
+<!--
+***********************************************************************************************
+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="'$(NuGetTargets)'==''">$(MSBuildExtensionsPath)\NETCore\Microsoft.DotNet.Core.Sdk.targets</NETCoreTargets>
+  </PropertyGroup>
+  <Import Condition="Exists('$(NETCoreTargets)')" Project="$(NETCoreTargets)" />
+</Project>
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index 54a202a67..347ea9532 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -24,7 +24,12 @@
     }
   },
   "publishOptions": {
-    "include": "14.1/**"
+    "include": [
+      "14.1/**"
+    ],
+    "mappings": {
+      "NETCore/": "../Microsoft.DotNet.Core.MSBuild/build/netstandard1.0/*"
+    }
   },
   "dependencies": {
     "NuGet.Commands": {