diff options
| author | Alex Perovich <alperovi@microsoft.com> | 2017-01-09 22:34:54 +0300 |
|---|---|---|
| committer | Alex Perovich <alperovi@microsoft.com> | 2017-01-11 03:20:42 +0300 |
| commit | 1f8b5264a8156f91c48b2dc344d5410ee6f574cb (patch) | |
| tree | 7a5810b9ca46569345adb032194b91812204a6dd /src/System.Net.ServicePoint | |
| parent | 7bba15c1d2518d3f0bb85c40ed87322edfdf87eb (diff) | |
Automated update of ns1.7->ns2.0 and nca1.1->nca2.0
Diffstat (limited to 'src/System.Net.ServicePoint')
8 files changed, 22 insertions, 25 deletions
diff --git a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds index d82852a2d9..84aacf5395 100644 --- a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds +++ b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds @@ -1,8 +1,8 @@ -<?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" /> <ItemGroup> - <Project Include="System.Net.ServicePoint.pkgproj"/> + <Project Include="System.Net.ServicePoint.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj index 7f72c06e93..7f05994ec0 100644 --- a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj +++ b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj @@ -1,14 +1,12 @@ -<?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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.ServicePoint.builds"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.ServicePoint.builds" /> </ItemGroup> - <ItemGroup> <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> @@ -17,6 +15,5 @@ <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds index 4c8d0efd65..d3b89c3f9e 100644 --- a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds +++ b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds @@ -1,10 +1,10 @@ -<?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" /> <ItemGroup> <Project Include="System.Net.ServicePoint.csproj" /> <Project Include="System.Net.ServicePoint.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj index a5d114694c..7d5a508003 100644 --- a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj +++ b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj @@ -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> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/src/Configurations.props b/src/System.Net.ServicePoint/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Net.ServicePoint/src/Configurations.props +++ b/src/System.Net.ServicePoint/src/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/tests/Configurations.props b/src/System.Net.ServicePoint/tests/Configurations.props index de35842580..77a4b65bc9 100644 --- a/src/System.Net.ServicePoint/tests/Configurations.props +++ b/src/System.Net.ServicePoint/tests/Configurations.props @@ -1,9 +1,9 @@ -<?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"> <PropertyGroup> <BuildConfigurations> - netstandard1.7; - netcoreapp1.1; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds index e8db26023e..f4b3861967 100644 --- a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds +++ b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds @@ -1,15 +1,15 @@ -<?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" /> <ItemGroup> <Project Include="System.Net.ServicePoint.Tests.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netstandard</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.Net.ServicePoint.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <!-- TODO #13070: Add net463 once the TFM is actually .Net 4.6.3 --> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.Net.ServicePoint.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> diff --git a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj index 23429b3d14..510c709bee 100644 --- a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj +++ b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj @@ -14,4 +14,4 @@ <Compile Include="TlsSystemDefault.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file |