Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
--- a/mcs/class/System/System.Net.Security/EncryptionPolicy.cs
+++ b/mcs/class/System/System.Net.Security/EncryptionPolicy.cs
@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if SECURITY_DEP && !MONO_FEATURE_NEW_TLS
 namespace System.Net.Security
 {
 	public enum EncryptionPolicy
@ -35,4 +34,3 @@ namespace System.Net.Security
 		NoEncryption
 	}
 }
-#endif