From a381f7ce9c91c80c09da86289d077bc37148eb27 Mon Sep 17 00:00:00 2001 From: Cristian Pop Date: Tue, 30 Aug 2016 12:30:16 -0700 Subject: [PATCH 1/5] Adding new API. --- src/System.Net.Security/dir.props | 2 +- .../pkg/System.Net.Security.pkgproj | 8 +- .../ref/4.0.0/System.Net.Security.Manual.cs | 19 ++ .../ref/4.0.0/System.Net.Security.cs | 162 ++++++++++++++++++ .../ref/4.0.0/System.Net.Security.csproj | 17 ++ .../ref/4.0.0/project.json | 18 ++ .../ref/System.Net.Security.cs | 1 + src/System.Net.Security/ref/project.json | 4 +- .../src/System.Net.Security.csproj | 2 +- .../System/Net/SecureProtocols/SslStream.cs | 6 + src/System.Net.Security/src/win/project.json | 4 +- 11 files changed, 236 insertions(+), 7 deletions(-) create mode 100644 src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs create mode 100644 src/System.Net.Security/ref/4.0.0/System.Net.Security.cs create mode 100644 src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj create mode 100644 src/System.Net.Security/ref/4.0.0/project.json 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..e28f88886bde 100644 --- a/src/System.Net.Security/pkg/System.Net.Security.pkgproj +++ b/src/System.Net.Security/pkg/System.Net.Security.pkgproj @@ -2,11 +2,17 @@ - + net46;netcoreapp1.0;$(AllXamarinFrameworks) + + + net463;netcoreapp1.0; + + + diff --git a/src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs b/src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs new file mode 100644 index 000000000000..cce36b2d4ec1 --- /dev/null +++ b/src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs @@ -0,0 +1,19 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the http://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + + +namespace System.Security.Authentication.ExtendedProtection +{ + public partial class ServiceNameCollection : System.Collections.ICollection + { + public int Count { get { return default(int); } } + bool System.Collections.ICollection.IsSynchronized { get { return default(bool); } } + object System.Collections.ICollection.SyncRoot { get { return default(object); } } + void System.Collections.ICollection.CopyTo(System.Array array, int index) { } + public System.Collections.IEnumerator GetEnumerator() { return default(System.Collections.IEnumerator); } + } +} diff --git a/src/System.Net.Security/ref/4.0.0/System.Net.Security.cs b/src/System.Net.Security/ref/4.0.0/System.Net.Security.cs new file mode 100644 index 000000000000..197843a9663a --- /dev/null +++ b/src/System.Net.Security/ref/4.0.0/System.Net.Security.cs @@ -0,0 +1,162 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the http://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + + +namespace System.Net.Security +{ + public abstract class AuthenticatedStream : System.IO.Stream + { + protected AuthenticatedStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen) { } + public abstract bool IsAuthenticated { get; } + public abstract bool IsEncrypted { get; } + public abstract bool IsMutuallyAuthenticated { get; } + public abstract bool IsServer { get; } + public abstract bool IsSigned { get; } + public bool LeaveInnerStreamOpen { get { return default(bool); } } + protected System.IO.Stream InnerStream { get { return default(System.IO.Stream); } } + protected override void Dispose(bool disposing) { } + } + public enum EncryptionPolicy + { + AllowNoEncryption = 1, + NoEncryption = 2, + RequireEncryption = 0, + } + public delegate System.Security.Cryptography.X509Certificates.X509Certificate LocalCertificateSelectionCallback(object sender, string targetHost, System.Security.Cryptography.X509Certificates.X509CertificateCollection localCertificates, System.Security.Cryptography.X509Certificates.X509Certificate remoteCertificate, string[] acceptableIssuers); + public partial class NegotiateStream : AuthenticatedStream + { + public NegotiateStream(System.IO.Stream innerStream) : base(innerStream, false) { } + public NegotiateStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen) : base(innerStream, leaveInnerStreamOpen) { } + public override bool CanRead { get { return default(bool); } } + public override bool CanSeek { get { return default(bool); } } + public override bool CanTimeout { get { return default(bool); } } + public override bool CanWrite { get { return default(bool); } } + public virtual System.Security.Principal.TokenImpersonationLevel ImpersonationLevel { get { return default(System.Security.Principal.TokenImpersonationLevel); } } + public override bool IsAuthenticated { get { return default(bool); } } + public override bool IsEncrypted { get { return default(bool); } } + public override bool IsMutuallyAuthenticated { get { return default(bool); } } + public override bool IsServer { get { return default(bool); } } + public override bool IsSigned { get { return default(bool); } } + public override long Length { get { return default(long); } } + public override long Position { get { return default(long); } set { } } + public override int ReadTimeout { get { return default(int); } set { } } + public virtual System.Security.Principal.IIdentity RemoteIdentity { get { return default(System.Security.Principal.IIdentity); } } + public override int WriteTimeout { get { return default(int); } set { } } + public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync() { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, string targetName) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, System.Security.Authentication.ExtendedProtection.ChannelBinding binding, string targetName) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, string targetName, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel allowedImpersonationLevel) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, System.Security.Authentication.ExtendedProtection.ChannelBinding binding, string targetName, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel allowedImpersonationLevel) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync() { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy policy) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(NetworkCredential credential, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel requiredImpersonationLevel) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(NetworkCredential credential, System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy policy, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel requiredImpersonationLevel) { return default(System.Threading.Tasks.Task); } + 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 override void Write(byte[] buffer, int offset, int count) { } + } + public enum ProtectionLevel + { + None = 0, + Sign = 1, + EncryptAndSign = 2 + } + public delegate bool RemoteCertificateValidationCallback(object sender, System.Security.Cryptography.X509Certificates.X509Certificate certificate, System.Security.Cryptography.X509Certificates.X509Chain chain, System.Net.Security.SslPolicyErrors sslPolicyErrors); + public partial class SslStream : AuthenticatedStream + { + public SslStream(System.IO.Stream innerStream) : base(innerStream, false) { } + public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen) : base(innerStream, leaveInnerStreamOpen) { } + public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen, System.Net.Security.RemoteCertificateValidationCallback userCertificateValidationCallback) : base(innerStream, leaveInnerStreamOpen) { } + public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen, System.Net.Security.RemoteCertificateValidationCallback userCertificateValidationCallback, System.Net.Security.LocalCertificateSelectionCallback userCertificateSelectionCallback) : base(innerStream, leaveInnerStreamOpen) { } + public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen, System.Net.Security.RemoteCertificateValidationCallback userCertificateValidationCallback, System.Net.Security.LocalCertificateSelectionCallback userCertificateSelectionCallback, System.Net.Security.EncryptionPolicy encryptionPolicy) : base(innerStream, leaveInnerStreamOpen) { } + public override bool CanRead { get { return default(bool); } } + public override bool CanSeek { get { return default(bool); } } + public override bool CanTimeout { get { return default(bool); } } + public override bool CanWrite { get { return default(bool); } } + public virtual bool CheckCertRevocationStatus { get { return default(bool); } } + public virtual System.Security.Authentication.CipherAlgorithmType CipherAlgorithm { get { return default(System.Security.Authentication.CipherAlgorithmType); } } + public virtual int CipherStrength { get { return default(int); } } + public virtual System.Security.Authentication.HashAlgorithmType HashAlgorithm { get { return default(System.Security.Authentication.HashAlgorithmType); } } + public virtual int HashStrength { get { return default(int); } } + public override bool IsAuthenticated { get { return default(bool); } } + public override bool IsEncrypted { get { return default(bool); } } + public override bool IsMutuallyAuthenticated { get { return default(bool); } } + public override bool IsServer { get { return default(bool); } } + public override bool IsSigned { get { return default(bool); } } + public virtual System.Security.Authentication.ExchangeAlgorithmType KeyExchangeAlgorithm { get { return default(System.Security.Authentication.ExchangeAlgorithmType); } } + public virtual int KeyExchangeStrength { get { return default(int); } } + public override long Length { get { return default(long); } } + public virtual System.Security.Cryptography.X509Certificates.X509Certificate LocalCertificate { get { return default(System.Security.Cryptography.X509Certificates.X509Certificate); } } + public override long Position { get { return default(long); } set { } } + public override int ReadTimeout { get { return default(int); } set { } } + public virtual System.Security.Cryptography.X509Certificates.X509Certificate RemoteCertificate { get { return default(System.Security.Cryptography.X509Certificates.X509Certificate); } } + public virtual System.Security.Authentication.SslProtocols SslProtocol { get { return default(System.Security.Authentication.SslProtocols); } } + public System.Net.TransportContext TransportContext { get { return default(System.Net.TransportContext); } } + public override int WriteTimeout { get { return default(int); } set { } } + public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(string targetHost) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(string targetHost, System.Security.Cryptography.X509Certificates.X509CertificateCollection clientCertificates, System.Security.Authentication.SslProtocols enabledSslProtocols, bool checkCertificateRevocation) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Cryptography.X509Certificates.X509Certificate serverCertificate) { return default(System.Threading.Tasks.Task); } + public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Cryptography.X509Certificates.X509Certificate serverCertificate, bool clientCertificateRequired, System.Security.Authentication.SslProtocols enabledSslProtocols, bool checkCertificateRevocation) { return default(System.Threading.Tasks.Task); } + 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 void Write(byte[] buffer) { } + public override void Write(byte[] buffer, int offset, int count) { } + } +} +namespace System.Security.Authentication +{ + public partial class AuthenticationException : System.Exception + { + public AuthenticationException() { } + public AuthenticationException(string message) { } + public AuthenticationException(string message, System.Exception innerException) { } + } + public partial class InvalidCredentialException : System.Security.Authentication.AuthenticationException + { + public InvalidCredentialException() { } + public InvalidCredentialException(string message) { } + public InvalidCredentialException(string message, System.Exception innerException) { } + } +} +namespace System.Security.Authentication.ExtendedProtection +{ + public partial class ExtendedProtectionPolicy + { + public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement) { } + public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement, System.Security.Authentication.ExtendedProtection.ChannelBinding customChannelBinding) { } + public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement, System.Security.Authentication.ExtendedProtection.ProtectionScenario protectionScenario, System.Collections.ICollection customServiceNames) { } + public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement, System.Security.Authentication.ExtendedProtection.ProtectionScenario protectionScenario, System.Security.Authentication.ExtendedProtection.ServiceNameCollection customServiceNames) { } + public System.Security.Authentication.ExtendedProtection.ChannelBinding CustomChannelBinding { get { return default(System.Security.Authentication.ExtendedProtection.ChannelBinding); } } + public System.Security.Authentication.ExtendedProtection.ServiceNameCollection CustomServiceNames { get { return default(System.Security.Authentication.ExtendedProtection.ServiceNameCollection); } } + public static bool OSSupportsExtendedProtection { get { return default(bool); } } + public System.Security.Authentication.ExtendedProtection.PolicyEnforcement PolicyEnforcement { get { return default(System.Security.Authentication.ExtendedProtection.PolicyEnforcement); } } + public System.Security.Authentication.ExtendedProtection.ProtectionScenario ProtectionScenario { get { return default(System.Security.Authentication.ExtendedProtection.ProtectionScenario); } } + public override string ToString() { return default(string); } + } + public enum PolicyEnforcement + { + Always = 2, + Never = 0, + WhenSupported = 1, + } + public enum ProtectionScenario + { + TransportSelected = 0, + TrustedProxy = 1, + } + public partial class ServiceNameCollection + { + public ServiceNameCollection(System.Collections.ICollection items) { } + public bool Contains(string searchServiceName) { return default(bool); } + public System.Security.Authentication.ExtendedProtection.ServiceNameCollection Merge(System.Collections.IEnumerable serviceNames) { return default(System.Security.Authentication.ExtendedProtection.ServiceNameCollection); } + public System.Security.Authentication.ExtendedProtection.ServiceNameCollection Merge(string serviceName) { return default(System.Security.Authentication.ExtendedProtection.ServiceNameCollection); } + } +} diff --git a/src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj b/src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj new file mode 100644 index 000000000000..0d79c8bfbb55 --- /dev/null +++ b/src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj @@ -0,0 +1,17 @@ + + + + + Library + netstandard1.3 + .NETStandard,Version=v1.3 + + + + + + + + + + \ No newline at end of file diff --git a/src/System.Net.Security/ref/4.0.0/project.json b/src/System.Net.Security/ref/4.0.0/project.json new file mode 100644 index 000000000000..2a93773c4201 --- /dev/null +++ b/src/System.Net.Security/ref/4.0.0/project.json @@ -0,0 +1,18 @@ +{ + "dependencies": { + "System.IO": "4.0.0", + "System.Net.Primitives": "4.0.10", + "System.Runtime": "4.0.0", + "System.Runtime.Handles": "4.0.0", + "System.Security.Cryptography.X509Certificates": "4.1.0", + "System.Security.Principal": "4.0.0", + "System.Threading.Tasks": "4.0.0" + }, + "frameworks": { + "netstandard1.3": { + "imports": [ + "dotnet5.4" + ] + } + } +} diff --git a/src/System.Net.Security/ref/System.Net.Security.cs b/src/System.Net.Security/ref/System.Net.Security.cs index 197843a9663a..17392d976297 100644 --- a/src/System.Net.Security/ref/System.Net.Security.cs +++ b/src/System.Net.Security/ref/System.Net.Security.cs @@ -59,6 +59,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 override void Write(byte[] buffer, int offset, int count) { } } public enum ProtectionLevel 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.csproj b/src/System.Net.Security/src/System.Net.Security.csproj index c80a0ebd0ca5..1de39add3e74 100644 --- a/src/System.Net.Security/src/System.Net.Security.csproj +++ b/src/System.Net.Security/src/System.Net.Security.csproj @@ -11,7 +11,7 @@ $(DefineConstants);FEATURE_CORECLR true None - .NETStandard,Version=v1.3 + .NETStandard,Version=v1.6 .NETStandard,Version=v1.6 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..77e8a5aa247f 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", From 2712fc811ecd3098903e832987cd90560b33fead Mon Sep 17 00:00:00 2001 From: Cristian Pop Date: Wed, 31 Aug 2016 18:30:45 -0700 Subject: [PATCH 2/5] Fixing contract. --- src/System.Net.Security/ref/System.Net.Security.cs | 2 +- src/System.Net.Security/ref/System.Net.Security.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System.Net.Security/ref/System.Net.Security.cs b/src/System.Net.Security/ref/System.Net.Security.cs index 17392d976297..ea94a028ec94 100644 --- a/src/System.Net.Security/ref/System.Net.Security.cs +++ b/src/System.Net.Security/ref/System.Net.Security.cs @@ -59,7 +59,6 @@ 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 override void Write(byte[] buffer, int offset, int count) { } } public enum ProtectionLevel @@ -108,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..b662ce0eb3fb 100644 --- a/src/System.Net.Security/ref/System.Net.Security.csproj +++ b/src/System.Net.Security/ref/System.Net.Security.csproj @@ -3,7 +3,7 @@ Library - .NETStandard,Version=v1.3 + .NETStandard,Version=v1.6 From 5336bfa745eb4ebb9dcaf4866388b493681e5b2a Mon Sep 17 00:00:00 2001 From: Cristian Pop Date: Thu, 1 Sep 2016 17:45:17 -0700 Subject: [PATCH 3/5] Switching to netcoreapp1.1. Removing 4.0.0 folder. --- .../packageIndex.json | 3 +- .../pkg/System.Net.Security.pkgproj | 8 +- .../ref/4.0.0/System.Net.Security.Manual.cs | 19 -- .../ref/4.0.0/System.Net.Security.cs | 162 ------------------ .../ref/4.0.0/System.Net.Security.csproj | 17 -- .../ref/4.0.0/project.json | 18 -- .../ref/System.Net.Security.csproj | 1 + .../src/System.Net.Security.builds | 3 - .../src/System.Net.Security.csproj | 3 - src/System.Net.Security/src/win/project.json | 5 - .../System.Net.Security.Tests.csproj | 2 +- .../tests/FunctionalTests/unix/project.json | 8 +- .../tests/FunctionalTests/win/project.json | 9 +- 13 files changed, 8 insertions(+), 250 deletions(-) delete mode 100644 src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs delete mode 100644 src/System.Net.Security/ref/4.0.0/System.Net.Security.cs delete mode 100644 src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj delete mode 100644 src/System.Net.Security/ref/4.0.0/project.json 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/pkg/System.Net.Security.pkgproj b/src/System.Net.Security/pkg/System.Net.Security.pkgproj index e28f88886bde..c616146c50f2 100644 --- a/src/System.Net.Security/pkg/System.Net.Security.pkgproj +++ b/src/System.Net.Security/pkg/System.Net.Security.pkgproj @@ -1,15 +1,9 @@ - - - net46;netcoreapp1.0;$(AllXamarinFrameworks) - - - - net463;netcoreapp1.0; + netcoreapp1.1 diff --git a/src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs b/src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs deleted file mode 100644 index cce36b2d4ec1..000000000000 --- a/src/System.Net.Security/ref/4.0.0/System.Net.Security.Manual.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - - -namespace System.Security.Authentication.ExtendedProtection -{ - public partial class ServiceNameCollection : System.Collections.ICollection - { - public int Count { get { return default(int); } } - bool System.Collections.ICollection.IsSynchronized { get { return default(bool); } } - object System.Collections.ICollection.SyncRoot { get { return default(object); } } - void System.Collections.ICollection.CopyTo(System.Array array, int index) { } - public System.Collections.IEnumerator GetEnumerator() { return default(System.Collections.IEnumerator); } - } -} diff --git a/src/System.Net.Security/ref/4.0.0/System.Net.Security.cs b/src/System.Net.Security/ref/4.0.0/System.Net.Security.cs deleted file mode 100644 index 197843a9663a..000000000000 --- a/src/System.Net.Security/ref/4.0.0/System.Net.Security.cs +++ /dev/null @@ -1,162 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - - -namespace System.Net.Security -{ - public abstract class AuthenticatedStream : System.IO.Stream - { - protected AuthenticatedStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen) { } - public abstract bool IsAuthenticated { get; } - public abstract bool IsEncrypted { get; } - public abstract bool IsMutuallyAuthenticated { get; } - public abstract bool IsServer { get; } - public abstract bool IsSigned { get; } - public bool LeaveInnerStreamOpen { get { return default(bool); } } - protected System.IO.Stream InnerStream { get { return default(System.IO.Stream); } } - protected override void Dispose(bool disposing) { } - } - public enum EncryptionPolicy - { - AllowNoEncryption = 1, - NoEncryption = 2, - RequireEncryption = 0, - } - public delegate System.Security.Cryptography.X509Certificates.X509Certificate LocalCertificateSelectionCallback(object sender, string targetHost, System.Security.Cryptography.X509Certificates.X509CertificateCollection localCertificates, System.Security.Cryptography.X509Certificates.X509Certificate remoteCertificate, string[] acceptableIssuers); - public partial class NegotiateStream : AuthenticatedStream - { - public NegotiateStream(System.IO.Stream innerStream) : base(innerStream, false) { } - public NegotiateStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen) : base(innerStream, leaveInnerStreamOpen) { } - public override bool CanRead { get { return default(bool); } } - public override bool CanSeek { get { return default(bool); } } - public override bool CanTimeout { get { return default(bool); } } - public override bool CanWrite { get { return default(bool); } } - public virtual System.Security.Principal.TokenImpersonationLevel ImpersonationLevel { get { return default(System.Security.Principal.TokenImpersonationLevel); } } - public override bool IsAuthenticated { get { return default(bool); } } - public override bool IsEncrypted { get { return default(bool); } } - public override bool IsMutuallyAuthenticated { get { return default(bool); } } - public override bool IsServer { get { return default(bool); } } - public override bool IsSigned { get { return default(bool); } } - public override long Length { get { return default(long); } } - public override long Position { get { return default(long); } set { } } - public override int ReadTimeout { get { return default(int); } set { } } - public virtual System.Security.Principal.IIdentity RemoteIdentity { get { return default(System.Security.Principal.IIdentity); } } - public override int WriteTimeout { get { return default(int); } set { } } - public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync() { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, string targetName) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, System.Security.Authentication.ExtendedProtection.ChannelBinding binding, string targetName) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, string targetName, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel allowedImpersonationLevel) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(NetworkCredential credential, System.Security.Authentication.ExtendedProtection.ChannelBinding binding, string targetName, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel allowedImpersonationLevel) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync() { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy policy) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(NetworkCredential credential, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel requiredImpersonationLevel) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(NetworkCredential credential, System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy policy, ProtectionLevel requiredProtectionLevel, System.Security.Principal.TokenImpersonationLevel requiredImpersonationLevel) { return default(System.Threading.Tasks.Task); } - 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 override void Write(byte[] buffer, int offset, int count) { } - } - public enum ProtectionLevel - { - None = 0, - Sign = 1, - EncryptAndSign = 2 - } - public delegate bool RemoteCertificateValidationCallback(object sender, System.Security.Cryptography.X509Certificates.X509Certificate certificate, System.Security.Cryptography.X509Certificates.X509Chain chain, System.Net.Security.SslPolicyErrors sslPolicyErrors); - public partial class SslStream : AuthenticatedStream - { - public SslStream(System.IO.Stream innerStream) : base(innerStream, false) { } - public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen) : base(innerStream, leaveInnerStreamOpen) { } - public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen, System.Net.Security.RemoteCertificateValidationCallback userCertificateValidationCallback) : base(innerStream, leaveInnerStreamOpen) { } - public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen, System.Net.Security.RemoteCertificateValidationCallback userCertificateValidationCallback, System.Net.Security.LocalCertificateSelectionCallback userCertificateSelectionCallback) : base(innerStream, leaveInnerStreamOpen) { } - public SslStream(System.IO.Stream innerStream, bool leaveInnerStreamOpen, System.Net.Security.RemoteCertificateValidationCallback userCertificateValidationCallback, System.Net.Security.LocalCertificateSelectionCallback userCertificateSelectionCallback, System.Net.Security.EncryptionPolicy encryptionPolicy) : base(innerStream, leaveInnerStreamOpen) { } - public override bool CanRead { get { return default(bool); } } - public override bool CanSeek { get { return default(bool); } } - public override bool CanTimeout { get { return default(bool); } } - public override bool CanWrite { get { return default(bool); } } - public virtual bool CheckCertRevocationStatus { get { return default(bool); } } - public virtual System.Security.Authentication.CipherAlgorithmType CipherAlgorithm { get { return default(System.Security.Authentication.CipherAlgorithmType); } } - public virtual int CipherStrength { get { return default(int); } } - public virtual System.Security.Authentication.HashAlgorithmType HashAlgorithm { get { return default(System.Security.Authentication.HashAlgorithmType); } } - public virtual int HashStrength { get { return default(int); } } - public override bool IsAuthenticated { get { return default(bool); } } - public override bool IsEncrypted { get { return default(bool); } } - public override bool IsMutuallyAuthenticated { get { return default(bool); } } - public override bool IsServer { get { return default(bool); } } - public override bool IsSigned { get { return default(bool); } } - public virtual System.Security.Authentication.ExchangeAlgorithmType KeyExchangeAlgorithm { get { return default(System.Security.Authentication.ExchangeAlgorithmType); } } - public virtual int KeyExchangeStrength { get { return default(int); } } - public override long Length { get { return default(long); } } - public virtual System.Security.Cryptography.X509Certificates.X509Certificate LocalCertificate { get { return default(System.Security.Cryptography.X509Certificates.X509Certificate); } } - public override long Position { get { return default(long); } set { } } - public override int ReadTimeout { get { return default(int); } set { } } - public virtual System.Security.Cryptography.X509Certificates.X509Certificate RemoteCertificate { get { return default(System.Security.Cryptography.X509Certificates.X509Certificate); } } - public virtual System.Security.Authentication.SslProtocols SslProtocol { get { return default(System.Security.Authentication.SslProtocols); } } - public System.Net.TransportContext TransportContext { get { return default(System.Net.TransportContext); } } - public override int WriteTimeout { get { return default(int); } set { } } - public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(string targetHost) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsClientAsync(string targetHost, System.Security.Cryptography.X509Certificates.X509CertificateCollection clientCertificates, System.Security.Authentication.SslProtocols enabledSslProtocols, bool checkCertificateRevocation) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Cryptography.X509Certificates.X509Certificate serverCertificate) { return default(System.Threading.Tasks.Task); } - public virtual System.Threading.Tasks.Task AuthenticateAsServerAsync(System.Security.Cryptography.X509Certificates.X509Certificate serverCertificate, bool clientCertificateRequired, System.Security.Authentication.SslProtocols enabledSslProtocols, bool checkCertificateRevocation) { return default(System.Threading.Tasks.Task); } - 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 void Write(byte[] buffer) { } - public override void Write(byte[] buffer, int offset, int count) { } - } -} -namespace System.Security.Authentication -{ - public partial class AuthenticationException : System.Exception - { - public AuthenticationException() { } - public AuthenticationException(string message) { } - public AuthenticationException(string message, System.Exception innerException) { } - } - public partial class InvalidCredentialException : System.Security.Authentication.AuthenticationException - { - public InvalidCredentialException() { } - public InvalidCredentialException(string message) { } - public InvalidCredentialException(string message, System.Exception innerException) { } - } -} -namespace System.Security.Authentication.ExtendedProtection -{ - public partial class ExtendedProtectionPolicy - { - public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement) { } - public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement, System.Security.Authentication.ExtendedProtection.ChannelBinding customChannelBinding) { } - public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement, System.Security.Authentication.ExtendedProtection.ProtectionScenario protectionScenario, System.Collections.ICollection customServiceNames) { } - public ExtendedProtectionPolicy(System.Security.Authentication.ExtendedProtection.PolicyEnforcement policyEnforcement, System.Security.Authentication.ExtendedProtection.ProtectionScenario protectionScenario, System.Security.Authentication.ExtendedProtection.ServiceNameCollection customServiceNames) { } - public System.Security.Authentication.ExtendedProtection.ChannelBinding CustomChannelBinding { get { return default(System.Security.Authentication.ExtendedProtection.ChannelBinding); } } - public System.Security.Authentication.ExtendedProtection.ServiceNameCollection CustomServiceNames { get { return default(System.Security.Authentication.ExtendedProtection.ServiceNameCollection); } } - public static bool OSSupportsExtendedProtection { get { return default(bool); } } - public System.Security.Authentication.ExtendedProtection.PolicyEnforcement PolicyEnforcement { get { return default(System.Security.Authentication.ExtendedProtection.PolicyEnforcement); } } - public System.Security.Authentication.ExtendedProtection.ProtectionScenario ProtectionScenario { get { return default(System.Security.Authentication.ExtendedProtection.ProtectionScenario); } } - public override string ToString() { return default(string); } - } - public enum PolicyEnforcement - { - Always = 2, - Never = 0, - WhenSupported = 1, - } - public enum ProtectionScenario - { - TransportSelected = 0, - TrustedProxy = 1, - } - public partial class ServiceNameCollection - { - public ServiceNameCollection(System.Collections.ICollection items) { } - public bool Contains(string searchServiceName) { return default(bool); } - public System.Security.Authentication.ExtendedProtection.ServiceNameCollection Merge(System.Collections.IEnumerable serviceNames) { return default(System.Security.Authentication.ExtendedProtection.ServiceNameCollection); } - public System.Security.Authentication.ExtendedProtection.ServiceNameCollection Merge(string serviceName) { return default(System.Security.Authentication.ExtendedProtection.ServiceNameCollection); } - } -} diff --git a/src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj b/src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj deleted file mode 100644 index 0d79c8bfbb55..000000000000 --- a/src/System.Net.Security/ref/4.0.0/System.Net.Security.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Library - netstandard1.3 - .NETStandard,Version=v1.3 - - - - - - - - - - \ No newline at end of file diff --git a/src/System.Net.Security/ref/4.0.0/project.json b/src/System.Net.Security/ref/4.0.0/project.json deleted file mode 100644 index 2a93773c4201..000000000000 --- a/src/System.Net.Security/ref/4.0.0/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.0.0", - "System.Net.Primitives": "4.0.10", - "System.Runtime": "4.0.0", - "System.Runtime.Handles": "4.0.0", - "System.Security.Cryptography.X509Certificates": "4.1.0", - "System.Security.Principal": "4.0.0", - "System.Threading.Tasks": "4.0.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ - "dotnet5.4" - ] - } - } -} diff --git a/src/System.Net.Security/ref/System.Net.Security.csproj b/src/System.Net.Security/ref/System.Net.Security.csproj index b662ce0eb3fb..91d6b82635cb 100644 --- a/src/System.Net.Security/ref/System.Net.Security.csproj +++ b/src/System.Net.Security/ref/System.Net.Security.csproj @@ -3,6 +3,7 @@ Library + netcoreapp1.1 .NETStandard,Version=v1.6 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 1de39add3e74..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.6 - .NETStandard,Version=v1.6 win/project.json diff --git a/src/System.Net.Security/src/win/project.json b/src/System.Net.Security/src/win/project.json index 77e8a5aa247f..a59bb39bdf07 100644 --- a/src/System.Net.Security/src/win/project.json +++ b/src/System.Net.Security/src/win/project.json @@ -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..ca457849676a 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,7 @@ 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": {} } } From 9aa6ed53140f08f844fbe813d6495f5652c5a5d1 Mon Sep 17 00:00:00 2001 From: Cristian Pop Date: Thu, 1 Sep 2016 17:59:01 -0700 Subject: [PATCH 4/5] Changing test project.json --- src/System.Net.Security/src/win/project.json | 5 +++++ .../tests/FunctionalTests/System.Net.Security.Tests.csproj | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/System.Net.Security/src/win/project.json b/src/System.Net.Security/src/win/project.json index a59bb39bdf07..77e8a5aa247f 100644 --- a/src/System.Net.Security/src/win/project.json +++ b/src/System.Net.Security/src/win/project.json @@ -24,6 +24,11 @@ "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 ca457849676a..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 - .NETCoreApp,Version=v1.1 + .NETCoreApp,Version=v1.1 + + true From 3594a3deec37eaeabb637d7855a1439735a32cef Mon Sep 17 00:00:00 2001 From: Cristian Pop Date: Thu, 1 Sep 2016 18:06:19 -0700 Subject: [PATCH 5/5] Removing net46 added during rebase. --- src/System.Net.Security/src/win/project.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/System.Net.Security/src/win/project.json b/src/System.Net.Security/src/win/project.json index 77e8a5aa247f..a59bb39bdf07 100644 --- a/src/System.Net.Security/src/win/project.json +++ b/src/System.Net.Security/src/win/project.json @@ -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" - } } } }