Merge remote-tracking branch 'upstream/master' into memoryCacheTimer

# Conflicts:
#	src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
  ]
  },
  "microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.20602.1",
+ "version": "1.0.0-prerelease.20607.2",
  "commands": [
  "xharness"
  ]

.gitattributes

@@ -67,8 +67,8 @@
 *.h linguist-language=C
 
 # CLR specific
-src/coreclr/src/pal/tests/palsuite/paltestlist.txt text eol=lf
-src/coreclr/src/pal/tests/palsuite/paltestlist_to_be_reviewed.txt text eol=lf
+src/coreclr/pal/tests/palsuite/paltestlist.txt text eol=lf
+src/coreclr/pal/tests/palsuite/paltestlist_to_be_reviewed.txt text eol=lf
 src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regexdna-input25.txt text eol=lf
 src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regexdna-input25000.txt text eol=lf
 src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-input25.txt text eol=lf

.github/CODEOWNERS

@@ -3,15 +3,15 @@
 
 /src/libraries/Common/src/System/Net/Http/aspnetcore/ @dotnet/http
 /src/libraries/Common/tests/Tests/System/Net/aspnetcore/ @dotnet/http
-/src/libraries/System.Text.Json/ @ahsonkhan @steveharter @layomia @Jozkee
+/src/libraries/System.Text.Json/ @ahsonkhan @steveharter @layomia @Jozkee @eiriktsarpalis
 /src/libraries/System.Buffers/ @ahsonkhan
 /src/libraries/System.Memory/ @ahsonkhan
 
 # CoreCLR Code Owners
 
-/src/coreclr/src/inc/corinfo.h @dotnet/jit-contrib
-/src/coreclr/src/inc/corjit.h @dotnet/jit-contrib
-/src/coreclr/src/jit/ @dotnet/jit-contrib
+/src/coreclr/inc/corinfo.h @dotnet/jit-contrib
+/src/coreclr/inc/corjit.h @dotnet/jit-contrib
+/src/coreclr/jit/ @dotnet/jit-contrib
 
 # Mono Code Owners
 

.gitignore

@@ -84,6 +84,9 @@ dlldata.c
 *.svclog
 *.scc
 
+# Special file
+!src/coreclr/.nuget/_.pdb
+
 # Chutzpah Test files
 _Chutzpah*
 
@@ -133,9 +136,6 @@ AutoTest.Net/
 # Web workbench (sass)
 .sass-cache/
 
-# BenchmarkDotNet
-BenchmarkDotNet.Artifacts/
-
 # Installshield output folder
 [Ee]xpress/
 
@@ -295,10 +295,10 @@ prime/
 stage/
 
 # CLR prebuilt generated files
-!src/pal/prebuilt/idl/*_i.c
+!pal/prebuilt/idl/*_i.c
 
 # Valid 'debug' folder, that contains CLR debugging code
-!src/debug
+!debug
 
 # Ignore folders created by the CLR test build
 TestWrappers_x64_[d|D]ebug
@@ -313,7 +313,6 @@ TestWrappers_arm_[r|R]elease
 TestWrappers_arm64_[d|D]ebug
 TestWrappers_arm64_[c|C]hecked
 TestWrappers_arm64_[r|R]elease
-tests/src/common/test_runtime/project.json
 
 Vagrantfile
 .vagrant
@@ -333,7 +332,7 @@ cross/android-rootfs/*
 *.pyc
 
 # JIT32 files
-src/jit32
+jit32
 
 # performance testing sandbox
 sandbox
@@ -344,17 +343,23 @@ linker
 # Symbolic link for the shared portion of CoreLib to make grep/findstr work for runtime devs
 #
 # On Windows, make your own by running these commands from the repo root:
-# mklink /D src\coreclr\src\System.Private.CoreLib\shared %CD%\src\libraries\System.Private.CoreLib\src
-# mklink /D src\coreclr\src\System.Private.CoreLib\common %CD%\src\libraries\Common\src
+# mklink /D src\coreclr\System.Private.CoreLib\shared %CD%\src\libraries\System.Private.CoreLib\src
+# mklink /D src\coreclr\System.Private.CoreLib\common %CD%\src\libraries\Common\src
 #
 # On Unix, make your own by running these commands from the repo root:
-# ln -s $(pwd)/src/libraries/System.Private.CoreLib/src src/coreclr/src/System.Private.CoreLib/shared
-# ln -s $(pwd)/src/libraries/Common/src src/coreclr/src/System.Private.CoreLib/common
-src/coreclr/src/System.Private.CoreLib/shared
-src/coreclr/src/System.Private.CoreLib/common
+# ln -s $(pwd)/src/libraries/System.Private.CoreLib/src src/coreclr/System.Private.CoreLib/shared
+# ln -s $(pwd)/src/libraries/Common/src src/coreclr/System.Private.CoreLib/common
+src/coreclr/System.Private.CoreLib/shared
+src/coreclr/System.Private.CoreLib/common
 
 # The debug directory should not be ignored
-!src/coreclr/src/debug
+!src/coreclr/debug
+
+# Exceptions to the exclusions
+!src/coreclr/.nuget/_.pdb
+!src/coreclr/inc/obj/
+!src/coreclr/vm/.vscode/
+!src/coreclr/vm/.vscode/c_cpp_properties.json
 
 # Mono Wasm-specific excludes
 src/mono/wasm/emsdk/

CONTRIBUTING.md

@@ -107,7 +107,7 @@ The following file header is the used for .NET Core. Please use it for new files
 // The .NET Foundation licenses this file to you under the MIT license.
 ```
 
-- See [class.cpp](./src/coreclr/src/vm/class.cpp) for an example of the header in a C++ file.
+- See [class.cpp](./src/coreclr/vm/class.cpp) for an example of the header in a C++ file.
 - See [List.cs](./src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs) for an example of the header in a C# file.
 
 ## PR - CI Process

Directory.Build.props

@@ -47,16 +47,16 @@
 
  <!-- System.Private.CoreLib -->
  <CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
- <CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'src', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
+ <CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
  <CoreLibProject Condition="'$(RuntimeFlavor)' == 'Mono'">$([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'netcore', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(TargetsMobile)' == 'true'">
- <AppleAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', 'Debug', '$(NetCoreAppCurrent)'))</AppleAppBuilderDir>
- <AndroidAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish'))</AndroidAppBuilderDir>
- <WasmAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish'))</WasmAppBuilderDir>
- <WasmBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppCurrent)', 'publish'))</WasmBuildTasksDir>
- <MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppCurrent)'))</MonoAOTCompilerDir>
+ <AppleAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)'))</AppleAppBuilderDir>
+ <AndroidAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</AndroidAppBuilderDir>
+ <WasmAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WasmAppBuilderDir>
+ <WasmBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WasmBuildTasksDir>
+ <MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoAOTCompilerDir>
 
  <AppleAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll'))</AppleAppBuilderTasksAssemblyPath>
  <AndroidAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(AndroidAppBuilderDir)', 'AndroidAppBuilder.dll'))</AndroidAppBuilderTasksAssemblyPath>

docs/README.md

@@ -71,6 +71,6 @@ Other Information
 - [.NET Filename Encyclopedia](project/dotnet-filenames.md)
 - [Porting to .NET Core](https://docs.microsoft.com/en-us/dotnet/standard/analyzers/portability-analyzer)
 - [.NET Standards (Ecma)](project/dotnet-standards.md)
-- [CLR Configuration Knobs](../src/coreclr/src/inc/clrconfigvalues.h)
+- [CLR Configuration Knobs](../src/coreclr/inc/clrconfigvalues.h)
 - [CLR overview](https://docs.microsoft.com/dotnet/standard/clr)
 - [Wikipedia Entry for the CLR](https://en.wikipedia.org/wiki/Common_Language_Runtime)

docs/area-owners.md

@@ -118,7 +118,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
 | area-System.Threading | @mangod9 | @kouvel | |
 | area-System.Threading.Channels | @ericstj | @tarekgh @stephentoub | |
 | area-System.Threading.Tasks | @ericstj | @tarekgh @stephentoub | |
-| area-System.Transactions | @HongGit | @dasetser @HongGit | |
+| area-System.Transactions | @HongGit | @HongGit | |
 | area-System.Xml | @jeffhandley | @buyaa-n @krwq | |
 | area-Threading-mono | @SamMonoRT | @lambdageek | |
 | area-TieredCompilation-coreclr | @mangod9 | @kouvel | |

docs/coding-guidelines/EventLogging.md

@@ -6,14 +6,14 @@ Event Logging is a mechanism by which CoreClr can provide a variety of informati
 
 # Adding Events to the Runtime
 
-- Edit the [Event manifest](../../src/coreclr/src/vm/ClrEtwAll.man) to add a new event. For guidelines on adding new events, take a look at the existing events in the manifest and this guide for [ETW Manifests](https://msdn.microsoft.com/en-us/library/dd996930%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396).
+- Edit the [Event manifest](../../src/coreclr/vm/ClrEtwAll.man) to add a new event. For guidelines on adding new events, take a look at the existing events in the manifest and this guide for [ETW Manifests](https://msdn.microsoft.com/en-us/library/dd996930%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396).
 - The build system should automatically generate the required artifacts for the added events.
-- Add entries in the [exclusion list](../../src/coreclr/src/vm/ClrEtwAllMeta.lst) if necessary
+- Add entries in the [exclusion list](../../src/coreclr/vm/ClrEtwAllMeta.lst) if necessary
 - The Event Logging Mechanism provides the following two functions, which can be used within the VM:
  - **FireEtw**EventName, this is used to trigger the event
  - **EventEnabled**EventName, this is used to see if any consumer has subscribed to this event
 
 
 # Adding New Logging System
 
-Though the the Event logging system was designed for ETW, the build system provides a mechanism, basically an [adapter script- genEventing.py](../../src/coreclr/src/scripts/genEventing.py) so that other Logging System can be added and used by CoreClr. An Example of such an extension for [LTTng logging system](https://lttng.org/) can be found in [genLttngProvider.py](../../src/coreclr/src/scripts/genLttngProvider.py )
+Though the the Event logging system was designed for ETW, the build system provides a mechanism, basically an [adapter script- genEventing.py](../../src/coreclr/scripts/genEventing.py) so that other Logging System can be added and used by CoreClr. An Example of such an extension for [LTTng logging system](https://lttng.org/) can be found in [genLttngProvider.py](../../src/coreclr/scripts/genLttngProvider.py )