Add Microsoft.NET.Build.Extensions and corresponding DLLs in CLI layout

Microsoft.DotNet.Cli.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26419.0
+VisualStudioVersion = 15.0.26510.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
 EndProject
@@ -30,7 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\BuildDefaults.props = build\BuildDefaults.props
 		build\BuildInfo.targets = build\BuildInfo.targets
 		build\BundledRuntimes.props = build\BundledRuntimes.props
-		build\BundledSdks.proj = build\BundledSdks.proj
 		build\BundledSdks.props = build\BundledSdks.props
 		build\BundledTemplates.proj = build\BundledTemplates.proj
 		build\BundledTemplates.props = build\BundledTemplates.props
@@ -48,10 +47,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\InstallerInfo.props = build\InstallerInfo.props
 		build\Microsoft.DotNet.Cli.tasks = build\Microsoft.DotNet.Cli.tasks
 		build\MSBuildExtensions.props = build\MSBuildExtensions.props
+		build\MSBuildExtensions.targets = build\MSBuildExtensions.targets
 		build\OutputDirectories.props = build\OutputDirectories.props
 		build\Package.targets = build\Package.targets
 		build\Prepare.targets = build\Prepare.targets
 		build\Publish.targets = build\Publish.targets
+		build\RestoreDependency.proj = build\RestoreDependency.proj
 		build\sdks\sdks.csproj = build\sdks\sdks.csproj
 		build\Signing.proj = build\Signing.proj
 		build\Stage0.props = build\Stage0.props

build/DependencyVersions.props

@@ -6,8 +6,10 @@
     <CLI_Roslyn_Version>2.3.0-beta2-61716-09</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
     <CLI_FSharp_Version>4.2.0-rc-170602-0</CLI_FSharp_Version>
-    <CLI_NETSDK_Version>2.0.0-preview2-20170602-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>2.0.0-preview2-20170606-4</CLI_NETSDK_Version>
     <CLI_NuGet_Version>4.3.0-preview3-4146</CLI_NuGet_Version>
+    <CLI_MSBuildExtensions_Version>2.0.0-preview2-20170606-4</CLI_MSBuildExtensions_Version>
+    <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview2-25331-02</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.3.0-preview-20170601-03</CLI_TestPlatform_Version>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>

build/MSBuildExtensions.targets

@@ -1,12 +1,54 @@
 <Project>
   <Target Name="GenerateMSBuildExtensions"
-          DependsOnTargets="GenerateBundledVersionsProps">
+          DependsOnTargets="GenerateBundledVersionsProps;RestoreMSBuildExtensionsPackages">
 
     <ItemGroup>
       <MSBuildExtensionsContent Include="$(GeneratedMSBuildExtensionsDirectory)/**/*" />
+
+      <MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\**\*.*"
+                                Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft.NET.Build.Extensions\net*\**" />
+      <MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*"
+                                DeploymentSubpath="$(MSBuildExtensionsVersionSubfolder)/" />
+      <MSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*"
+                                Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
+                                DeploymentSubpath="Microsoft.NET.Build.Extensions/" />
     </ItemGroup>
   </Target>
 
+  <Target Name="PrepareMSBuildExtensionsProps">
+    <PropertyGroup>
+      <MSBuildExtensionsPackageName>Microsoft.NET.Build.Extensions</MSBuildExtensionsPackageName>
+      <MSBuildExtensionsVersionSubfolder>15.0</MSBuildExtensionsVersionSubfolder>
+      <MSBuildExtensionsNuPkgPath>$(NuGetPackagesDir)/$(MSBuildExtensionsPackageName.ToLower())/$(CLI_MSBuildExtensions_Version.ToLower())</MSBuildExtensionsNuPkgPath>
+
+      <NETStandardLibraryNETFrameworkPackageName>NETStandard.Library.NETFramework</NETStandardLibraryNETFrameworkPackageName>
+      <NETStandardLibraryNETFrameworkNuPkgPath>$(NuGetPackagesDir)/$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower())</NETStandardLibraryNETFrameworkNuPkgPath>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="RestoreMSBuildExtensionsPackages"
+          DependsOnTargets="PrepareMSBuildExtensionsProps">
+    <ItemGroup>
+      <ExtensionPackageToRestore Include="$(MSBuildExtensionsPackageName)" Version="$(CLI_MSBuildExtensions_Version)"/>
+      <ExtensionPackageToRestore Include="$(NETStandardLibraryNETFrameworkPackageName)" Version="$(CLI_NETStandardLibraryNETFrameworkVersion)"/>
+      
+      <ExtensionRestore Include="$(RepoRoot)/build/RestoreDependency.proj">
+        <Properties>
+          CLIBuildDll=$(CLIBuildDll);
+          NuGetPackagesDir=$(NuGetPackagesDir);
+          DependencyPackageName=%(ExtensionPackageToRestore.Identity);
+          DependencyPackageVersion=%(ExtensionPackageToRestore.Version);
+          Stage0Directory=$(Stage0Directory)
+        </Properties>
+      </ExtensionRestore>
+    </ItemGroup>
+
+    <MSBuild
+      BuildInParallel="False"
+      Projects="@(ExtensionRestore)">
+    </MSBuild>
+  </Target>
+
   <Target Name="GenerateBundledVersionsProps">
     <PropertyGroup>
       <BundledVersionsPropsFileName>Microsoft.NETCoreSdk.BundledVersions.props</BundledVersionsPropsFileName>

build/RestoreDependency.proj

@@ -9,37 +9,38 @@
   <UsingTask TaskName="DotNetRestore" AssemblyFile="$(CLIBuildDllPath)" />
 
   <Target Name="CopySdkToOutput"
-          DependsOnTargets="PrepareBundledSdksProps;
+          DependsOnTargets="PrepareBundledDependencyProps;
-                            EnsureSdkRestored;
+                            EnsureDependencyRestored;
                             GetSdkItemsToCopy"
+          Condition="'$(SdkLayoutDirectory)' != ''"
           Inputs="@(SdkContent)"
           Outputs="@(SdkContent->'$(SdkLayoutDirectory)/%(RecursiveDir)%(FileName)%(Extension)')">
     <Copy SourceFiles="@(SdkContent)"
           DestinationFiles="@(SdkContent->'$(SdkLayoutDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
     
-    <Message Text="Copied Sdk $(SdkPackageName) from $(SdkNuPkgPath) to $(SdkLayoutDirectory)."
+    <Message Text="Copied Sdk $(DependencyPackageName) from $(DependencyNuPkgPath) to $(SdkLayoutDirectory)."
              Importance="High" />
   </Target>
 
   <Target Name="GetSdkItemsToCopy">
     <ItemGroup>
-      <SdkContent Include="$(SdkNuPkgPath)/**/*" 
+      <SdkContent Include="$(DependencyNuPkgPath)/**/*" 
-                  Exclude="$(SdkNuPkgPath)/$(SdkPackageName).nuspec;
+                  Exclude="$(DependencyNuPkgPath)/$(DependencyPackageName).nuspec;
-                           $(SdkNuPkgPath)/$(SdkPackageName).$(SdkPackageVersion).nupkg;
+                           $(DependencyNuPkgPath)/$(DependencyPackageName).$(DependencyPackageVersion).nupkg;
-                           $(SdkNuPkgPath)/$(SdkPackageName).$(SdkPackageVersion).nupkg.sha512" />
+                           $(DependencyNuPkgPath)/$(DependencyPackageName).$(DependencyPackageVersion).nupkg.sha512" />
     </ItemGroup>
   </Target>
 
-  <Target Name="EnsureSdkRestored"
+  <Target Name="EnsureDependencyRestored"
-          Condition="!Exists('$(SdkNuPkgPath)/$(SdkPackageName.ToLower()).nuspec')">
+          Condition="!Exists('$(DependencyNuPkgPath)/$(DependencyPackageName.ToLower()).nuspec')">
     <DotNetRestore ToolPath="$(Stage0Directory)"
                    ProjectPath="$(MSBuildThisFileDirectory)/sdks/sdks.csproj"
-                   AdditionalParameters="/p:SdkPackageName=$(SdkPackageName) /p:SdkPackageVersion=$(SdkPackageVersion)" />
+                   AdditionalParameters="/p:DependencyPackageName=$(DependencyPackageName) /p:DependencyPackageVersion=$(DependencyPackageVersion)" />
   </Target>
 
-  <Target Name="PrepareBundledSdksProps">
+  <Target Name="PrepareBundledDependencyProps">
     <PropertyGroup>
-      <SdkNuPkgPath>$(NuGetPackagesDir)/$(SdkPackageName.ToLower())/$(SdkPackageVersion.ToLower())</SdkNuPkgPath>
+      <DependencyNuPkgPath>$(NuGetPackagesDir)/$(DependencyPackageName.ToLower())/$(DependencyPackageVersion.ToLower())</DependencyNuPkgPath>
     </PropertyGroup>
   </Target>
 </Project>

build/sdks/sdks.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="$(SdkPackageName)" Version="$(SdkPackageVersion)" />
+    <PackageReference Include="$(DependencyPackageName)" Version="$(DependencyPackageVersion)" />
   </ItemGroup>
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/redist/redist.csproj

@@ -112,9 +112,14 @@
           DependsOnTargets="GenerateMSBuildExtensions"
           AfterTargets="Publish"
           BeforeTargets="GenerateCliRuntimeConfigurationFiles">
+    <ItemGroup>
+      <MSBuildExtensionsContent Update="@(MSBuildExtensionsContent)">
+        <DestinationPath Condition="'%(MSBuildExtensionsContent.DestinationPath)' == ''">$(PublishDir)/%(MSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension)</DestinationPath>
+      </MSBuildExtensionsContent>
+    </ItemGroup>
     
       <Copy SourceFiles="@(MSBuildExtensionsContent)"
-            DestinationFolder="$(PublishDir)/%(RecursiveDir)" />
+            DestinationFiles="%(MSBuildExtensionsContent.DestinationPath)" />
 
       <PropertyGroup>
         <MSBuildTargetsDirectory>$(PublishDir)/runtimes/any/native</MSBuildTargetsDirectory>
@@ -140,13 +145,13 @@
   <Target Name="PublishSdks"
           AfterTargets="Publish">
     <ItemGroup>
-      <SdksToBundle Include="$(RepoRoot)/build/BundledSdks.proj">
+      <SdksToBundle Include="$(RepoRoot)/build/RestoreDependency.proj">
         <Properties>
           CLIBuildDll=$(CLIBuildDll);
           NuGetPackagesDir=$(NuGetPackagesDir);
           SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
-          SdkPackageName=%(BundledSdk.Identity);
+          DependencyPackageName=%(BundledSdk.Identity);
-          SdkPackageVersion=%(BundledSdk.Version);
+          DependencyPackageVersion=%(BundledSdk.Version);
           Stage0Directory=$(Stage0Directory)
         </Properties>
       </SdksToBundle>