Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -0,0 +1,80 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Functional.Tests", "tests\FunctionalTests\System.Net.Primitives.Functional.Tests.csproj", "{E671BC9F-A64C-4504-8B00-7A3215B99AF9}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Pal.Tests", "tests\PalTests\System.Net.Primitives.Pal.Tests.csproj", "{7860A11A-1841-4416-8A30-28EEEB42C6BB}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Performance.Tests", "tests\PerformanceTests\System.Net.Primitives.Performance.Tests.csproj", "{86256B36-4C78-4A71-A80A-CCA35C4AE758}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.UnitTests.Tests", "tests\UnitTests\System.Net.Primitives.UnitTests.Tests.csproj", "{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives", "src\System.Net.Primitives.csproj", "{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}"
ProjectSection(ProjectDependencies) = postProject
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8} = {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives", "ref\System.Net.Primitives.csproj", "{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{86256B36-4C78-4A71-A80A-CCA35C4AE758}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{86256B36-4C78-4A71-A80A-CCA35C4AE758}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{86256B36-4C78-4A71-A80A-CCA35C4AE758}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{86256B36-4C78-4A71-A80A-CCA35C4AE758}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E671BC9F-A64C-4504-8B00-7A3215B99AF9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{7860A11A-1841-4416-8A30-28EEEB42C6BB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{86256B36-4C78-4A71-A80A-CCA35C4AE758} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
EndGlobal

View File

@@ -1 +0,0 @@
4f37419b0bb13703a341d9887b3aeab3fc16bef2

View File

@@ -4,5 +4,6 @@
<PropertyGroup>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
</PropertyGroup>
</Project>

View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.Net.Primitives.csproj" />
<Project Include="System.Net.Primitives.csproj">
<TargetGroup>netcoreapp</TargetGroup>
</Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>

View File

@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<ProjectGuid>{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />

View File

@@ -0,0 +1,10 @@
Compat issues with assembly System.Net.Primitives:
TypesMustExist : Type 'System.Net.Cookie' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Net.CookieCollection.Add(System.Net.Cookie)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Net.CookieCollection.CopyTo(System.Net.Cookie[], System.Int32)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Net.CookieCollection.Item.get(System.Int32)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Net.CookieCollection.Item.get(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Net.CookieContainer.Add(System.Net.Cookie)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Net.CookieContainer.Add(System.Uri, System.Net.Cookie)' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.Net.CookieException' does not exist in the implementation but it does exist in the contract.
Total Issues: 8

View File

@@ -1,4 +0,0 @@
Compat issues with assembly System.Net.Primitives:
CannotRemoveBaseTypeOrInterface : Type 'System.Net.Sockets.SocketException' does not inherit from base type 'System.Runtime.InteropServices.ExternalException' in the implementation but it does in the contract.
MembersMustExist : Member 'System.Net.Sockets.SocketException..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract.
Total Issues: 2

View File

@@ -2,10 +2,9 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
uap101-Windows_NT;
uap-Windows_NT;
netcoreapp-Unix;
netcoreapp-Windows_NT;
net463-Windows_NT;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="net_toosmall" xml:space="preserve">
<value>The specified value must be greater than 0.</value>
</data>
<data name="net_MethodNotImplementedException" xml:space="preserve">
<value>This method is not implemented by this class.</value>
</data>
<data name="net_PropertyNotImplementedException" xml:space="preserve">
<value>This property is not implemented by this class.</value>
</data>
<data name="net_InvalidAddressFamily" xml:space="preserve">
<value>The AddressFamily {0} is not valid for the {1} end point, use {2} instead.</value>
</data>
<data name="net_InvalidSocketAddressSize" xml:space="preserve">
<value>The supplied {0} is an invalid size for the {1} end point.</value>
</data>
<data name="net_sockets_invalid_optionValue_all" xml:space="preserve">
<value>The specified value is not valid.</value>
</data>
<data name="net_emptystringcall" xml:space="preserve">
<value>The parameter '{0}' cannot be an empty string.</value>
</data>
<data name="dns_bad_ip_address" xml:space="preserve">
<value>An invalid IP address was specified.</value>
</data>
<data name="net_container_add_cookie" xml:space="preserve">
<value>An error occurred when adding a cookie to the container.</value>
</data>
<data name="net_cookie_size" xml:space="preserve">
<value>The value size of the cookie is '{0}'. This exceeds the configured maximum size, which is '{1}'.</value>
</data>
<data name="net_cookie_parse_header" xml:space="preserve">
<value>An error occurred when parsing the Cookie header for Uri '{0}'.</value>
</data>
<data name="net_cookie_attribute" xml:space="preserve">
<value>The '{0}'='{1}' part of the cookie is invalid.</value>
</data>
<data name="net_cookie_format" xml:space="preserve">
<value>Cookie format error.</value>
</data>
<data name="net_cookie_capacity_range" xml:space="preserve">
<value>'{0}' has to be greater than '{1}' and less than '{2}'.</value>
</data>
<data name="net_collection_readonly" xml:space="preserve">
<value>The collection is read-only.</value>
</data>
<data name="InvalidOperation_EnumFailedVersion" xml:space="preserve">
<value>Collection was modified after the enumerator was instantiated.</value>
</data>
<data name="InvalidOperation_EnumOpCantHappen" xml:space="preserve">
<value>Enumerator is positioned before the first element or after the last element of the collection.</value>
</data>
</root>

View File

@@ -1 +0,0 @@
089e2fe7d64e71cbf5bdc40532ec84185278dbc6

View File

@@ -6,30 +6,23 @@
<OutputType>Library</OutputType>
<ProjectGuid>{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}</ProjectGuid>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnableWinRT Condition="'$(TargetGroup)' == 'uap101'">true</EnableWinRT>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
</PropertyGroup>
<PropertyGroup Condition="'$(EnableWinRT)' != 'true' AND '$(TargetGroup)' == 'netcoreapp'">
<DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(EnableWinRT)' == 'true'">
<DefineConstants>$(DefineConstants);NETNATIVE</DefineConstants>
<PropertyGroup>
<DefineConstants Condition="'$(TargetGroup)' == 'uap'">$(DefineConstants);uap</DefineConstants>
</PropertyGroup>
<!-- Help VS understand available configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Release|AnyCPU'" />
<PropertyGroup>
<!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
<!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
System.Net.Internals namespace. -->
<DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap101'">
<ItemGroup>
<Compile Include="System\Net\AuthenticationSchemes.cs" />
<Compile Include="System\Net\Cookie.cs" />
<Compile Include="System\Net\CookieContainer.cs" />
@@ -51,7 +44,7 @@
<Compile Include="System\Net\NetworkCredential.cs" />
<Compile Include="System\Net\TransportContext.cs" />
<Compile Include="System\Net\SocketException.cs" />
<Compile Include="System\Net\SocketException.netstandard.cs" Condition="'$(TargetGroup)' == 'netcoreapp'" />
<Compile Include="System\Net\SocketException.netstandard.cs" />
<Compile Include="System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
<Compile Include="System\Net\SecureProtocols\SslEnumTypes.cs" />
<Compile Include="System\Net\Security\SslPolicyErrors.cs" />
@@ -90,9 +83,6 @@
<Link>Common\System\IO\StringBuilderCache.cs</Link>
</Compile>
<!-- Logging -->
<Compile Include="$(CommonPath)\System\Net\Shims\TraceSource.cs">
<Link>Common\System\Net\Shims\TraceSource.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Logging\NetEventSource.Common.cs">
<Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
</Compile>
@@ -112,7 +102,7 @@
<Link>Common\Interop\Windows\Winsock\Interop.ErrorCodes.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND ('$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap101')">
<ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
<Compile Include="System\Net\IPAddressPal.Windows.cs" />
<Compile Include="System\Net\SocketException.Windows.cs" />
<Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Windows.cs">
@@ -147,7 +137,7 @@
</Compile>
</ItemGroup>
<!-- Windows : Win32 only -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND ('$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap101')">
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'uap'">
<Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Windows.cs">
<Link>Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs</Link>
</Compile>
@@ -168,12 +158,12 @@
</Compile>
</ItemGroup>
<!-- Windows : Win32 + WinRT -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' == 'true' AND ('$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap101')">
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == 'uap'">
<Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Uap.cs">
<Link>Common\System\Net\NetworkInformation\HostInformationPal.Uap.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND ('$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap101')">
<ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
<Compile Include="System\Net\IPAddressPal.Unix.cs" />
<Compile Include="System\Net\SocketException.Unix.cs" />
<Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Unix.cs">
@@ -210,14 +200,9 @@
<Link>Interop\Unix\System.Native\Interop.SocketAddress.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net463'">
<TargetingPackReference Include="mscorlib" />
<TargetingPackReference Include="System" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'uap101'">
<ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
<!-- ToDo: remove once we have new packages https://github.com/dotnet/corefx/issues/12838 -->
<ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" />
<ItemGroup Condition="'$(TargetGroup)' == 'uap'">
<Reference Include="Windows" />
<Reference Include="mscorlib" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Win32.Primitives" />

View File

@@ -8,15 +8,15 @@ using System.Globalization;
using System.IO;
using System.Text;
// The NETNative_SystemNetHttp #define is used in some source files to indicate we are compiling classes
// directly into the .NET Native System.Net.Http.dll implementation assembly in order to use internal class
// The uap #define is used in some source files to indicate we are compiling classes
// directly into the UWP System.Net.Http.dll implementation assembly in order to use internal class
// methods. Internal methods are needed in order to map cookie response headers from the WinRT Windows.Web.Http APIs.
// Windows.Web.Http is used underneath the System.Net.Http classes on .NET Native. Having other similarly
// named classes would normally conflict with the public System.Net namespace classes that are also in the
// System.Private.Networking dll. So, we need to move the classes to a different namespace. Those classes are never
// named classes would normally conflict with the public System.Net namespace classes.
// So, we need to move the classes to a different namespace. Those classes are never
// exposed up to user code so there isn't a problem. In the future, we might expose some of the internal methods
// as new public APIs and then we can remove this duplicate source code inclusion in the binaries.
#if NETNative_SystemNetHttp
#if uap
namespace System.Net.Internal
#else
namespace System.Net
@@ -682,7 +682,7 @@ namespace System.Net
set
{
// Only set by HttpListenerRequest::Cookies_get()
#if !NETNative_SystemNetHttp
#if !uap
if (value != CookieVariant.Rfc2965)
{
NetEventSource.Fail(this, $"value != Rfc2965:{value}");
@@ -852,7 +852,7 @@ namespace System.Net
#if DEBUG
internal void Dump()
{
#if !NETNative_SystemNetHttp
#if !uap
if (NetEventSource.IsEnabled)
{
if (NetEventSource.IsEnabled) NetEventSource.Info(this,

View File

@@ -4,6 +4,9 @@
using System.Collections;
using System.Collections.Generic;
#if uap
using System.Net.Internal;
#endif
namespace System.Net
{

View File

@@ -7,6 +7,9 @@ using System.Diagnostics;
using System.IO;
using System.Net.NetworkInformation;
using System.Text;
#if uap
using System.Net.Internal;
#endif
// Relevant cookie specs:
//

View File

@@ -4,15 +4,15 @@
using System.Runtime.Serialization;
// The NETNative_SystemNetHttp #define is used in some source files to indicate we are compiling classes
// directly into the .NET Native System.Net.Http.dll implementation assembly in order to use internal class
// The uap #define is used in some source files to indicate we are compiling classes
// directly into the UWP System.Net.Http.dll implementation assembly in order to use internal class
// methods. Internal methods are needed in order to map cookie response headers from the WinRT Windows.Web.Http APIs.
// Windows.Web.Http is used underneath the System.Net.Http classes on .NET Native. Having other similarly
// named classes would normally conflict with the public System.Net namespace classes that are also in the
// System.Private.Networking dll. So, we need to move the classes to a different namespace. Those classes are never
// named classes would normally conflict with the public System.Net namespace classes.
// So, we need to move the classes to a different namespace. Those classes are never
// exposed up to user code so there isn't a problem. In the future, we might expose some of the internal methods
// as new public APIs and then we can remove this duplicate source code inclusion in the binaries.
#if NETNative_SystemNetHttp
#if uap
namespace System.Net.Internal
#else
namespace System.Net

View File

@@ -280,10 +280,14 @@ namespace System.Net
{
uint address = PrivateAddress;
bytes = new byte[IPAddressParserStatics.IPv4AddressBytes];
bytes[0] = (byte)(address);
bytes[1] = (byte)(address >> 8);
bytes[2] = (byte)(address >> 16);
bytes[3] = (byte)(address >> 24);
unchecked
{
bytes[0] = (byte)(address);
bytes[1] = (byte)(address >> 8);
bytes[2] = (byte)(address >> 16);
bytes[3] = (byte)(address >> 24);
}
}
return bytes;
}
@@ -355,8 +359,8 @@ namespace System.Net
#if BIGENDIAN
return host;
#else
return (((long)HostToNetworkOrder((int)host) & 0xFFFFFFFF) << 32)
| ((long)HostToNetworkOrder((int)(host >> 32)) & 0xFFFFFFFF);
return (((long)HostToNetworkOrder(unchecked((int)host)) & 0xFFFFFFFF) << 32)
| ((long)HostToNetworkOrder(unchecked((int)(host >> 32))) & 0xFFFFFFFF);
#endif
}
@@ -365,8 +369,8 @@ namespace System.Net
#if BIGENDIAN
return host;
#else
return (((int)HostToNetworkOrder((short)host) & 0xFFFF) << 16)
| ((int)HostToNetworkOrder((short)(host >> 16)) & 0xFFFF);
return (((int)HostToNetworkOrder(unchecked((short)host)) & 0xFFFF) << 16)
| ((int)HostToNetworkOrder(unchecked((short)(host >> 16))) & 0xFFFF);
#endif
}
@@ -375,7 +379,7 @@ namespace System.Net
#if BIGENDIAN
return host;
#else
return (short)((((int)host & 0xFF) << 8) | (int)((host >> 8) & 0xFF));
return unchecked((short)((((int)host & 0xFF) << 8) | (int)((host >> 8) & 0xFF)));
#endif
}
@@ -512,7 +516,7 @@ namespace System.Net
if (PrivateAddress != value)
{
_toString = null;
PrivateAddress = (uint)value;
PrivateAddress = unchecked((uint)value);
}
}
}

View File

@@ -4,7 +4,6 @@
<BuildConfigurations>
netstandard-Unix;
netstandard-Windows_NT;
netstandard1.3-Windows_NT;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -241,7 +241,7 @@ namespace System.Net.Primitives.Functional.Tests
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.NetcoreUwp)]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap)]
public static void Value_PassNullToCtor_GetReturnsEmptyString_net46()
{
var cookie = new Cookie("SomeName", null);

View File

@@ -394,7 +394,7 @@ namespace System.Net.Primitives.Functional.Tests
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.NetcoreUwp)]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap)]
public static void AddRemove_UriAuthenticationTypeDefaultCredentials_Success_net46()
{
NetworkCredential nc = CredentialCache.DefaultNetworkCredentials as NetworkCredential;

View File

@@ -248,8 +248,7 @@ namespace System.Net.Primitives.Functional.Tests
}
[Theory]
[PlatformSpecific(~TestPlatforms.AnyUnix)]
// Linux/OSX don't do the IPv6->IPv4 formatting for these addresses
[PlatformSpecific(~TestPlatforms.AnyUnix)] // Linux/OSX don't do the IPv6->IPv4 formatting for these addresses
[InlineData("::FFFF:0:192.168.0.1", "::ffff:0:192.168.0.1")] // SIIT
[InlineData("::5EFE:192.168.0.1", "::5efe:192.168.0.1")] // ISATAP
[InlineData("1::5EFE:192.168.0.1", "1::5efe:192.168.0.1")] // ISATAP
@@ -259,8 +258,7 @@ namespace System.Net.Primitives.Functional.Tests
}
[Theory]
[PlatformSpecific(TestPlatforms.AnyUnix)]
// Linux/OSX don't do the IPv6->IPv4 formatting for these addresses
[PlatformSpecific(TestPlatforms.AnyUnix)] // Linux/OSX don't do the IPv6->IPv4 formatting for these addresses
[InlineData("::FFFF:0:192.168.0.1", "::ffff:0:c0a8:1")] // SIIT
[InlineData("::5EFE:192.168.0.1", "::5efe:c0a8:1")] // ISATAP
[InlineData("1::5EFE:192.168.0.1", "1::5efe:c0a8:1")] // ISATAP
@@ -362,7 +360,7 @@ namespace System.Net.Primitives.Functional.Tests
}
[Fact]
[PlatformSpecific(~TestPlatforms.OSX)]
[PlatformSpecific(~TestPlatforms.OSX)] // There does't appear to be an OSX API that will fail for this
public void ParseIPv6_AlphaNumericScope_Failure()
{
Assert.Throws<FormatException>(() => { IPAddress.Parse("::%1a"); });

Some files were not shown because too many files have changed in this diff Show More