Merge pull request #24891 from dotnet-maestro-bot/merge/master-to-release/3.0

[automated] Merge branch 'master' => 'release/3.0'

Author: wtgodbe

.gitignore

@@ -24,6 +24,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 msbuild.log
+msbuild.binlog
 
 # add back architecture directories ignored in 'Build results'
 !tests/x86
@@ -207,7 +208,8 @@ FakesAssemblies/
 browse.VC.db
 
 # Local settings folder for Visual Studio Code
-.vscode/
+**/.vscode/**
+!**/.vscode/c_cpp_properties.json
 
 ### MonoDevelop ###
 

BuildToolsVersion.txt

@@ -1 +1 @@
-3.0.0-preview4-03917-01
+3.0.0-preview4-04022-01

CMakeLists.txt

@@ -5,13 +5,18 @@ if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0)
     cmake_policy(SET CMP0042 NEW)
 endif()
 
+if (NOT WIN32)
+  set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -std=c++11"  CACHE STRING "Flags used by the compiler during all build types.")
+  set(CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS_INIT} -std=c11"  CACHE STRING "Flags used by the compiler during all build types.")
+endif()
+
 # Set the project name
 project(CoreCLR)
 
 # Include cmake functions
 include(functions.cmake)
 
-# Include global configure settings
+# Verify that LTCG/LTO is available
 include(configure.cmake)
 
 if (WIN32)
@@ -36,12 +41,6 @@ endif(CORECLR_SET_RPATH)
 OPTION(CLR_CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF)
 OPTION(CLR_CMAKE_WARNINGS_ARE_ERRORS "Warnings are errors" ON)
 
-# Ensure that python is present
-find_program(PYTHON NAMES python3 python2 python py)
-if (PYTHON STREQUAL "PYTHON-NOTFOUND")
-    message(FATAL_ERROR "PYTHON not found: Please install Python 2.7.9 or later from https://www.python.org/downloads/")
-endif()
-
 # Ensure other tools are present
 if (WIN32)
     if(CLR_CMAKE_HOST_ARCH STREQUAL arm)
@@ -221,10 +220,6 @@ if (CLR_CMAKE_PLATFORM_UNIX)
   include_directories("src/pal/src/safecrt")
 endif (CLR_CMAKE_PLATFORM_UNIX)
 
-# Microsoft.Dotnet.BuildTools.Coreclr version
-set(BuildToolsVersion "1.0.4-prerelease")
-set(BuildToolsDir "${CLR_CMAKE_PACKAGES_DIR}/Microsoft.DotNet.BuildTools.CoreCLR/${BuildToolsVersion}")
-
 #------------------------------
 # Add Product Directory
 #------------------------------

Directory.Build.props

@@ -1,11 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
+
+  <!-- Ensure our properties are set before Arcade defines defaults -->
+  <Import Project="dir.common.props" Condition="'$(ArcadeBuild)' == 'True'" />
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(ArcadeBuild)' == 'True'"/>
 
   <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
     <Copyright>$(CopyrightNetFoundation)</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <CL_MPCount>$(NumberOfCores)</CL_MPCount>
   </PropertyGroup>

Directory.Build.targets

@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(ArcadeBuild)' == 'True'"/>
-</Project>
+
+  <PropertyGroup>
+    <!-- SDK sets product to assembly but we want it to be our product name -->
+    <Product>Microsoft%AE .NET Core</Product>
+
+    <!-- Use the .NET Core product branding version for informational version description -->
+    <InformationalVersion>$(ProductVersion)</InformationalVersion>
+    <InformationalVersion Condition="'$(VersionSuffix)' != ''">$(InformationalVersion)-$(VersionSuffix)</InformationalVersion>
+  </PropertyGroup>
+</Project>

Documentation/README.md

@@ -11,7 +11,7 @@ Intro to .NET Core
 Getting Started
 ===============
 
-- [Installing the .NET Core SDK](https://www.microsoft.com/net/core)
+- [Installing the .NET Core SDK](https://dotnet.microsoft.com/download)
 - [Official .NET Core Docs](https://docs.microsoft.com/dotnet/core/)
 
 Project Docs

Documentation/botr/xplat-minidump-generation.md

@@ -46,15 +46,27 @@ Gathering the crash information on OS X will be quite a bit different than Linux
 
 # Configuration/Policy #
 
+NOTE: Core dump generation in docker containers require the ptrace capability (--cap-add=SYS_PTRACE or --privileged run/exec options).
+
 Any configuration or policy is set with environment variables which are passed as options to the _createdump_ utility.
 
 Environment variables supported:
 
 - `COMPlus_DbgEnableMiniDump`: if set to "1", enables this core dump generation. The default is NOT to generate a dump.
-- `COMPlus_DbgMiniDumpType`: if set to "1" generates _MiniDumpNormal_, "2" _MiniDumpWithPrivateReadWriteMemory_, "3" _MiniDumpFilterTriage_, "4" _MiniDumpWithFullMemory_. Default is _MiniDumpNormal_.
+- `COMPlus_DbgMiniDumpType`: See below. Default is "2" MiniDumpWithPrivateReadWriteMemory.
 - `COMPlus_DbgMiniDumpName`: if set, use as the template to create the dump path and file name. The pid can be placed in the name with %d. The default is _/tmp/coredump.%d_.
 - `COMPlus_CreateDumpDiagnostics`: if set to "1", enables the _createdump_ utilities diagnostic messages (TRACE macro).
 
+COMPlus_DbgMiniDumpType values:
+
+
+|Value|Minidump Enum|Description|
+|-|:----------:|----------|
+|1| MiniDumpNormal                               | Include just the information necessary to capture stack traces for all existing threads in a process. Limited GC heap memory and information. |
+|2| MiniDumpWithPrivateReadWriteMemory (default) | Includes the GC heaps and information necessary to capture stack traces for all existing threads in a process. |
+|3| MiniDumpFilterTriage                         | Include just the information necessary to capture stack traces for all existing threads in a process. Limited GC heap memory and information. |
+|4| MiniDumpWithFullMemory                       | Include all accessible memory in the process. The raw memory data is included at the end, so that the initial structures can be mapped directly without the raw memory information. This option can result in a very large file. |
+
 (Please refer to MSDN for the meaning of the [minidump enum values](https://msdn.microsoft.com/en-us/library/windows/desktop/ms680519(v=vs.85).aspx) reported above)
 
 **Command Line Usage**

Documentation/building/windows-instructions.md

@@ -42,6 +42,7 @@ For Visual Studio 2017:
     * Windows 10 SDK or Windows 8.1 SDK
 * To build for Arm32, Make sure that you have the Windows 10 SDK installed (or selected to be installed as part of VS installation). To explicitly install Windows SDK, download it from here: [Windows SDK for Windows 10](https://developer.microsoft.com/en-us/windows/downloads).
   * In addition, ensure you install the ARM tools. In the "Individual components" window, in the "Compilers, build tools, and runtimes" section, check the box for "Visual C++ compilers and libraries for ARM".
+* To build the tests, make sure you have a Windows 10 SDK for at least version 10.0.17763 or newer.
 * **Important:** You must have the `msdia120.dll` COM Library registered in order to build the repository.
   * This binary is registered by default when installing the "VC++ Tools" with Visual Studio 2015
   * You can also manually register the binary by launching the "Developer Command Prompt for VS2017" with Administrative privileges and running `regsvr32.exe "%VSINSTALLDIR%\Common7\IDE\msdia120.dll"`

Documentation/deep-dive-blog-posts.md

@@ -5,6 +5,7 @@
 - [Corestart 2.0: What's new for performance in .NET Core 2.0](https://www.ageofascent.com/2017/11/05/perfromance-dotnet-core-2-corestart-conference/)
 - [Performance improvements in .NET Core 2.0](https://devblogs.microsoft.com/dotnet/performance-improvements-in-net-core/)
 - [Performance improvements in .NET Core 2.1](https://devblogs.microsoft.com/dotnet/performance-improvements-in-net-core-2-1/)
+- [Performance improvements in .NET Core 3.0](https://devblogs.microsoft.com/dotnet/performance-improvements-in-net-core-3-0/)
 
 
 ### Posts that take a high-level look at the entire source:

Documentation/project-docs/changing-corelib.md

@@ -17,7 +17,7 @@ Many of the CoreFX libraries type-forward their public APIs to the implementatio
 ### (2) Submit PR to both CoreCLR and CoreFX
 - Link the two PRs together via comment in PR description, and link both to the issue itself.
 - Both PRs will reviewed together by the project maintainers
-- CoreCLR runs CoreFX tests but they are behind CoreFX. You may need to disable the outdated tests in https://github.com/dotnet/coreclr/blob/master/tests/CoreFX/CoreFX.issues.json to make your PR green.
+- CoreCLR runs CoreFX tests but they are behind CoreFX. You may need to disable the outdated tests in https://github.com/dotnet/coreclr/blob/master/tests/CoreFX/CoreFX.issues.rsp to make your PR green.
 
 ### (3) What happens next
 - We will merge the CoreCLR PR first