Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@ -61,7 +61,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: ComVisible (false)]

View File

@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Net.Http.dll
LIB_REFS = System.Core System
KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = $(EXTRA_LIB_MCS_FLAGS)
ifeq (monodroid,$(PROFILE))
LIB_MCS_FLAGS += -d:XAMARIN_MODERN

View File

@ -96,7 +96,7 @@ namespace System.Net.Http
return timeout;
}
set {
if (value != System.Threading.Timeout.InfiniteTimeSpan && value < TimeSpan.Zero)
if (value != System.Threading.Timeout.InfiniteTimeSpan && (value <= TimeSpan.Zero || value.TotalMilliseconds > int.MaxValue))
throw new ArgumentOutOfRangeException ();
timeout = value;

View File

@ -1,3 +1,4 @@
../../test-helpers/NetworkHelpers.cs
System.Net.Http/DelegatingHandlerTest.cs
System.Net.Http/ByteArrayContentTest.cs
System.Net.Http/FormUrlEncodedContentTest.cs