projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #4380 from alexanderkyte/conflicting_attrs
[mono.git]
/
mcs
/
class
/
System
/
System.Net.Sockets
/
SocketTaskExtensions.cs
diff --git
a/mcs/class/System/System.Net.Sockets/SocketTaskExtensions.cs
b/mcs/class/System/System.Net.Sockets/SocketTaskExtensions.cs
index 33bb55a7b0e4a93a5e861ffa0306a9fdcc459e68..aee91fd55e36f5c9a6190ef623c0766d107f1888 100644
(file)
--- a/
mcs/class/System/System.Net.Sockets/SocketTaskExtensions.cs
+++ b/
mcs/class/System/System.Net.Sockets/SocketTaskExtensions.cs
@@
-2,8
+2,6
@@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-#if NETSTANDARD
-
using System.Collections.Generic;
using System.Threading.Tasks;
@@
-250,5
+248,3
@@
namespace System.Net.Sockets
}
}
}
-
-#endif