Update to buildtools version 1.0.27-prerelease-01407-02, and enable creating transpor...

* Update BuildTools fixes

* Update to buildtools version 1.0.27-prerelease-01407-02, and enable
building transport packages

* fix netcore project

* Avoid msb3644 error

* Fix bad copy

Commit migrated from https://github.com/dotnet/coreclr/commit/8f23fca0ff57c97707d4f6b5068e8044d2dcc13c

diff --git a/src/coreclr/BuildToolsVersion.txt b/src/coreclr/BuildToolsVersion.txt
index 49acdc6..487225f 100644 (file)
--- a/src/coreclr/BuildToolsVersion.txt
+++ b/src/coreclr/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.27-prerelease-01209-01
+1.0.27-prerelease-01407-02

diff --git a/src/coreclr/config.json b/src/coreclr/config.json
index 140b1eb..29924b3 100644 (file)
--- a/src/coreclr/config.json
+++ b/src/coreclr/config.json
@@ -40,7 +40,7 @@
       "description": "MsBuild logging options.",
       "valueType": "passThrough",
       "values": [],
-      "defaultValue": "/l:BinClashLogger,Tools/net45/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log"
+      "defaultValue": "/l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log"
     },
     "FilterToOSGroup": {
       "description": "Specifies the OSGroup.",

diff --git a/src/coreclr/dir.props b/src/coreclr/dir.props
index a71bd9f..1d641ec 100644 (file)
--- a/src/coreclr/dir.props
+++ b/src/coreclr/dir.props
@@ -160,7 +160,7 @@
     <!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires
          pulling in different packaging dependencies.
      -->
-    <PackagingTaskDir Condition="'$(TargetsWindows)' == 'true'">$(ToolsDir)net45/</PackagingTaskDir>
+    <PackagingTaskDir Condition="'$(TargetsWindows)' == 'true'">$(ToolsDir)net46/</PackagingTaskDir>
     <BuildNumberMajor Condition="'$(BuildNumberMajor)' == ''">00001</BuildNumberMajor>
     <!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
     <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
@@ -178,6 +178,10 @@
 
     <PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath>
     <SymbolPackageOutputPath>$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath>
+    <PackageIndexFile>$(MSBuildThisFileDirectory)/src/.nuget/packageIndex.json</PackageIndexFile>
+
+    <!-- coreclr doesn't currently use the index so don't force it to be in sync -->
+    <SkipIndexCheck>true</SkipIndexCheck>
   </PropertyGroup>
 
   <!-- Add required legal files to packages -->
@@ -190,6 +194,7 @@
           Include="$(PackageThirdPartyNoticesFile)" >
       <SkipPackageFileCheck>true</SkipPackageFileCheck>
     </File>
+    <PackageIndex Include="$(PackageIndexFile)" />
   </ItemGroup>
 
 </Project>

diff --git a/src/coreclr/src/.nuget/dir.props b/src/coreclr/src/.nuget/dir.props
index c016b11..de85ad6 100644 (file)
--- a/src/coreclr/src/.nuget/dir.props
+++ b/src/coreclr/src/.nuget/dir.props
@@ -5,7 +5,10 @@
   <PropertyGroup>
     <!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
     <PackagePlatform>AnyCPU</PackagePlatform>
-  
+    
+    <!-- build the transport package which includes product and symbols in addition to standard packages -->
+    <CreatePackedPackage Condition="'$(CreatePackedPackage)' == ''">true</CreatePackedPackage>
+
     <!-- Distro rid is passed as runtimeos-arch-->
     <_parseDistroRid>$(__DistroRid)</_parseDistroRid>
     <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.10-x64</_parseDistroRid>

diff --git a/src/coreclr/src/.nuget/packageIndex.json b/src/coreclr/src/.nuget/packageIndex.json
new file mode 100644 (file)
index 0000000..7a73a41
--- /dev/null
+++ b/src/coreclr/src/.nuget/packageIndex.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file

diff --git a/src/coreclr/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/coreclr/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
index bd9d239..12c63d2 100644 (file)
--- a/src/coreclr/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
+++ b/src/coreclr/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
@@ -12,6 +12,12 @@
     <NoStdLib>true</NoStdLib>
     <NoCompilerStandardLib>true</NoCompilerStandardLib>
     <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
+
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
+    
   </PropertyGroup>
 
   <!-- Default configurations to help VS understand the options -->

diff --git a/src/coreclr/src/ToolBox/SOS/NETCore/project.json b/src/coreclr/src/ToolBox/SOS/NETCore/project.json
index 7a3cf4f..6b2061a 100644 (file)
--- a/src/coreclr/src/ToolBox/SOS/NETCore/project.json
+++ b/src/coreclr/src/ToolBox/SOS/NETCore/project.json
@@ -6,7 +6,11 @@
     "System.Reflection.Metadata": "1.4.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.0": { 
+      "imports": [ 
+       "portable-net45+win8" 
+      ] 
+    } 
   },
   "runtimes": {
     "win7-x86": {},

diff --git a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
index ca8c9c2..0271052 100644 (file)
--- a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Always use latest Roslyn compiler -->
-  <Import Project="..\..\Tools\net45\roslyn\build\Microsoft.Net.Compilers.props" Condition="'$(OS)'=='Windows_NT'" />
+  <Import Project="..\..\Tools\net46\roslyn\build\Microsoft.Net.Compilers.props" Condition="'$(OS)'=='Windows_NT'" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <!-- Include common build properties -->
   <Import Project="..\..\dir.props" />
@@ -35,6 +35,10 @@
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <DefineConstants>$(DefineConstants);CORECLR;_USE_NLS_PLUS_TABLE;RESOURCE_SATELLITE_CONFIG;CODE_ANALYSIS_BASELINE</DefineConstants>
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
   </PropertyGroup>
   <!-- Add Serviceable attribute to the project's metadata -->
   <ItemGroup>

diff --git a/src/coreclr/src/mscorlib/facade/mscorlib.csproj b/src/coreclr/src/mscorlib/facade/mscorlib.csproj
index 038a698..33df183 100644 (file)
--- a/src/coreclr/src/mscorlib/facade/mscorlib.csproj
+++ b/src/coreclr/src/mscorlib/facade/mscorlib.csproj
@@ -31,6 +31,11 @@
     <!-- We want to exclude the transitive closure of the packages pulled in via project.json as that introduces ambiguity -->
     <OmitTransitiveCompileReferences>true</OmitTransitiveCompileReferences>
     <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
+
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
   </PropertyGroup>
 
   <!-- Default configurations to help VS understand the options -->

diff --git a/src/coreclr/src/mscorlib/ref/mscorlib.csproj b/src/coreclr/src/mscorlib/ref/mscorlib.csproj
index 30da2de..335630e 100644 (file)
--- a/src/coreclr/src/mscorlib/ref/mscorlib.csproj
+++ b/src/coreclr/src/mscorlib/ref/mscorlib.csproj
@@ -60,6 +60,13 @@
     <OutputPath>$(BinDir)\ref</OutputPath>
   </PropertyGroup>
 
+ <PropertyGroup>
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)\mscorlib.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)\mscorlib.manual.cs" />

diff --git a/src/coreclr/tests/dir.props b/src/coreclr/tests/dir.props
index 329e4bc..f4187f4 100644 (file)
--- a/src/coreclr/tests/dir.props
+++ b/src/coreclr/tests/dir.props
@@ -15,7 +15,7 @@
 
   <!--   
     Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer   
-    as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks.   
+    as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.6 version of the tasks.   
    -->   
   <PropertyGroup>  
     <BuildToolsTargets45>true</BuildToolsTargets45>   
@@ -29,7 +29,7 @@
     <PackagesDir>$(ProjectDir)..\packages\</PackagesDir>
     <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir>
     <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
-    <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net45/</BuildToolsTaskDir>
+    <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir>
     <SkipImportILTargets>true</SkipImportILTargets>
   </PropertyGroup>
 

diff --git a/src/coreclr/tests/helixprep.proj b/src/coreclr/tests/helixprep.proj
index 79fd80e..91aa486 100644 (file)
--- a/src/coreclr/tests/helixprep.proj
+++ b/src/coreclr/tests/helixprep.proj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="12.0" DefaultTargets="ArchiveAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\net45\Microsoft.DotNet.Build.Tasks.dll"/>
+  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\net46\Microsoft.DotNet.Build.Tasks.dll"/>
   
   <Import Project="dir.props" />
   <Import Project="..\dir.props" />

diff --git a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
index ba24010..4c210f1 100644 (file)
--- a/src/coreclr/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
+++ b/src/coreclr/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Always use latest Roslyn compiler -->
-  <Import Project="..\..\..\..\..\..\Tools\net45\roslyn\build\Microsoft.Net.Compilers.props"/>
+  <Import Project="..\..\..\..\..\..\Tools\net46\roslyn\build\Microsoft.Net.Compilers.props"/>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>