diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-01-06 01:03:56 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-01-06 01:03:56 +0300 |
| commit | 44b68e694948065c1b61457cec125d3d64c1fa22 (patch) | |
| tree | fc7093fb753c57f29ce42de9dd64ecc435d2e95c /src/System.Net.ServicePoint | |
| parent | d4d3bbdf7b8b35b5a330c94427051582470531d0 (diff) | |
| parent | 05ae65fd6b51f865750e8d400c60511fcdbbbfb5 (diff) | |
Merge branch master into dev/eng
Diffstat (limited to 'src/System.Net.ServicePoint')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj index fff1c7e234..7f72c06e93 100644 --- a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj +++ b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj @@ -4,7 +4,7 @@ <ItemGroup> <ProjectReference Include="..\ref\System.Net.ServicePoint.builds"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.ServicePoint.builds" /> </ItemGroup> diff --git a/src/System.Net.ServicePoint/src/Configurations.props b/src/System.Net.ServicePoint/src/Configurations.props index 9c336c0be9..53b62c64fe 100644 --- a/src/System.Net.ServicePoint/src/Configurations.props +++ b/src/System.Net.ServicePoint/src/Configurations.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - net463-Windows_NT; + net461-Windows_NT; netstandard; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj index 6e489da3b5..c8d8564161 100644 --- a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj +++ b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj @@ -4,20 +4,20 @@ <PropertyGroup> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\BindIPEndPoint.cs" /> <Compile Include="System\Net\ServicePoint.cs" /> <Compile Include="System\Net\ServicePointManager.cs" /> <Compile Include="System\Net\SecurityProtocolType.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'net461'"> <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> |