From 28fbacc7f4a64fdfe765fce6b43f06b7262cfd9c Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 16 Apr 2014 09:17:37 -0700 Subject: [PATCH] Remove #if NET45s for IPAddress, X509Certificate. --- src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs | 4 ---- .../IHttpTransportLayerSecurity.cs | 5 +---- src/Microsoft.AspNet.HttpFeature/project.json | 2 ++ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs b/src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs index 9af5df12e8..3598c015f1 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs @@ -1,15 +1,11 @@ -#if NET45 using System.Net; -#endif namespace Microsoft.AspNet.HttpFeature { public interface IHttpConnection { -#if NET45 IPAddress RemoteIpAddress { get; set; } IPAddress LocalIpAddress { get; set; } -#endif int RemotePort { get; set; } int LocalPort { get; set; } bool IsLocal { get; set; } diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurity.cs b/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurity.cs index 7a27df9b6c..fd08f2b076 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurity.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurity.cs @@ -1,15 +1,12 @@ -#if NET45 + using System.Security.Cryptography.X509Certificates; -#endif using System.Threading.Tasks; namespace Microsoft.AspNet.HttpFeature { public interface IHttpTransportLayerSecurity { -#if NET45 X509Certificate ClientCertificate { get; set; } -#endif Task LoadAsync(); } } diff --git a/src/Microsoft.AspNet.HttpFeature/project.json b/src/Microsoft.AspNet.HttpFeature/project.json index 35f7cd2425..7060443fce 100644 --- a/src/Microsoft.AspNet.HttpFeature/project.json +++ b/src/Microsoft.AspNet.HttpFeature/project.json @@ -5,9 +5,11 @@ "k10": { "dependencies": { "System.IO": "4.0.0.0", + "System.Net.Primitives": "4.0.10.0", "System.Runtime": "4.0.20.0", "System.Runtime.InteropServices": "4.0.20.0", "System.Security.Claims": "0.1-alpha-*", + "System.Security.Cryptography.X509Certificates": "4.0.0.0", "System.Security.Principal": "4.0.0.0", "System.Threading.Tasks": "4.0.10.0" }