Merge branch 'main' of https://github.com/dotnet/runtime into merge-main
authorJeremy Koritzinsky <jekoritz@microsoft.com>
Tue, 14 Sep 2021 23:29:42 +0000 (16:29 -0700)
committerJeremy Koritzinsky <jekoritz@microsoft.com>
Tue, 14 Sep 2021 23:29:42 +0000 (16:29 -0700)
commit81293bfc1e59fe54a24d4bc5dc965317cec4e1ec
treeaab7cf909e98447691281445718c28dfb8933249
parent5b8ce63f7396c9103f5beeaa28779a7df509de84
parent6d094a0aba0daa1af1e9c845f142c92d78a18a62
Merge branch 'main' of https://github.com/dotnet/runtime into merge-main
31 files changed:
Directory.Build.targets
NuGet.config
eng/Versions.props
src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs
src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.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.SslCtx.cs
src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.SslCtxOptions.cs
src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
src/libraries/Common/tests/Common.Tests.csproj
src/libraries/System.Console/src/System.Console.csproj
src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
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.IO.Pipes/src/System.IO.Pipes.csproj
src/libraries/System.Net.Http/src/System.Net.Http.csproj
src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/BsdIPv4GlobalStatistics.cs
src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/BsdIcmpV4Statistics.cs
src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/BsdIcmpV6Statistics.cs
src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/BsdTcpStatistics.cs
src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
src/libraries/System.Net.Security/src/System.Net.Security.csproj
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
src/libraries/System.Private.CoreLib/src/System/Environment.Windows.cs
src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj