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.Web/Test/System.Web.Security/MachineKeyTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
@ -169,7 +169,6 @@ namespace MonoTests.System.Web.Security
 			}
 		}

-#if NET_4_5
 		[Test]
 		public void Protect ()
 		{
@ -200,6 +199,5 @@ namespace MonoTests.System.Web.Security
 				MachineKey.Unprotect (encryptedBytes, oneUsage), 
 				"Single purpose working when multiple supplied");
 		}
-#endif
 	}
 }