diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-01-28 04:04:34 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-01-30 22:14:08 +0300 |
| commit | 28097ca87cc2e8bcf7760f05732464b2c00eeaa4 (patch) | |
| tree | 79ad6cfa9d4ca89295c7c8fd81a94d5226782b77 /src/System.Net.ServicePoint | |
| parent | 42fd87c10367df5b5546b165e20a26f0295ded53 (diff) | |
Fix src projects for appropriate ref folder
After the change to use the appropriate references for a configuration
we needed to make sure that every library has a versionless targetgroup
so that it can build in the source build scenarios without requiring
external packages from NuGet.
For any library that is part of netstandard, its implementation should
not build against netstandard
For any library that is part of the imlpementation closure of netstandard,
its implementation should not build against netstandard (else we'd have cycles).
OpenSSL must keep its netstandard ref, however it has NETCoreApp specific API
dependencies. See https://github.com/dotnet/standard/issues/186. As such we
need to cross-compile both src and ref for NETCoreApp. I've moved the not-
supported assembly to be the 'netstandard' implementation.
Diffstat (limited to 'src/System.Net.ServicePoint')
| -rw-r--r-- | src/System.Net.ServicePoint/src/Configurations.props | 3 | ||||
| -rw-r--r-- | src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/System.Net.ServicePoint/src/Configurations.props b/src/System.Net.ServicePoint/src/Configurations.props index bcfec4bbde..886750970a 100644 --- a/src/System.Net.ServicePoint/src/Configurations.props +++ b/src/System.Net.ServicePoint/src/Configurations.props @@ -3,7 +3,8 @@ <PropertyGroup> <BuildConfigurations> net461-Windows_NT; - netstandard; + netcoreapp; + uap; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj index 4ce896bd87..4dbd008967 100644 --- a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj +++ b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj @@ -9,9 +9,9 @@ <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Release|AnyCPU'" /> + <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'"> <Compile Include="System\Net\BindIPEndPoint.cs" /> <Compile Include="System\Net\ServicePoint.cs" /> <Compile Include="System\Net\ServicePointManager.cs" /> |