Skip to content

Commit c9cdfba

Browse files
nattressnattress
authored
Re-enable UAP builds (dotnet#27531)
* Build uapaot System.Numerics.Vectors With `Vector<T>` now residing in System.Private.CoreLib, directly reference System.Private.Corelib instead of contracts just like netcoreapp does. Add uapaot flavor since System.Private.CoreLib has a different strong name key on that platform. * Make EnsureExtendedPrefixOverMaxPath available to UAP Add the helper method `System.IO.PathInternal.EnsureExtendedPrefixOverMaxPath` to Common\src\System\IO\PathInternal.Windows.cs. It was previously not visible to UAP since Common\src\CoreLib\System\IO\PathInternal.Windows.cs is not included in UAP compilation. * Keep SocketsHttpHandler out of UAP builds SocketsHttpHandler is not supported in uap and is currently leaking into UAP builds since they've been disabled for a few weeks. Adjust the contract so it's not available to UAP, and clean the implementation assembly so SocketsHttpHandler internals don't leak out into HttpClientHandler.Core.cs. * Fix GetAddrInfoExSupportsOverlapped UAP build break `System.Net.NameResolutionPal.GetAddrInfoExSupportsOverlapped` uses LoadLibraryExW which is not compatible with UAP (which only supports LoadLibrary of DLLs within a container). Refactor the helper so UAP returns false. * Revert "Disable UAP legs per #26802 (dotnet#26822)" This reverts commit 120dce4. * Revert "Disable UAP configurations in all configurations build" This reverts commit 2202b4f. * Revert "Disable UAP official builds (dotnet#26871)" This reverts commit ef79caf. - Baseline the ApiCompat and GenFacades failures in System.Runtime.Extensions and System.Threading.ThreadPool. - Adjust naming of files to match branch conventions - Fix up some configuration issues with uap packaging. The CoreFX.Private.TestUtilities packaging needs updated build tools which can map between uwp6.0 and netstandard2.0. - ifdef out Thread.GetCurrentProcessorId until we get a new System.Private.CoreLib.
1 parent df5bf81 commit c9cdfba

26 files changed

+233
-44
lines changed

‎buildpipeline/pipeline.json

+116
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,122 @@
179179
"SubType": "netcoreapp"
180180
}
181181
},
182+
{
183+
"Name": "DotNet-CoreFx-Trusted-Windows",
184+
"Parameters": {
185+
"PB_Platform": "arm",
186+
"PB_BuildArguments": "-framework=uap -buildArch=arm -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10",
187+
"PB_BuildTestsArguments": "-framework=uap -buildArch=arm -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true",
188+
"PB_SyncArguments": "-p -- /p:ArchGroup=arm /p:RuntimeOS=win10 /p:TargetGroup=uap /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
189+
"PB_TargetQueue": "Windows.10.Arm64",
190+
"PB_CreateHelixArguments": "/p:ArchGroup=arm /p:TargetGroup=uap /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/uwp/\""
191+
},
192+
"ReportingParameters": {
193+
"OperatingSystem": "Windows",
194+
"Type": "build/product/",
195+
"Platform": "arm",
196+
"SubType": "uap"
197+
}
198+
},
199+
{
200+
"Name": "DotNet-CoreFx-Trusted-Windows",
201+
"Parameters": {
202+
"PB_Platform": "x64",
203+
"PB_BuildArguments": "-framework=uap -buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10",
204+
"PB_BuildTestsArguments": "-framework=uap -buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true",
205+
"PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:RuntimeOS=win10 /p:TargetGroup=uap /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
206+
"PB_TargetQueue": "Windows.10.Amd64.ClientRS3",
207+
"PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:TargetGroup=uap /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/uwp/\""
208+
},
209+
"ReportingParameters": {
210+
"OperatingSystem": "Windows",
211+
"Type": "build/product/",
212+
"Platform": "x64",
213+
"SubType": "uap"
214+
}
215+
},
216+
{
217+
"Name": "DotNet-CoreFx-Trusted-Windows",
218+
"Parameters": {
219+
"PB_Platform": "x86",
220+
"PB_BuildArguments": "-framework=uap -buildArch=x86 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10",
221+
"PB_BuildTestsArguments": "-framework=uap -buildArch=x86 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true",
222+
"PB_SyncArguments": "-p -- /p:ArchGroup=x86 /p:RuntimeOS=win10 /p:TargetGroup=uap /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
223+
"PB_TargetQueue": "Windows.10.Amd64.ClientRS3",
224+
"PB_CreateHelixArguments": "/p:ArchGroup=x86 /p:TargetGroup=uap /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/uwp/\""
225+
},
226+
"ReportingParameters": {
227+
"OperatingSystem": "Windows",
228+
"Type": "build/product/",
229+
"Platform": "x86",
230+
"SubType": "uap"
231+
}
232+
},
233+
{
234+
"Name": "DotNet-CoreFx-Trusted-Windows",
235+
"Parameters": {
236+
"PB_Platform": "arm",
237+
"PB_BuildArguments": "-framework=uapaot -buildArch=arm -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
238+
"PB_BuildTestsArguments": "-framework=uapaot -buildArch=arm -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true",
239+
"PB_SyncArguments": "-p -- /p:ArchGroup=arm /p:RuntimeOS=win10 /p:TargetGroup=uapaot /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
240+
"PB_TargetQueue": "Windows.10.Amd64",
241+
"PB_CreateHelixArguments": "/p:ArchGroup=arm /p:TargetGroup=uapaot /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:SecondaryQueue=Windows.10.Arm64 /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/ilc/\""
242+
},
243+
"ReportingParameters": {
244+
"OperatingSystem": "Windows",
245+
"Type": "build/product/",
246+
"Platform": "arm",
247+
"SubType": "uapaot"
248+
}
249+
},
250+
{
251+
"Name": "DotNet-CoreFx-Trusted-Windows-NoTest",
252+
"Parameters": {
253+
"PB_Platform": "arm64",
254+
"PB_BuildArguments": "-framework=uapaot -buildArch=arm64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
255+
"PB_SyncArguments": "-p -- /p:ArchGroup=arm64 /p:RuntimeOS=win10 /p:TargetGroup=uapaot /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
256+
},
257+
"ReportingParameters": {
258+
"OperatingSystem": "Windows",
259+
"Type": "build/product/",
260+
"Platform": "arm64",
261+
"SubType": "uapaot"
262+
}
263+
},
264+
{
265+
"Name": "DotNet-CoreFx-Trusted-Windows",
266+
"Parameters": {
267+
"PB_Platform": "x64",
268+
"PB_BuildArguments": "-framework=uapaot -buildArch=x64 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
269+
"PB_BuildTestsArguments": "-framework=uapaot -buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true",
270+
"PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:RuntimeOS=win10 /p:TargetGroup=uapaot /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
271+
"PB_TargetQueue": "Windows.10.Amd64.ClientRS3",
272+
"PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:TargetGroup=uapaot /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/ilc/\""
273+
},
274+
"ReportingParameters": {
275+
"OperatingSystem": "Windows",
276+
"Type": "build/product/",
277+
"Platform": "x64",
278+
"SubType": "uapaot"
279+
}
280+
},
281+
{
282+
"Name": "DotNet-CoreFx-Trusted-Windows",
283+
"Parameters": {
284+
"PB_Platform": "x86",
285+
"PB_BuildArguments": "-framework=uapaot -buildArch=x86 -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType) /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
286+
"PB_BuildTestsArguments": "-framework=uapaot -buildArch=x86 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:RuntimeOS=win10 /p:ArchiveTests=true",
287+
"PB_SyncArguments": "-p -- /p:ArchGroup=x86 /p:RuntimeOS=win10 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
288+
"PB_TargetQueue": "Windows.10.Amd64.ClientRS3",
289+
"PB_CreateHelixArguments": "/p:ArchGroup=x86 /p:TargetGroup=uapaot /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:\"HelixJobType=test/functional/ilc/\""
290+
},
291+
"ReportingParameters": {
292+
"OperatingSystem": "Windows",
293+
"Type": "build/product/",
294+
"Platform": "x86",
295+
"SubType": "uapaot"
296+
}
297+
},
182298
{
183299
"Name": "DotNet-CoreFx-Trusted-Windows-NoTest",
184300
"Parameters": {

‎buildpipeline/pipelinejobs.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ def configurations = [
2727
['TGroup':"netcoreapp", 'Pipeline':osxPipeline, 'Name':'OSX', 'ForPR':"Debug-x64", 'Arch':['x64']],
2828
['TGroup':"netcoreapp", 'Pipeline':winPipeline, 'Name':'Windows' , 'ForPR':"Debug-x64|Release-x86"],
2929
['TGroup':"netfx", 'Pipeline':winPipeline, 'Name':'NETFX', 'ForPR':"Release-x86"],
30-
// ['TGroup':"uap", 'Pipeline':winPipeline, 'Name':'UWP CoreCLR', 'ForPR':"Debug-x64"],
31-
// ['TGroup':"uapaot", 'Pipeline':winPipeline, 'Name':'UWP NETNative', 'ForPR':"Release-x86"],
30+
['TGroup':"uap", 'Pipeline':winPipeline, 'Name':'UWP CoreCLR', 'ForPR':"Debug-x64"],
31+
['TGroup':"uapaot", 'Pipeline':winPipeline, 'Name':'UWP NETNative', 'ForPR':"Release-x86"],
3232
['TGroup':"all", 'Pipeline':winPipeline, 'Name':'Packaging All Configurations', 'ForPR':"Debug-x64"],
3333
]
3434

‎buildvertical.targets

+3-7
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030

3131
<!-- we need to ignore placeholder build configurations that start with _ -->
3232
<_projectBuildConfigurations Remove="@(_projectBuildConfigurations)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('_'))" />
33-
<!-- Ignore uap build configurations https://github.com/dotnet/corefx/issues/26802 -->
34-
<_projectBuildConfigurations Remove="@(_projectBuildConfigurations)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('uap'))" />
33+
3534
<!-- transform back to project -->
3635
<_projectWithConfiguration Include="@(_projectBuildConfigurations->'%(OriginalItemSpec)')" />
3736
</ItemGroup>
@@ -60,8 +59,7 @@
6059

6160
<!-- we need to ignore placeholder build configurations that start with _ -->
6261
<_NonPkgProjProjectReferenceBuildConfigurations Remove="@(_NonPkgProjProjectReferenceBuildConfigurations)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('_'))" />
63-
<!-- Ignore uap build configurations https://github.com/dotnet/corefx/issues/26802 -->
64-
<_NonPkgProjProjectReferenceBuildConfigurations Remove="@(_NonPkgProjProjectReferenceBuildConfigurations)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('uap'))" />
62+
6563
<!-- transform back to project -->
6664
<_NonPkgProjProjectReferenceWitnConfiguration Include="@(_NonPkgProjProjectReferenceBuildConfigurations->'%(OriginalItemSpec)')" />
6765
</ItemGroup>
@@ -186,8 +184,6 @@
186184
<_buildConfigurations Include="$(BuildConfigurations)" />
187185
<!-- For BuildAllConfigurations we need to ignore any placeholder build configuration that starts with _ -->
188186
<_buildConfigurations Remove="@(_buildConfigurations)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('_'))" />
189-
<!-- Ignore uap build configurations https://github.com/dotnet/corefx/issues/26802 -->
190-
<_buildConfigurations Remove="@(_buildConfigurations)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('uap'))" />
191187
<_buildConfigurations Condition="'@(_buildConfigurations)' == ''" Include="$(_traversalBuildConfigurations)" />
192188
</ItemGroup>
193189
</Target>
@@ -212,4 +208,4 @@
212208
</Target>
213209
<Target Name="CleanAll" DependsOnTargets="CleanAllConfigurations" />
214210

215-
</Project>
211+
</Project>

‎pkg/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.pkgproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<ItemGroup>
55
<ProjectReference Include="..\..\src\CoreFx.Private.TestUtilities\ref\CoreFx.Private.TestUtilities.csproj">
6-
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
6+
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks);$(UAPvNextTFM)</SupportedFramework>
77
</ProjectReference>
88
<ProjectReference Include="..\..\src\CoreFx.Private.TestUtilities\src\CoreFx.Private.TestUtilities.csproj"/>
99
</ItemGroup>

‎src/Common/src/Interop/Windows/kernel32/Interop.CreateFile2.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ internal unsafe static IntPtr CreateFile_IntPtr(
9292
FileMode dwCreationDisposition,
9393
int dwFlagsAndAttributes)
9494
{
95-
lpFileName = PathInternal.EnsureExtendedPrefixOverMaxPath(lpFileName);
95+
lpFileName = PathInternal.EnsureExtendedPrefixIfNeeded(lpFileName);
9696
return CreateFile(lpFileName, dwDesiredAccess, dwShareMode, null, dwCreationDisposition, dwFlagsAndAttributes, IntPtr.Zero);
9797
}
9898
}

‎src/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ShouldWriteSigningRequired>false</ShouldWriteSigningRequired>
77
<AllowReferenceFromRuntime>true</AllowReferenceFromRuntime>
88
<RuntimeProjectFile>$(ProjectDir)\external\test-runtime\XUnit.Runtime.depproj</RuntimeProjectFile>
9-
<PackageTargetFramework>netstandard2.0</PackageTargetFramework>
9+
<PackageTargetFramework>netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework>
1010
</PropertyGroup>
1111
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />

‎src/System.IO.Pipes.AccessControl/src/Configurations.props

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<BuildConfigurations>
4+
<PackageConfigurations>
55
netfx-Windows_NT;
66
netcoreapp-Windows_NT;
7-
uap-Windows_NT;
87
netstandard-Windows_NT;
98
netstandard;
9+
</PackageConfigurations>
10+
<BuildConfigurations>
11+
$(PackageConfigurations);
12+
uap-Windows_NT;
1013
</BuildConfigurations>
1114
</PropertyGroup>
12-
</Project>
15+
</Project>

‎src/System.Net.Http/ref/System.Net.Http.cs

+2
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ public ReadOnlyMemoryContent(System.ReadOnlyMemory<byte> content) { }
236236
protected override System.Threading.Tasks.Task SerializeToStreamAsync(System.IO.Stream stream, System.Net.TransportContext context) => throw null;
237237
protected internal override bool TryComputeLength(out long length) => throw null;
238238
}
239+
#if !uap
239240
public sealed class SocketsHttpHandler : HttpMessageHandler
240241
{
241242
public SocketsHttpHandler() { }
@@ -261,6 +262,7 @@ public SocketsHttpHandler() { }
261262
protected override void Dispose(bool disposing) { }
262263
protected internal override System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage> SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; }
263264
}
265+
#endif
264266
public partial class StreamContent : System.Net.Http.HttpContent
265267
{
266268
public StreamContent(System.IO.Stream content) { }

‎src/System.Net.Http/ref/System.Net.Http.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<PropertyGroup>
55
<ProjectGuid>{132BF813-FC40-4D39-8B6F-E55D7633F0ED}</ProjectGuid>
6+
<DefineConstants Condition="'$(TargetGroup)' == 'uap'">$(DefineConstants);uap</DefineConstants>
67
</PropertyGroup>
78
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
89
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />

‎src/System.Net.Http/src/System.Net.Http.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<Compile Include="System\Net\Http\MultipartFormDataContent.cs" />
5656
<Compile Include="System\Net\Http\NetEventSource.Http.cs" />
5757
<Compile Include="System\Net\Http\ReadOnlyMemoryContent.cs" />
58-
<Compile Include="System\Net\Http\SocketsHttpHandler\HttpAuthenticatedConnectionHandler.cs" />
5958
<Compile Include="System\Net\Http\SocketsHttpHandler\HttpConnectionKind.cs" />
6059
<Compile Include="System\Net\Http\StreamContent.cs" />
6160
<Compile Include="System\Net\Http\StreamToStreamCopy.cs" />
@@ -139,6 +138,7 @@
139138
<Compile Include="System\Net\Http\SocketsHttpHandler\CookieHelper.cs" />
140139
<Compile Include="System\Net\Http\SocketsHttpHandler\DecompressionHandler.cs" />
141140
<Compile Include="System\Net\Http\SocketsHttpHandler\EmptyReadStream.cs" />
141+
<Compile Include="System\Net\Http\SocketsHttpHandler\HttpAuthenticatedConnectionHandler.cs" />
142142
<Compile Include="System\Net\Http\SocketsHttpHandler\HttpConnection.cs" />
143143
<Compile Include="System\Net\Http\SocketsHttpHandler\HttpConnectionHandler.cs" />
144144
<Compile Include="System\Net\Http\SocketsHttpHandler\HttpConnectionPool.cs" />
@@ -359,6 +359,7 @@
359359
<!-- WinHttpHandler implementation -->
360360
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'uap'">
361361
<Compile Include="System\Net\Http\HttpClientHandler.Core.cs" />
362+
<Compile Include="System\Net\Http\HttpClientHandler.netcoreapp.cs" />
362363
<Compile Include="System\Net\Http\HttpClientHandler.Windows.cs" />
363364
</ItemGroup>
364365
<!-- Compile the WinHttpHandler implementation into the System.Net.Http.dll binary. This is a
@@ -381,6 +382,7 @@
381382
</PropertyGroup>
382383
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
383384
<Compile Include="System\Net\Http\HttpClientHandler.Core.cs" />
385+
<Compile Include="System\Net\Http\HttpClientHandler.netcoreapp.cs" />
384386
<Compile Include="System\Net\Http\HttpClientHandler.Unix.cs" />
385387
<Compile Include="System\Net\Http\CurlHandler\CurlHandler.cs" />
386388
<Compile Include="System\Net\Http\CurlHandler\CurlHandler.EasyRequest.cs" />

‎src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Core.cs

-7
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,5 @@ private void CheckDisposedOrStarted()
6262
throw new InvalidOperationException(SR.net_http_operation_started);
6363
}
6464
}
65-
66-
private void ThrowForModifiedManagedSslOptionsIfStarted()
67-
{
68-
// Hack to trigger an InvalidOperationException if a property that's stored on
69-
// SslOptions is changed, since SslOptions itself does not do any such checks.
70-
_socketsHttpHandler.SslOptions = _socketsHttpHandler.SslOptions;
71-
}
7265
}
7366
}

‎src/System.Net.Http/src/System/Net/Http/HttpClientHandler.netcoreapp.cs

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System.Collections.Generic;
6+
using System.Net.Security;
7+
using System.Security.Authentication;
8+
using System.Security.Cryptography.X509Certificates;
9+
using System.Threading;
10+
using System.Threading.Tasks;
11+
12+
namespace System.Net.Http
13+
{
14+
// This partial implementation contains members common to NetCoreApp
15+
public partial class HttpClientHandler : HttpMessageHandler
16+
{
17+
private void ThrowForModifiedManagedSslOptionsIfStarted()
18+
{
19+
// Hack to trigger an InvalidOperationException if a property that's stored on
20+
// SslOptions is changed, since SslOptions itself does not do any such checks.
21+
_socketsHttpHandler.SslOptions = _socketsHttpHandler.SslOptions;
22+
}
23+
}
24+
}

‎src/System.Net.NameResolution/src/System.Net.NameResolution.csproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
</ItemGroup>
5555
<ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
5656
<Compile Include="System\Net\NameResolutionPal.Windows.cs" />
57+
<Compile Include="System\Net\NameResolutionPal.Win32.cs" Condition="'$(TargetGroup)' != 'uap'"/>
58+
<Compile Include="System\Net\NameResolutionPal.Uap.cs" Condition="'$(TargetGroup)' == 'uap'"/>
5759
<Compile Include="$(CommonPath)\System\Net\ContextAwareResult.Windows.cs">
5860
<Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>
5961
</Compile>
@@ -126,13 +128,13 @@
126128
<Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs">
127129
<Link>Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs</Link>
128130
</Compile>
129-
<Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
131+
<Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs" Condition="'$(TargetGroup)' != 'uap'">
130132
<Link>Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
131133
</Compile>
132-
<Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
134+
<Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs" Condition="'$(TargetGroup)' != 'uap'">
133135
<Link>Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
134136
</Compile>
135-
<Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
137+
<Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs" Condition="'$(TargetGroup)' != 'uap'">
136138
<Link>Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
137139
</Compile>
138140
<Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">

0 commit comments

Comments
 (0)