mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
external/corefx/src/System.Net.WebProxy/dir.props vendored
View File

@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<AssemblyVersion>4.0.1.0</AssemblyVersion>
<AssemblyKey>Open</AssemblyKey>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
</PropertyGroup>

12
external/corefx/src/System.Net.WebProxy/src/System/Net/WebProxy.cs vendored
View File

@@ -208,23 +208,17 @@ namespace System.Net
protected WebProxy(SerializationInfo serializationInfo, StreamingContext streamingContext)
{
BypassProxyOnLocal = serializationInfo.GetBoolean("_BypassOnLocal");
Address = (Uri)serializationInfo.GetValue("_ProxyAddress", typeof(Uri));
_bypassList = (ArrayList)serializationInfo.GetValue("_BypassList", typeof(ArrayList));
UseDefaultCredentials = serializationInfo.GetBoolean("_UseDefaultCredentials");
throw new PlatformNotSupportedException();
}
void ISerializable.GetObjectData(SerializationInfo serializationInfo, StreamingContext streamingContext)
{
GetObjectData(serializationInfo, streamingContext);
throw new PlatformNotSupportedException();
}
protected virtual void GetObjectData(SerializationInfo serializationInfo, StreamingContext streamingContext)
{
serializationInfo.AddValue("_BypassOnLocal", BypassProxyOnLocal);
serializationInfo.AddValue("_ProxyAddress", Address);
serializationInfo.AddValue("_BypassList", _bypassList);
serializationInfo.AddValue("_UseDefaultCredentials", UseDefaultCredentials);
throw new PlatformNotSupportedException();
}
[Obsolete("This method has been deprecated. Please use the proxy selected for you by default. http://go.microsoft.com/fwlink/?linkid=14202")]

3
external/corefx/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj vendored
View File

@@ -8,6 +8,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="WebProxyTest.cs" />
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
<Link>Common\System\AssertExtensions.cs</Link>
</Compile>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

8
external/corefx/src/System.Net.WebProxy/tests/WebProxyTest.cs vendored
View File

@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Net.NetworkInformation;
using System.Net.Sockets;
@@ -109,9 +110,9 @@ namespace System.Net.Tests
public static void InvalidArgs_Throws()
{
var p = new WebProxy();
Assert.Throws<ArgumentNullException>("destination", () => p.GetProxy(null));
Assert.Throws<ArgumentNullException>("host", () => p.IsBypassed(null));
Assert.Throws<ArgumentNullException>("c", () => p.BypassList = null);
AssertExtensions.Throws<ArgumentNullException>("destination", () => p.GetProxy(null));
AssertExtensions.Throws<ArgumentNullException>("host", () => p.IsBypassed(null));
AssertExtensions.Throws<ArgumentNullException>("c", () => p.BypassList = null);
Assert.Throws<ArgumentException>(() => p.BypassList = new string[] { "*.com" });
}
@@ -174,6 +175,7 @@ namespace System.Net.Tests
yield return new object[] { new Uri($"http://{IPAddress.None}"), false };
}
[ActiveIssue(20137, TargetFrameworkMonikers.Uap)]
[Theory]
[MemberData(nameof(BypassOnLocal_MemberData))]
public static void BypassOnLocal_MatchesExpected(Uri destination, bool isLocal)