Merge branch 'master' into master-merge

diff --cc CMakeLists.txt
Simple merge

diff --cc buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
Simple merge

diff --cc buildpipeline/DotNet-CoreClr-Trusted-Linux.json
Simple merge

diff --cc buildpipeline/DotNet-Trusted-Publish.json
Simple merge

diff --cc dependencies.props
index dad0886,7cb0eba..76ef0dc
--- 1/dependencies.props
--- 2/dependencies.props
+++ b/dependencies.props
@@@ -8,32 -18,34 +18,34 @@@
      <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
      <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
  
 -    <PreReleaseLabel>preview1</PreReleaseLabel>
 +    <PreReleaseLabel>dev-di</PreReleaseLabel>
    </PropertyGroup>
-   
+ 
    <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
    <PropertyGroup>
-     <CoreFxCurrentRef>ab762a3c35e208cd698988fb7761bc92be417be9</CoreFxCurrentRef>
-     <CoreClrCurrentRef>2a83ae1685d323e6bd206dd2596b953488479922</CoreClrCurrentRef>
-     <BuildToolsCurrentRef>2a83ae1685d323e6bd206dd2596b953488479922</BuildToolsCurrentRef>
-     <PgoDataCurrentRef>1a2306063659d9704d06119325ff7c2652b1af0b</PgoDataCurrentRef>
+     <CoreFxCurrentRef>a87a61a80f95252a94f30c69d569fd3647c5b593</CoreFxCurrentRef>
+     <CoreClrCurrentRef>5b662e16887cd01cada59eb678ab0c1dd64438c4</CoreClrCurrentRef>
+     <BuildToolsCurrentRef>c9ddd341788aa55815788ab43bccb036a4848092</BuildToolsCurrentRef>
+     <PgoDataCurrentRef>c9ddd341788aa55815788ab43bccb036a4848092</PgoDataCurrentRef>
    </PropertyGroup>
  
-   <!-- Auto-upgraded properties for each build info dependency. -->
+   <!-- Tests/infrastructure dependency versions. -->
    <PropertyGroup>
-     <CoreFxPackageVersion>4.5.0-preview2-25526-52</CoreFxPackageVersion>
-     <PlatformPackageVersion>2.1.0-preview1-25324-02</PlatformPackageVersion>
-     <PgoDataPackageVersion>99.99.99-master-20170914-0028</PgoDataPackageVersion>
+     <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview1-25831-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
+     <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview1-25831-01</MicrosoftNETCorePlatformsPackageVersion>
+     <PgoDataPackageVersion>99.99.99-master-20171031-0018</PgoDataPackageVersion>
+     <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview1-25829-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+     <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
+     <XunitConsoleNetcorePackageVersion>1.0.2-prerelease-00177</XunitConsoleNetcorePackageVersion>
+     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0010</XunitPerformanceApiPackageVersion>
+     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>1.0.3-alpha-experimental</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
+     <VCRuntimeVersion>1.2.0</VCRuntimeVersion>
    </PropertyGroup>
  
-   <!-- Full package version strings that are used in other parts of the build. -->
+   <!-- Package versions used as toolsets -->
    <PropertyGroup>
-     <CoreClrPackageVersion>2.1.0-dev-di-25714-01</CoreClrPackageVersion>
-     <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
-     <XUnitConsoleNetCoreVersion>1.0.2-prerelease-00177</XUnitConsoleNetCoreVersion>
-     <XUnitPerformanceApiVersion>1.0.0-beta-build0007</XUnitPerformanceApiVersion>
-     <MicrosoftDiagnosticsTracingLibraryVersion>1.0.3-alpha-experimental</MicrosoftDiagnosticsTracingLibraryVersion>
-     <VCRuntimeVersion>1.2.0</VCRuntimeVersion>
+     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
+     <FeedTasksPackageVersion>1.0.0-prerelease-02131-01</FeedTasksPackageVersion>
    </PropertyGroup>
  
    <!-- Package dependency verification/auto-upgrade configuration. -->

diff --cc dir.props
Simple merge

diff --cc src/dlls/mscorrc/mscorrc.rc
Simple merge

diff --cc src/dlls/mscorrc/resource.h
Simple merge

diff --cc src/vm/clsload.cpp
Simple merge

diff --cc src/vm/jitinterface.cpp
Simple merge

diff --cc src/vm/jitinterface.h
Simple merge

diff --cc src/vm/method.hpp
Simple merge