Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -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
}
}

View File

@@ -1,4 +1,3 @@
#if NET_4_5
using System.ComponentModel.DataAnnotations;
using System.Linq;
@@ -137,4 +136,3 @@ namespace MonoTests.System.Web.Security {
}
}
}
#endif

View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.Threading.Tasks;
@@ -115,4 +114,3 @@ namespace MonoTests.System.Web
}
}
#endif

View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.IO;
@@ -129,4 +128,3 @@ namespace MonoTests.System.Web
}
}
#endif

View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
using System;
using System.Threading;
@@ -331,4 +330,3 @@ namespace MonoTests.System.Web
}
}
#endif