diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index 160b5b7d7a2e..230478e9cec8 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -1343,7 +1343,8 @@ "BaselineVersion": "4.0.0", "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", - "4.0.1.0": "4.0.1" + "4.0.1.0": "4.0.1", + "4.1.0.0": "4.3.0" } }, "System.Net.Sockets": { diff --git a/src/System.Net.Security/dir.props b/src/System.Net.Security/dir.props index 38aaf93ed7aa..0769c12aaa28 100644 --- a/src/System.Net.Security/dir.props +++ b/src/System.Net.Security/dir.props @@ -1,7 +1,7 @@ - 4.0.1.0 + 4.1.0.0 diff --git a/src/System.Net.Security/pkg/System.Net.Security.pkgproj b/src/System.Net.Security/pkg/System.Net.Security.pkgproj index 7455d08ae7b7..c616146c50f2 100644 --- a/src/System.Net.Security/pkg/System.Net.Security.pkgproj +++ b/src/System.Net.Security/pkg/System.Net.Security.pkgproj @@ -3,7 +3,7 @@ - net46;netcoreapp1.0;$(AllXamarinFrameworks) + netcoreapp1.1 diff --git a/src/System.Net.Security/ref/System.Net.Security.cs b/src/System.Net.Security/ref/System.Net.Security.cs index 197843a9663a..ea94a028ec94 100644 --- a/src/System.Net.Security/ref/System.Net.Security.cs +++ b/src/System.Net.Security/ref/System.Net.Security.cs @@ -107,6 +107,7 @@ public override void Flush() { } public override int Read(byte[] buffer, int offset, int count) { return default(int); } public override long Seek(long offset, System.IO.SeekOrigin origin) { return default(long); } public override void SetLength(long value) { } + public virtual System.Threading.Tasks.Task ShutdownAsync() { return default(System.Threading.Tasks.Task); } public void Write(byte[] buffer) { } public override void Write(byte[] buffer, int offset, int count) { } } diff --git a/src/System.Net.Security/ref/System.Net.Security.csproj b/src/System.Net.Security/ref/System.Net.Security.csproj index 76a87b281019..91d6b82635cb 100644 --- a/src/System.Net.Security/ref/System.Net.Security.csproj +++ b/src/System.Net.Security/ref/System.Net.Security.csproj @@ -3,7 +3,8 @@ Library - .NETStandard,Version=v1.3 + netcoreapp1.1 + .NETStandard,Version=v1.6 diff --git a/src/System.Net.Security/ref/project.json b/src/System.Net.Security/ref/project.json index 2a93773c4201..dda4cfaff6c2 100644 --- a/src/System.Net.Security/ref/project.json +++ b/src/System.Net.Security/ref/project.json @@ -9,9 +9,9 @@ "System.Threading.Tasks": "4.0.0" }, "frameworks": { - "netstandard1.3": { + "netstandard1.6": { "imports": [ - "dotnet5.4" + "dotnet5.5" ] } } diff --git a/src/System.Net.Security/src/System.Net.Security.builds b/src/System.Net.Security/src/System.Net.Security.builds index 589eec12331e..a2e4c64acb40 100644 --- a/src/System.Net.Security/src/System.Net.Security.builds +++ b/src/System.Net.Security/src/System.Net.Security.builds @@ -8,9 +8,6 @@ Windows_NT - - net46 - diff --git a/src/System.Net.Security/src/System.Net.Security.csproj b/src/System.Net.Security/src/System.Net.Security.csproj index c80a0ebd0ca5..1fa1fe3da488 100644 --- a/src/System.Net.Security/src/System.Net.Security.csproj +++ b/src/System.Net.Security/src/System.Net.Security.csproj @@ -9,10 +9,7 @@ {89F37791-6254-4D60-AB96-ACD3CCA0E771} true $(DefineConstants);FEATURE_CORECLR - true - None - .NETStandard,Version=v1.3 - .NETStandard,Version=v1.6 + .NETStandard,Version=v1.6 win/project.json diff --git a/src/System.Net.Security/src/System/Net/SecureProtocols/SslStream.cs b/src/System.Net.Security/src/System/Net/SecureProtocols/SslStream.cs index 69ce0ae1dd1d..0a9169052363 100644 --- a/src/System.Net.Security/src/System/Net/SecureProtocols/SslStream.cs +++ b/src/System.Net.Security/src/System/Net/SecureProtocols/SslStream.cs @@ -189,6 +189,12 @@ public virtual Task AuthenticateAsServerAsync(X509Certificate serverCertificate, return Task.Factory.FromAsync((callback, state) => BeginAuthenticateAsServer(serverCertificate, clientCertificateRequired, enabledSslProtocols, checkCertificateRevocation, callback, state), EndAuthenticateAsServer, null); } + + public virtual Task ShutdownAsync() + { + throw new PlatformNotSupportedException(); + } + #endregion public override bool IsAuthenticated diff --git a/src/System.Net.Security/src/win/project.json b/src/System.Net.Security/src/win/project.json index 539a1917e499..a59bb39bdf07 100644 --- a/src/System.Net.Security/src/win/project.json +++ b/src/System.Net.Security/src/win/project.json @@ -1,8 +1,8 @@ { "frameworks": { - "netstandard1.3": { + "netstandard1.6": { "imports": [ - "dotnet5.4" + "dotnet5.5" ], "dependencies": { "Microsoft.NETCore.Platforms": "1.0.1", @@ -24,11 +24,6 @@ "System.Threading.Tasks": "4.0.10", "System.Threading.ThreadPool": "4.0.10" } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } } } } diff --git a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 4142e53df14d..1f9b119d771a 100644 --- a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -9,7 +9,9 @@ AnyCPU {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2} Library - .NETStandard,Version=v1.3 + .NETCoreApp,Version=v1.1 + + true diff --git a/src/System.Net.Security/tests/FunctionalTests/unix/project.json b/src/System.Net.Security/tests/FunctionalTests/unix/project.json index a608754f39ec..87ca2540bbff 100644 --- a/src/System.Net.Security/tests/FunctionalTests/unix/project.json +++ b/src/System.Net.Security/tests/FunctionalTests/unix/project.json @@ -29,13 +29,9 @@ "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01" }, "frameworks": { - "netstandard1.3": {} + "netstandard1.6": {} }, "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} + "coreFx.Test.netcoreapp1.1": {} } } diff --git a/src/System.Net.Security/tests/FunctionalTests/win/project.json b/src/System.Net.Security/tests/FunctionalTests/win/project.json index 3caa1226327a..c050ee327ec3 100644 --- a/src/System.Net.Security/tests/FunctionalTests/win/project.json +++ b/src/System.Net.Security/tests/FunctionalTests/win/project.json @@ -24,14 +24,7 @@ "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01", "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01" }, - "frameworks": { - "netstandard1.3": {} - }, "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} + "coreFx.Test.netcoreapp1.1": {} } }