Addressing more code review comments

build.proj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="build/Microsoft.DotNet.Cli.Monikers.props" />
+  
   <PropertyGroup>
     <!--
       $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
@@ -35,9 +36,9 @@
     <DotnetCliBuildFrameworkInputs Include="build_projects/**/*.cs" Exclude="build_projects/**/obj/**/*.cs" />
     <DotnetCliBuildFrameworkInputs Include="build_projects/**/project.json;build_projects/**/project.lock.json" />
   </ItemGroup>
-  
+
-  <!-- Workaround to "Native image cannot be loaded multiple times" issue 
+  <!-- Workaround to "Native image cannot be loaded multiple times" issue
-       A target in the top level file needs to run and invoke a task 
+       A target in the top level file needs to run and invoke a task
        https://github.com/Microsoft/msbuild/issues/750 -->
   <Target Name="MSBuildWorkaroundTarget">
     <Message Text="Dont remove this target" />

build/Microsoft.DotNet.Cli.Compile.targets

@@ -1,4 +1,5 @@
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="compile/Microsoft.DotNet.Cli.LzmaArchive.targets" />
 
   <UsingTask TaskName="FixModeFlags" AssemblyFile="$(CLIBuildDll)" />
@@ -70,7 +71,7 @@
         <BinObj Include="$(SrcDirectory)/**/obj/**/*" />
         <FilesToRemoveFromStageDirectory Include="$(StageDirectory)/**/*" />
 
-        <SharedFramework Include="$(IntermediateDirectory)/sharedFrameworkPublish/**/*" />
+        <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
 
         <BinariesToRemove Include="csc" />
         <BinariesToRemove Include="vbc" />

build/Microsoft.DotNet.Cli.Prepare.targets

@@ -67,9 +67,6 @@
       <ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion>
       <DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion>
 
-      <CoreCLRVersion>1.0.2</CoreCLRVersion>
-      <JitVersion>1.0.2</JitVersion>
-
       <ArchiveExtension Condition=" '$(OSName)' == 'win' ">.zip</ArchiveExtension>
       <ArchiveExtension Condition=" '$(OSName)' != 'win' ">.tar.gz</ArchiveExtension>
 

build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets

@@ -1,7 +1,8 @@
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <Target Name="GenerateNuGetPackagesArchive"
             DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs"
-            Inputs="$(Stage2Directory)/sdk/$(SdkVersion)/dotnet.dll"
+            Inputs="$(_DotNetNewFolder)/CSharp_Console/**/*"
             Outputs="$(FinalArchive)">
       <ItemGroup>
         <FilesToClean Include="$(NuGetPackagesArchiveProject)/**/*" />
@@ -28,7 +29,7 @@
     </Target>
 
     <Target Name="SetupNuGetPackagesArchiveInputsOutputs"
-            DependsOnTargets="Init">
+            DependsOnTargets="Prepare;SetupStage">
       <PropertyGroup>
         <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
         <NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>

build/package/Microsoft.DotNet.Cli.Layout.targets

@@ -56,11 +56,7 @@
 
       <LayoutDefinition Include="Debug">
         <InputFiles>@(SdkDebugLayoutInput)</InputFiles>
-<<<<<<< 52e9475be8e9dd9d6715a1f0787da3faa1137f8a
+        <OutputFiles>@(SdkDebugRelativeOutputFiles -> '$(SdkDebugLayoutOutputDirectory)/%(Identity)')</OutputFiles>
-        <OutputFiles>@(SdkDebugRelativeOutputFiles -> '$(SdkDebugLayoutOutputDirectory)/%(Identity)')</OutputFiles>        
-=======
-        <OutputFiles>@(SdkDebugLayoutInput -> '$(SdkDebugLayoutOutputDirectory)/$([MSBuild]::MakeRelative($(Stage2SymbolsDirectory), '%(Identity)'))')</OutputFiles>        
->>>>>>> Addressing code review comments and making incremental build work.
         <NameWithVersion>$(ArtifactNameWithVersionSdkDebug)</NameWithVersion>
         <Name>$(ArtifactNameSdkDebug)</Name>
       </LayoutDefinition>

build_projects/dotnet-cli-build/ChangeEntryPointLibraryName.cs

@@ -4,11 +4,10 @@ using System.IO;
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Net.Http;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.DotNet.InternalAbstractions;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
 

build_projects/dotnet-cli-build/CleanPublishOutput.cs

@@ -4,11 +4,10 @@ using System.IO;
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Net.Http;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.DotNet.InternalAbstractions;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
 

build_projects/dotnet-cli-build/CrossgenDirectory.cs

@@ -4,11 +4,10 @@ using System.IO;
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Net.Http;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.DotNet.InternalAbstractions;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
 

build_projects/dotnet-cli-build/FixModeFlags.cs

@@ -4,11 +4,10 @@ using System.IO;
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Net.Http;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.DotNet.InternalAbstractions;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
 

build_projects/dotnet-cli-build/RemoveAssetFromDepsPackages.cs

@@ -4,13 +4,12 @@ using System.IO;
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Net.Http;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.DotNet.InternalAbstractions;
-using Microsoft.Build.Framework;
+using Newtonsoft.Json; 
-using Microsoft.Build.Utilities;
+using Newtonsoft.Json.Linq; 
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;