Merge remote-tracking branch 'upstream/main' into HEAD
authorElinor Fung <elfung@microsoft.com>
Fri, 11 Jun 2021 17:04:20 +0000 (10:04 -0700)
committerElinor Fung <elfung@microsoft.com>
Fri, 11 Jun 2021 17:04:20 +0000 (10:04 -0700)
commit6271751fcac9b1190ba66df27821695ac92c2292
treef763bf2d5336b802fb7d91c4a96c7d405711a640
parente1cab8073ec669569502751e95fe956d6b8e7668
parent645dfe69fb25407de7a5484d7a03d3342b4e0279
Merge remote-tracking branch 'upstream/main' into HEAD
18 files changed:
Directory.Build.targets
eng/Versions.props
src/libraries/Common/src/Interop/BSD/System.Native/Interop.Sysctl.cs
src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Hmac.cs
src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Crypto.cs
src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Hmac.cs
src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509.cs
src/libraries/Common/src/System/Net/Http/WinInetProxyHelper.cs
src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
src/libraries/System.Private.CoreLib/src/System/IO/Enumeration/FileSystemEnumerator.Unix.cs
src/libraries/System.Private.CoreLib/src/System/IO/Enumeration/FileSystemEnumerator.Win32.cs
src/libraries/System.Private.CoreLib/src/System/TimeZoneInfo.Unix.cs
src/libraries/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.OSX.cs
src/libraries/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/HashProviderDispenser.Unix.cs
src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj