You've already forked linux-packaging-mono
Imported Upstream version 5.2.0.175
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
4bdbaf4a88
commit
966bba02bb
@ -1,78 +1,60 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.22816.0
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{BB2D2F6C-0445-43D4-84A9-DF5B4931FA19}") = "System.Net.Http.WinHttpHandler.Unit.Tests", "tests\UnitTests\System.Net.Http.WinHttpHandler.Unit.Tests.csproj", "{A2ECDEDB-12B7-402C-9230-152B7601179F}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{} = {}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{BB2D2F6C-0445-43D4-84A9-DF5B4931FA19}") = "System.Net.Http.WinHttpHandler.Functional.Tests", "tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj", "{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{} = {}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{BB2D2F6C-0445-43D4-84A9-DF5B4931FA19}") = "System.Net.Http.WinHttpHandler.Functional.Tests", "tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj", "{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler.Functional.Tests", "tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj", "{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E} = {F75E3008-0562-42DF-BE72-C1384F12157E}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{BB2D2F6C-0445-43D4-84A9-DF5B4931FA19}") = "System.Net.Http.WinHttpHandler.Unit.Tests", "tests\UnitTests\System.Net.Http.WinHttpHandler.Unit.Tests.csproj", "{A2ECDEDB-12B7-402C-9230-152B7601179F}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler.Unit.Tests", "tests\UnitTests\System.Net.Http.WinHttpHandler.Unit.Tests.csproj", "{A2ECDEDB-12B7-402C-9230-152B7601179F}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E} = {F75E3008-0562-42DF-BE72-C1384F12157E}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{BB2D2F6C-0445-43D4-84A9-DF5B4931FA19}") = "System.Net.Http.WinHttpHandler", "src\System.Net.Http.WinHttpHandler.csproj", "{F75E3008-0562-42DF-BE72-C1384F12157E}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler", "src\System.Net.Http.WinHttpHandler.csproj", "{F75E3008-0562-42DF-BE72-C1384F12157E}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483} = {8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler", "ref\System.Net.Http.WinHttpHandler.csproj", "{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}"
|
||||
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
|
||||
DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
EndGlobalSection
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.DebugNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.ReleaseNETCoreAppnetstandard1.3-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.DebugNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.ReleaseNETCoreAppnetstandard1.3-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Unix-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = net46-Windows_NT-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.DebugNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = net46-Windows_NT-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = net46-Windows_NT-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.ReleaseNETCoreAppnet46-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = net46-Windows_NT-Release|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
|
||||
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
|
||||
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
|
||||
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
|
||||
{A2ECDEDB-12B7-402C-9230-152B7601179F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
|
||||
{F75E3008-0562-42DF-BE72-C1384F12157E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
|
||||
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -1,8 +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.Http.WinHttpHandler.pkgproj" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
|
||||
</Project>
|
||||
@ -5,7 +5,7 @@
|
||||
<ProjectReference Include="..\ref\System.Net.Http.WinHttpHandler.csproj">
|
||||
<SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\src\System.Net.Http.WinHttpHandler.builds" />
|
||||
<ProjectReference Include="..\src\System.Net.Http.WinHttpHandler.csproj" />
|
||||
<NotSupportedOnTargetFramework Include="netcore50">
|
||||
<PackageTargetRuntime>win</PackageTargetRuntime>
|
||||
</NotSupportedOnTargetFramework>
|
||||
|
||||
@ -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>{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
|
||||
@ -2,11 +2,9 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<BuildConfigurations>
|
||||
netstandard1.3-Windows_NT;
|
||||
netstandard1.3-Unix;
|
||||
netstandard-Windows_NT;
|
||||
netstandard-Unix;
|
||||
net46-Windows_NT;
|
||||
netfx-Windows_NT;
|
||||
</BuildConfigurations>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
26
external/corefx/src/System.Net.Http.WinHttpHandler/src/PinvokeAnalyzerExceptionList.analyzerdata
vendored
Normal file
26
external/corefx/src/System.Net.Http.WinHttpHandler/src/PinvokeAnalyzerExceptionList.analyzerdata
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
kernel32.dll!GetModuleHandleW
|
||||
winhttp.dll!WinHttpAddRequestHeaders
|
||||
winhttp.dll!WinHttpCloseHandle
|
||||
winhttp.dll!WinHttpConnect
|
||||
winhttp.dll!WinHttpGetIEProxyConfigForCurrentUser
|
||||
winhttp.dll!WinHttpGetProxyForUrl
|
||||
winhttp.dll!WinHttpOpen
|
||||
winhttp.dll!WinHttpOpenRequest
|
||||
winhttp.dll!WinHttpQueryAuthSchemes
|
||||
winhttp.dll!WinHttpQueryDataAvailable
|
||||
winhttp.dll!WinHttpQueryHeaders
|
||||
winhttp.dll!WinHttpQueryOption
|
||||
winhttp.dll!WinHttpReadData
|
||||
winhttp.dll!WinHttpReceiveResponse
|
||||
winhttp.dll!WinHttpSendRequest
|
||||
winhttp.dll!WinHttpSetCredentials
|
||||
winhttp.dll!WinHttpSetOption
|
||||
winhttp.dll!WinHttpSetStatusCallback
|
||||
winhttp.dll!WinHttpSetTimeouts
|
||||
winhttp.dll!WinHttpWebSocketClose
|
||||
winhttp.dll!WinHttpWebSocketCompleteUpgrade
|
||||
winhttp.dll!WinHttpWebSocketQueryCloseStatus
|
||||
winhttp.dll!WinHttpWebSocketReceive
|
||||
winhttp.dll!WinHttpWebSocketSend
|
||||
winhttp.dll!WinHttpWebSocketShutdown
|
||||
winhttp.dll!WinHttpWriteData
|
||||
@ -1,64 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<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">
|
||||
@ -129,9 +70,6 @@
|
||||
<data name="net_http_invalid_proxy" xml:space="preserve">
|
||||
<value>When using WindowsProxyUsePolicy.UseCustomProxy, the Proxy property must not be null.</value>
|
||||
</data>
|
||||
<data name="net_http_content_buffersize_limit" xml:space="preserve">
|
||||
<value>Buffering more than {0} bytes is not supported.</value>
|
||||
</data>
|
||||
<data name="net_http_handler_norequest" xml:space="preserve">
|
||||
<value>A request message must be provided. It cannot be null.</value>
|
||||
</data>
|
||||
@ -153,6 +91,9 @@
|
||||
<data name="net_http_chunked_not_allowed_with_empty_content" xml:space="preserve">
|
||||
<value>'Transfer-Encoding: chunked' header can not be used when content object is not specified.</value>
|
||||
</data>
|
||||
<data name="net_http_invalid_enable_first" xml:space="preserve">
|
||||
<value>The {0} property must be set to '{1}' to use this property.</value>
|
||||
</data>
|
||||
<data name="net_http_value_must_be_greater_than" xml:space="preserve">
|
||||
<value>The specified value must be greater than {0}.</value>
|
||||
</data>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?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>
|
||||
@ -9,22 +9,17 @@
|
||||
<GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly>
|
||||
</PropertyGroup>
|
||||
<!-- Help VS understand available configurations -->
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net46-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net46-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
|
||||
<Import Project="System.Net.Http.WinHttpHandler.msbuild" Condition="'$(TargetsWindows)' == 'true'" />
|
||||
<ItemGroup Condition="'$(TargetGroup)' == 'net46'">
|
||||
<ItemGroup Condition="'$(TargetGroup)' == 'net46' OR '$(TargetGroup)' == 'netfx'">
|
||||
<!-- Need to compile it here since the NET46 target here is building against System.Runtime whereas the
|
||||
the list of other files in System.Net.Http.WinHttpHandler.msbuild is also used by System.Net.Http
|
||||
library and the NET46 target there uses framework assembly references instead. -->
|
||||
<CompileItem Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Net\HttpStatusDescription.cs" />
|
||||
</ItemGroup>
|
||||
<!-- For source files to be shown within the visual tree in Solution Explorer, the items must be
|
||||
@ -43,6 +38,11 @@
|
||||
<Reference Include="System.Buffers" />
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetGroup)' == 'net46' OR '$(TargetGroup)' == 'netfx'">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3'">
|
||||
<Reference Include="Microsoft.Win32.Primitives" />
|
||||
<Reference Include="System.Collections" />
|
||||
@ -63,4 +63,4 @@
|
||||
<Reference Include="System.Threading.Tasks" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
|
||||
</Project>
|
||||
</Project>
|
||||
@ -21,11 +21,10 @@
|
||||
<CompileItem Include="$(CommonPath)\System\Net\UriScheme.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Net\SecurityProtocol.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Net\Http\HttpHandlerDefaults.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Net\Http\HttpHandlerDiagnosticListenerExtensions.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Net\Http\HttpHandlerLoggingStrings.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Net\Http\NoWriteNoSeekStreamContent.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Net\Http\WinHttpException.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Threading\Tasks\RendezvousAwaitable.cs" />
|
||||
<CompileItem Include="$(CommonPath)\System\Threading\Tasks\TaskToApm.cs" />
|
||||
<CompileItem Include="$(MSBuildThisFileDirectory)\System\Net\Http\WinHttpAuthHelper.cs" />
|
||||
<CompileItem Include="$(MSBuildThisFileDirectory)\System\Net\Http\WinHttpCertificateHelper.cs" />
|
||||
<CompileItem Include="$(MSBuildThisFileDirectory)\System\Net\Http\WinHttpChannelBinding.cs" />
|
||||
@ -41,7 +40,7 @@
|
||||
<CompileItem Include="$(MSBuildThisFileDirectory)\System\Net\Http\WinHttpTransportContext.cs" />
|
||||
<CompileItem Include="$(MSBuildThisFileDirectory)\System\Net\Http\WinInetProxyHelper.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetGroup)' != 'net46'">
|
||||
<ItemGroup Condition="'$(TargetGroup)' != 'net46' AND '$(TargetGroup)' != 'netfx'">
|
||||
<CompileItem Include="$(CommonPath)\System\Net\HttpStatusDescription.cs" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -54,7 +54,7 @@ namespace System.Net.Http
|
||||
~Interop.Crypt32.CertChainPolicyIgnoreFlags.CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG;
|
||||
|
||||
var status = new Interop.Crypt32.CERT_CHAIN_POLICY_STATUS();
|
||||
status.cbSize = (uint)Marshal.SizeOf<Interop.Crypt32.CERT_CHAIN_POLICY_STATUS>();
|
||||
status.cbSize = (uint)sizeof(Interop.Crypt32.CERT_CHAIN_POLICY_STATUS);
|
||||
if (Interop.Crypt32.CertVerifyCertificateChainPolicy(
|
||||
(IntPtr)Interop.Crypt32.CertChainPolicy.CERT_CHAIN_POLICY_SSL,
|
||||
chain.SafeHandle,
|
||||
|
||||
@ -94,7 +94,6 @@ namespace System.Net.Http
|
||||
private volatile bool _disposed;
|
||||
private SafeWinHttpHandle _sessionHandle;
|
||||
private WinHttpAuthHelper _authHelper = new WinHttpAuthHelper();
|
||||
private static readonly DiagnosticListener s_diagnosticListener = new DiagnosticListener(HttpHandlerLoggingStrings.DiagnosticListenerName);
|
||||
|
||||
public WinHttpHandler()
|
||||
{
|
||||
@ -260,6 +259,11 @@ namespace System.Net.Http
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_clientCertificateOption != ClientCertificateOption.Manual)
|
||||
{
|
||||
throw new InvalidOperationException(SR.Format(SR.net_http_invalid_enable_first, "ClientCertificateOptions", "Manual"));
|
||||
}
|
||||
|
||||
if (_clientCertificates == null)
|
||||
{
|
||||
_clientCertificates = new X509Certificate2Collection();
|
||||
@ -533,8 +537,6 @@ namespace System.Net.Http
|
||||
|
||||
CheckDisposed();
|
||||
|
||||
Guid loggingRequestId = s_diagnosticListener.LogHttpRequest(request);
|
||||
|
||||
SetOperationStarted();
|
||||
|
||||
TaskCompletionSource<HttpResponseMessage> tcs = new TaskCompletionSource<HttpResponseMessage>();
|
||||
@ -563,8 +565,6 @@ namespace System.Net.Http
|
||||
TaskCreationOptions.DenyChildAttach,
|
||||
TaskScheduler.Default);
|
||||
|
||||
s_diagnosticListener.LogHttpResponse(tcs.Task, loggingRequestId);
|
||||
|
||||
return tcs.Task;
|
||||
}
|
||||
|
||||
@ -721,7 +721,7 @@ namespace System.Net.Http
|
||||
Interop.WinHttp.WINHTTP_NO_PROXY_NAME,
|
||||
Interop.WinHttp.WINHTTP_NO_PROXY_BYPASS,
|
||||
(int)Interop.WinHttp.WINHTTP_FLAG_ASYNC);
|
||||
|
||||
|
||||
if (sessionHandle.IsInvalid)
|
||||
{
|
||||
int lastError = Marshal.GetLastWin32Error();
|
||||
@ -750,7 +750,7 @@ namespace System.Net.Http
|
||||
sessionHandle,
|
||||
Interop.WinHttp.WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS,
|
||||
ref optionAssuredNonBlockingTrue,
|
||||
(uint)Marshal.SizeOf<uint>()))
|
||||
(uint)sizeof(uint)))
|
||||
{
|
||||
// This option is not available on downlevel Windows versions. While it improves
|
||||
// performance, we can ignore the error that the option is not available.
|
||||
@ -847,7 +847,7 @@ namespace System.Net.Http
|
||||
// will have the side-effect of WinHTTP cancelling any pending I/O and accelerating its callbacks
|
||||
// on the handle and thus releasing the awaiting tasks in the loop below. This helps to provide
|
||||
// a more timely, cooperative, cancellation pattern.
|
||||
using (state.CancellationToken.Register(s => ((WinHttpRequestState)s).RequestHandle.Dispose(), state))
|
||||
using (state.CancellationToken.Register(s => ((WinHttpRequestState)s).RequestHandle.Dispose(), state))
|
||||
{
|
||||
do
|
||||
{
|
||||
@ -883,7 +883,7 @@ namespace System.Net.Http
|
||||
// Since the headers have been read, set the "receive" timeout to be based on each read
|
||||
// call of the response body data. WINHTTP_OPTION_RECEIVE_TIMEOUT sets a timeout on each
|
||||
// lower layer winsock read.
|
||||
uint optionData = (uint)_receiveDataTimeout.TotalMilliseconds;
|
||||
uint optionData = unchecked((uint)_receiveDataTimeout.TotalMilliseconds);
|
||||
SetWinHttpOption(state.RequestHandle, Interop.WinHttp.WINHTTP_OPTION_RECEIVE_TIMEOUT, ref optionData);
|
||||
|
||||
HttpResponseMessage responseMessage = WinHttpResponseParser.CreateResponseMessage(state, _doManualDecompressionCheck);
|
||||
@ -917,7 +917,7 @@ namespace System.Net.Http
|
||||
private void SetSessionHandleTlsOptions(SafeWinHttpHandle sessionHandle)
|
||||
{
|
||||
uint optionData = 0;
|
||||
SslProtocols sslProtocols =
|
||||
SslProtocols sslProtocols =
|
||||
(_sslProtocols == SslProtocols.None) ? SecurityProtocol.DefaultSecurityProtocols : _sslProtocols;
|
||||
|
||||
if ((sslProtocols & SslProtocols.Tls) != 0)
|
||||
@ -1076,7 +1076,7 @@ namespace System.Net.Http
|
||||
ref optionData);
|
||||
}
|
||||
|
||||
optionData = _automaticRedirection ?
|
||||
optionData = _automaticRedirection ?
|
||||
Interop.WinHttp.WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP :
|
||||
Interop.WinHttp.WINHTTP_OPTION_REDIRECT_POLICY_NEVER;
|
||||
SetWinHttpOption(requestHandle, Interop.WinHttp.WINHTTP_OPTION_REDIRECT_POLICY, ref optionData);
|
||||
@ -1094,7 +1094,7 @@ namespace System.Net.Http
|
||||
|
||||
private void SetRequestHandleTlsOptions(SafeWinHttpHandle requestHandle)
|
||||
{
|
||||
// If we have a custom server certificate validation callback method then
|
||||
// If we have a custom server certificate validation callback method then
|
||||
// we need to have WinHTTP ignore some errors so that the callback method
|
||||
// will have a chance to be called.
|
||||
uint optionData;
|
||||
@ -1251,7 +1251,7 @@ namespace System.Net.Http
|
||||
}
|
||||
else if (ex is WinHttpException || ex is IOException)
|
||||
{
|
||||
// Wrap expected exceptions as HttpRequestExceptions since this is considered an error during
|
||||
// Wrap expected exceptions as HttpRequestExceptions since this is considered an error during
|
||||
// execution. All other exception types, including ArgumentExceptions and ProtocolViolationExceptions
|
||||
// are 'unexpected' or caused by user error and should not be wrapped.
|
||||
state.Tcs.TrySetException(new HttpRequestException(SR.net_http_client_execution_error, ex));
|
||||
@ -1312,7 +1312,7 @@ namespace System.Net.Http
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void ThrowOnInvalidHandle(SafeWinHttpHandle handle)
|
||||
{
|
||||
if (handle.IsInvalid)
|
||||
@ -1322,7 +1322,7 @@ namespace System.Net.Http
|
||||
throw WinHttpException.CreateExceptionUsingError(lastError);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private RendezvousAwaitable<int> InternalSendRequestAsync(WinHttpRequestState state)
|
||||
{
|
||||
lock (state.Lock)
|
||||
@ -1347,7 +1347,7 @@ namespace System.Net.Http
|
||||
|
||||
return state.LifecycleAwaitable;
|
||||
}
|
||||
|
||||
|
||||
private async Task InternalSendRequestBodyAsync(WinHttpRequestState state, bool chunkedModeForSend)
|
||||
{
|
||||
using (var requestStream = new WinHttpRequestStream(state, chunkedModeForSend))
|
||||
@ -1358,7 +1358,7 @@ namespace System.Net.Http
|
||||
await requestStream.EndUploadAsync(state.CancellationToken).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private RendezvousAwaitable<int> InternalReceiveResponseHeadersAsync(WinHttpRequestState state)
|
||||
{
|
||||
lock (state.Lock)
|
||||
|
||||
@ -67,7 +67,7 @@ namespace System.Net.Http
|
||||
return;
|
||||
|
||||
case Interop.WinHttp.WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE:
|
||||
Debug.Assert(statusInformationLength == Marshal.SizeOf<int>());
|
||||
Debug.Assert(statusInformationLength == sizeof(int));
|
||||
int bytesAvailable = Marshal.ReadInt32(statusInformation);
|
||||
OnRequestDataAvailable(state, bytesAvailable);
|
||||
return;
|
||||
|
||||
@ -13,7 +13,7 @@ using SafeWinHttpHandle = Interop.WinHttp.SafeWinHttpHandle;
|
||||
|
||||
namespace System.Net.Http
|
||||
{
|
||||
internal class WinHttpRequestStream : Stream
|
||||
internal sealed class WinHttpRequestStream : Stream
|
||||
{
|
||||
private static byte[] s_crLfTerminator = new byte[] { 0x0d, 0x0a }; // "\r\n"
|
||||
private static byte[] s_endChunk = new byte[] { 0x30, 0x0d, 0x0a, 0x0d, 0x0a }; // "0\r\n\r\n"
|
||||
@ -136,6 +136,12 @@ namespace System.Net.Http
|
||||
WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult();
|
||||
}
|
||||
|
||||
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) =>
|
||||
TaskToApm.Begin(WriteAsync(buffer, offset, count, CancellationToken.None), asyncCallback, asyncState);
|
||||
|
||||
public override void EndWrite(IAsyncResult asyncResult) =>
|
||||
TaskToApm.End(asyncResult);
|
||||
|
||||
public override long Seek(long offset, SeekOrigin origin)
|
||||
{
|
||||
CheckDisposed();
|
||||
|
||||
@ -60,7 +60,7 @@ namespace System.Net.Http
|
||||
name = new string(_buffer, startIndex, nameLength);
|
||||
}
|
||||
|
||||
// Normalize header value by trimming white space.
|
||||
// Normalize header value by trimming whitespace.
|
||||
int valueStartIndex = colonIndex + 1;
|
||||
int valueLength = startIndex + length - colonIndex - 1;
|
||||
CharArrayHelpers.Trim(_buffer, ref valueStartIndex, ref valueLength);
|
||||
|
||||
@ -160,7 +160,7 @@ namespace System.Net.Http
|
||||
else
|
||||
{
|
||||
bufferLength = buffer.Length;
|
||||
fixed (char* pBuffer = buffer)
|
||||
fixed (char* pBuffer = &buffer[0])
|
||||
{
|
||||
if (QueryHeaders(requestHandle, infoLevel, pBuffer, ref bufferLength, ref index))
|
||||
{
|
||||
@ -203,7 +203,7 @@ namespace System.Net.Http
|
||||
int bufferLength = buffer.Length;
|
||||
uint index = 0;
|
||||
|
||||
fixed (char* pBuffer = buffer)
|
||||
fixed (char* pBuffer = &buffer[0])
|
||||
{
|
||||
if (!QueryHeaders(requestHandle, infoLevel, pBuffer, ref bufferLength, ref index))
|
||||
{
|
||||
|
||||
@ -13,7 +13,7 @@ using SafeWinHttpHandle = Interop.WinHttp.SafeWinHttpHandle;
|
||||
|
||||
namespace System.Net.Http
|
||||
{
|
||||
internal class WinHttpResponseStream : Stream
|
||||
internal sealed class WinHttpResponseStream : Stream
|
||||
{
|
||||
private volatile bool _disposed;
|
||||
private readonly WinHttpRequestState _state;
|
||||
@ -199,6 +199,12 @@ namespace System.Net.Http
|
||||
return ReadAsyncCore(buffer, offset, count, token);
|
||||
}
|
||||
|
||||
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) =>
|
||||
TaskToApm.Begin(ReadAsync(buffer, offset, count, CancellationToken.None), callback, state);
|
||||
|
||||
public override int EndRead(IAsyncResult asyncResult) =>
|
||||
TaskToApm.End<int>(asyncResult);
|
||||
|
||||
private async Task<int> ReadAsyncCore(byte[] buffer, int offset, int count, CancellationToken token)
|
||||
{
|
||||
_state.PinReceiveBuffer(buffer);
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<BuildConfigurations>
|
||||
netstandard1.3-Windows_NT;
|
||||
netstandard-Windows_NT;
|
||||
</BuildConfigurations>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@ -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.Http.WinHttpHandler.Functional.Tests.csproj">
|
||||
<OSGroup>Windows_NT</OSGroup>
|
||||
<TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs>
|
||||
</Project>
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
|
||||
</Project>
|
||||
@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?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>{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
|
||||
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
|
||||
<Compile Include="$(CommonTestPath)\System\Net\Configuration.cs">
|
||||
<Link>Common\System\Net\Configuration.cs</Link>
|
||||
@ -18,4 +18,4 @@
|
||||
<Compile Include="XunitTestAssemblyAtrributes.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
|
||||
</Project>
|
||||
</Project>
|
||||
@ -96,6 +96,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests
|
||||
}
|
||||
}
|
||||
|
||||
[ActiveIssue(17234)]
|
||||
[OuterLoop] // TODO: Issue #11345
|
||||
[Fact]
|
||||
[OuterLoop]
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user