Merge remote-tracking branch 'upstream/main' into feature/use-dllimport-generator
authorElinor Fung <elfung@microsoft.com>
Tue, 25 May 2021 05:47:06 +0000 (22:47 -0700)
committerElinor Fung <elfung@microsoft.com>
Tue, 25 May 2021 05:47:06 +0000 (22:47 -0700)
commitcbf6a82fdaf2f91bbf9e85b76751b11688287e96
treeb84b0b38972434dce8c1d7ae48d49657c8bd360d
parent9f32647332cd85af0bf791d5267f77ebb5130a5d
parentcc8d9b33005ef617379ff9841284398414505104
Merge remote-tracking branch 'upstream/main' into feature/use-dllimport-generator
eng/Versions.props
src/libraries/System.Console/src/System/ConsolePal.Windows.cs
src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedView.Windows.cs