diff --git a/nanoFramework.System.Net/NetworkHelper/IPConfiguration.cs b/nanoFramework.System.Net/NetworkHelper/IPConfiguration.cs
index 16f46975..df400072 100644
--- a/nanoFramework.System.Net/NetworkHelper/IPConfiguration.cs
+++ b/nanoFramework.System.Net/NetworkHelper/IPConfiguration.cs
@@ -1,11 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.CompilerServices;
+
 namespace nanoFramework.Networking
 {
     /// <summary>
     /// IP configuration to be used for static IP address configuration.
     /// </summary>
+    [ExcludeType]
     public class IPConfiguration
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/NetworkInformation/NetworkInformationOptions.cs b/nanoFramework.System.Net/NetworkInformation/NetworkInformationOptions.cs
index 5d673739..2ffb4634 100644
--- a/nanoFramework.System.Net/NetworkInformation/NetworkInformationOptions.cs
+++ b/nanoFramework.System.Net/NetworkInformation/NetworkInformationOptions.cs
@@ -4,11 +4,14 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.NetworkInformation
 {
     /// <summary>
     /// Options for <see cref="NetworkInformation"/>.
     /// </summary>
+    [ExcludeType]
     internal enum NetworkInformationOptions
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/NetworkInformation/WirelessAPStation.cs b/nanoFramework.System.Net/NetworkInformation/WirelessAPStation.cs
index 509dc600..88518f2a 100644
--- a/nanoFramework.System.Net/NetworkInformation/WirelessAPStation.cs
+++ b/nanoFramework.System.Net/NetworkInformation/WirelessAPStation.cs
@@ -5,12 +5,14 @@
 //
 
 using System;
+using System.Runtime.CompilerServices;
 
 namespace System.Net.NetworkInformation
 {
     /// <summary>
     /// Enum of Phy protocols used for connection.
     /// </summary>
+    [ExcludeType]
     [Flags]
     public enum PhyProtocols
     {
diff --git a/nanoFramework.System.Net/Properties/AssemblyInfo.cs b/nanoFramework.System.Net/Properties/AssemblyInfo.cs
index 99b0b811..af896784 100644
--- a/nanoFramework.System.Net/Properties/AssemblyInfo.cs
+++ b/nanoFramework.System.Net/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@
 
 ////////////////////////////////////////////////////////////////
 // update this whenever the native assembly signature changes //
-[assembly: AssemblyNativeVersion("100.20.0.1")]
+[assembly: AssemblyNativeVersion("100.20.0.2")]
 ////////////////////////////////////////////////////////////////
 
 // Setting ComVisible to false makes the types in this assembly not visible 
diff --git a/nanoFramework.System.Net/Security/NetworkSecurity.cs b/nanoFramework.System.Net/Security/NetworkSecurity.cs
index ec17d6ad..68741908 100644
--- a/nanoFramework.System.Net/Security/NetworkSecurity.cs
+++ b/nanoFramework.System.Net/Security/NetworkSecurity.cs
@@ -60,6 +60,7 @@ public enum SslProtocols
     /// <summary>
     /// The verification scheme to use for authentication.
     /// </summary>
+    [ExcludeType]
     public enum SslVerification
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/Sockets/AddressFamily.cs b/nanoFramework.System.Net/Sockets/AddressFamily.cs
index b7c7cad8..65c9c9c6 100644
--- a/nanoFramework.System.Net/Sockets/AddressFamily.cs
+++ b/nanoFramework.System.Net/Sockets/AddressFamily.cs
@@ -4,6 +4,8 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     /// <summary>
@@ -13,6 +15,7 @@ namespace System.Net.Sockets
     /// An AddressFamily member specifies the addressing scheme that a <see cref="Socket"/> will use to resolve an address. For example, 
     /// InterNetwork indicates that an IP version 4 address is expected when a <see cref="Socket"/> connects to an endpoint.
     /// </remarks>
+    [ExcludeType]
     public enum AddressFamily
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/Sockets/ProtocolFamily.cs b/nanoFramework.System.Net/Sockets/ProtocolFamily.cs
index 1a1114cc..995d9708 100644
--- a/nanoFramework.System.Net/Sockets/ProtocolFamily.cs
+++ b/nanoFramework.System.Net/Sockets/ProtocolFamily.cs
@@ -4,11 +4,14 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     /// <summary>
     /// Specifies the type of protocol that an instance of the <see cref='Socket'/>
     /// </summary>
+    [ExcludeType]
     public enum ProtocolFamily
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/Sockets/ProtocolType.cs b/nanoFramework.System.Net/Sockets/ProtocolType.cs
index 7b73fcab..57bf5e21 100644
--- a/nanoFramework.System.Net/Sockets/ProtocolType.cs
+++ b/nanoFramework.System.Net/Sockets/ProtocolType.cs
@@ -4,11 +4,14 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     /// <summary>
     /// Specifies the protocols that the <see cref='Socket'/> class supports.
     /// </summary>
+    [ExcludeType]
     public enum ProtocolType
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/Sockets/SelectMode.cs b/nanoFramework.System.Net/Sockets/SelectMode.cs
index 7157c9e5..1c6058db 100644
--- a/nanoFramework.System.Net/Sockets/SelectMode.cs
+++ b/nanoFramework.System.Net/Sockets/SelectMode.cs
@@ -4,11 +4,14 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     /// <summary>
     /// Specifies the mode for polling the status of a socket.
     /// </summary>
+    [ExcludeType]
     public enum SelectMode
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/Sockets/SocketErrors.cs b/nanoFramework.System.Net/Sockets/SocketErrors.cs
index c1532bf7..a8117711 100644
--- a/nanoFramework.System.Net/Sockets/SocketErrors.cs
+++ b/nanoFramework.System.Net/Sockets/SocketErrors.cs
@@ -4,11 +4,14 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     /// <summary>
     /// Defines socket error constants.
     /// </summary>
+    [ExcludeType]
     public enum SocketError : int
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/Sockets/SocketFlags.cs b/nanoFramework.System.Net/Sockets/SocketFlags.cs
index 7a3ef5c3..5414c91e 100644
--- a/nanoFramework.System.Net/Sockets/SocketFlags.cs
+++ b/nanoFramework.System.Net/Sockets/SocketFlags.cs
@@ -4,6 +4,8 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     using System;
@@ -11,6 +13,7 @@ namespace System.Net.Sockets
     /// <summary>
     /// This enumeration has a FlagsAttribute attribute that allows a bitwise combination of its member values.
     /// </summary>
+    [ExcludeType]
     [Flags]
     public enum SocketFlags
     {
diff --git a/nanoFramework.System.Net/Sockets/SocketOptionLevel.cs b/nanoFramework.System.Net/Sockets/SocketOptionLevel.cs
index 90679ff7..75a0d4ca 100644
--- a/nanoFramework.System.Net/Sockets/SocketOptionLevel.cs
+++ b/nanoFramework.System.Net/Sockets/SocketOptionLevel.cs
@@ -4,6 +4,8 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     //
@@ -13,6 +15,7 @@ namespace System.Net.Sockets
     /// <summary>
     /// Defines socket option levels for the <see cref='Sockets.Socket'/> class.
     /// </summary>
+    [ExcludeType]
     public enum SocketOptionLevel
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/Sockets/SocketOptionName.cs b/nanoFramework.System.Net/Sockets/SocketOptionName.cs
index d300ef64..f20bfd0e 100644
--- a/nanoFramework.System.Net/Sockets/SocketOptionName.cs
+++ b/nanoFramework.System.Net/Sockets/SocketOptionName.cs
@@ -4,6 +4,8 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     using System;
@@ -15,6 +17,7 @@ namespace System.Net.Sockets
     /// The SocketOptionName enumeration defines the name of each Socket configuration option. 
     /// Sockets can be configured with the <see cref="Socket.SetSocketOption(SocketOptionLevel, SocketOptionName, Boolean)"/> method.
     /// </remarks>
+    [ExcludeType]
     public enum SocketOptionName
     {
 
diff --git a/nanoFramework.System.Net/Sockets/SocketType.cs b/nanoFramework.System.Net/Sockets/SocketType.cs
index 8e595a91..ebe29526 100644
--- a/nanoFramework.System.Net/Sockets/SocketType.cs
+++ b/nanoFramework.System.Net/Sockets/SocketType.cs
@@ -4,6 +4,8 @@
 // See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.CompilerServices;
+
 namespace System.Net.Sockets
 {
     /// <summary>
@@ -14,6 +16,7 @@ namespace System.Net.Sockets
     /// and a ProtocolType. The SocketType enumeration provides several options for defining the type of <see cref="Socket"/> that you 
     /// intend to open.
     /// </remarks>
+    [ExcludeType]
     public enum SocketType
     {
         /// <summary>
diff --git a/nanoFramework.System.Net/System.Net.nfproj b/nanoFramework.System.Net/System.Net.nfproj
index bfb864a1..8e9fdcb4 100644
--- a/nanoFramework.System.Net/System.Net.nfproj
+++ b/nanoFramework.System.Net/System.Net.nfproj
@@ -35,50 +35,6 @@
     <NF_GenerateSkeletonProjectName>sys_net_native</NF_GenerateSkeletonProjectName>
     <Name>System.Net</Name>
   </PropertyGroup>
-  <ItemGroup>
-    <NFMDP_PE_ExcludeClassByName Include="ThisAssembly">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="IPConfiguration">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="NetworkInformationOptions">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="PhyProtocols">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="SslVerification">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="AddressFamily">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="ProtocolFamily">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="ProtocolType">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="SelectMode">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="SocketError">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="SocketFlags">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="SocketOptionLevel">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="SocketOptionName">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-    <NFMDP_PE_ExcludeClassByName Include="SocketType">
-      <InProject>false</InProject>
-    </NFMDP_PE_ExcludeClassByName>
-  </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
   <ItemGroup>
     <Compile Include="DNS.cs" />
@@ -162,4 +118,4 @@
     <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.9.50\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.9.50\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
   <Import Project="..\packages\Nerdbank.GitVersioning.3.9.50\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.9.50\build\Nerdbank.GitVersioning.targets')" />
-</Project>
\ No newline at end of file
+</Project>