From 26cd8d51b68578ede39366987a8230c075e93d3f Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 12 Feb 2015 09:07:47 -0800 Subject: [PATCH] Removing ANIs --- src/Microsoft.AspNet.Http.Core/IFormFeature.cs | 2 -- .../AssemblyNeutralAttribute.cs | 13 ------------- .../IHttpApplicationFeature.cs | 2 -- .../IHttpBufferingFeature.cs | 3 --- .../IHttpClientCertificateFeature.cs | 2 -- .../IHttpConnectionFeature.cs | 2 -- .../IHttpRequestFeature.cs | 3 --- .../IHttpRequestLifetimeFeature.cs | 2 -- .../IHttpResponseFeature.cs | 2 -- .../IHttpSendFileFeature.cs | 2 -- .../IHttpUpgradeFeature.cs | 2 -- .../IHttpWebSocketFeature.cs | 2 -- src/Microsoft.AspNet.Http.Interfaces/ISession.cs | 2 -- .../ISessionFactory.cs | 4 ---- .../ISessionFeature.cs | 3 --- .../ITlsTokenBindingFeature.cs | 4 ---- .../IWebSocketAcceptContext.cs | 3 --- .../Security/IAuthTypeContext.cs | 2 -- .../Security/IAuthenticateContext.cs | 2 -- .../Security/IAuthenticationHandler.cs | 3 --- .../Security/IChallengeContext.cs | 2 -- .../Security/IHttpAuthenticationFeature.cs | 2 -- .../Security/ISignInContext.cs | 2 -- .../Security/ISignOutContext .cs | 2 -- src/Microsoft.AspNet.Http.Interfaces/project.json | 6 +----- src/Microsoft.AspNet.Http/IServerInformation.cs | 1 - 26 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 src/Microsoft.AspNet.Http.Interfaces/AssemblyNeutralAttribute.cs diff --git a/src/Microsoft.AspNet.Http.Core/IFormFeature.cs b/src/Microsoft.AspNet.Http.Core/IFormFeature.cs index 00f2645118..2447a8a3fe 100644 --- a/src/Microsoft.AspNet.Http.Core/IFormFeature.cs +++ b/src/Microsoft.AspNet.Http.Core/IFormFeature.cs @@ -3,8 +3,6 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Core { diff --git a/src/Microsoft.AspNet.Http.Interfaces/AssemblyNeutralAttribute.cs b/src/Microsoft.AspNet.Http.Interfaces/AssemblyNeutralAttribute.cs deleted file mode 100644 index e1d35fbf25..0000000000 --- a/src/Microsoft.AspNet.Http.Interfaces/AssemblyNeutralAttribute.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Framework.Runtime -{ - [AssemblyNeutralAttribute] - [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = true)] - public sealed class AssemblyNeutralAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpApplicationFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpApplicationFeature.cs index 2a885ecbbb..1548e74397 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpApplicationFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpApplicationFeature.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpApplicationFeature { string AppName { get; set; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs index 83a6be21d0..d78b7e6e8c 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs @@ -1,11 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Framework.Runtime; - namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpBufferingFeature { void DisableRequestBuffering(); diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpClientCertificateFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpClientCertificateFeature.cs index 556265c165..c49de2b9e2 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpClientCertificateFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpClientCertificateFeature.cs @@ -4,11 +4,9 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpClientCertificateFeature { /// diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs index 51940f3709..dc1f8bd0ac 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Net; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpConnectionFeature { IPAddress RemoteIpAddress { get; set; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs index ca178a7dfa..9f2d3d3c06 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; using System.IO; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpRequestFeature { string Protocol { get; set; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs index 498463dbc3..351e6eb5be 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpRequestLifetimeFeature { CancellationToken RequestAborted { get; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs index b28700df9c..ecdbd93c2f 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs @@ -4,11 +4,9 @@ using System; using System.Collections.Generic; using System.IO; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpResponseFeature { int StatusCode { get; set; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs index dcb598e6ce..76e9b832e8 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs @@ -3,11 +3,9 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpSendFileFeature { Task SendFileAsync(string path, long offset, long? length, CancellationToken cancellation); diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs index 98d4e60cba..6441c8915a 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs @@ -3,11 +3,9 @@ using System.IO; using System.Threading.Tasks; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpUpgradeFeature { bool IsUpgradableRequest { get; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs index d3aeaae642..8b79bde6d7 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs @@ -3,11 +3,9 @@ using System.Net.WebSockets; using System.Threading.Tasks; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IHttpWebSocketFeature { bool IsWebSocketRequest { get; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/ISession.cs b/src/Microsoft.AspNet.Http.Interfaces/ISession.cs index d18fca3e99..90d4e15566 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/ISession.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/ISession.cs @@ -3,11 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface ISession { void Load(); diff --git a/src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs b/src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs index e8917db76d..ff162b8491 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using Microsoft.Framework.Runtime; - namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface ISessionFactory { bool IsAvailable { get; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs index 360e407c65..ffe6e91eac 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Framework.Runtime; - namespace Microsoft.AspNet.Http.Interfaces { // TODO: Is there any reason not to flatten the Factory down into the Feature? - [AssemblyNeutral] public interface ISessionFeature { ISessionFactory Factory { get; set; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/ITlsTokenBindingFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/ITlsTokenBindingFeature.cs index d9aaf0fcd5..d5211d9464 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/ITlsTokenBindingFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/ITlsTokenBindingFeature.cs @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using Microsoft.Framework.Runtime; - namespace Microsoft.AspNet.Http.Interfaces { /// @@ -15,7 +12,6 @@ namespace Microsoft.AspNet.Http.Interfaces /// client's machine. See https://datatracker.ietf.org/doc/draft-popov-token-binding/ /// for more information. /// - [AssemblyNeutral] public interface ITlsTokenBindingFeature { /// diff --git a/src/Microsoft.AspNet.Http.Interfaces/IWebSocketAcceptContext.cs b/src/Microsoft.AspNet.Http.Interfaces/IWebSocketAcceptContext.cs index 80becb585a..1ae4306712 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/IWebSocketAcceptContext.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/IWebSocketAcceptContext.cs @@ -1,11 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Framework.Runtime; - namespace Microsoft.AspNet.Http.Interfaces { - [AssemblyNeutral] public interface IWebSocketAcceptContext { string SubProtocol { get; set; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthTypeContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthTypeContext.cs index d3308720c9..ef952847b0 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthTypeContext.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthTypeContext.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces.Security { - [AssemblyNeutral] public interface IAuthTypeContext { void Accept(IDictionary description); diff --git a/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs index 1e354a8149..3e09a1aa5e 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.Security.Claims; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces.Security { - [AssemblyNeutral] public interface IAuthenticateContext { IEnumerable AuthenticationTypes { get; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs index ca68c40668..32ed5f2cf8 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces.Security { - [AssemblyNeutral] public interface IAuthenticationHandler { void GetDescriptions(IAuthTypeContext context); diff --git a/src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs index 94d64b6257..cb44dc300b 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces.Security { - [AssemblyNeutral] public interface IChallengeContext { IEnumerable AuthenticationTypes {get;} diff --git a/src/Microsoft.AspNet.Http.Interfaces/Security/IHttpAuthenticationFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IHttpAuthenticationFeature.cs index 74605995a9..183ebe9d2f 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/Security/IHttpAuthenticationFeature.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IHttpAuthenticationFeature.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Security.Claims; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces.Security { - [AssemblyNeutral] public interface IHttpAuthenticationFeature { ClaimsPrincipal User { get; set; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/Security/ISignInContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignInContext.cs index eea09aa055..c6d1b4efc0 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/Security/ISignInContext.cs +++ b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignInContext.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.Security.Claims; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces.Security { - [AssemblyNeutral] public interface ISignInContext { IEnumerable Identities { get; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/Security/ISignOutContext .cs b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignOutContext .cs index fd4fe89b11..426c601e24 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/Security/ISignOutContext .cs +++ b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignOutContext .cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.Framework.Runtime; namespace Microsoft.AspNet.Http.Interfaces.Security { - [AssemblyNeutral] public interface ISignOutContext { IEnumerable AuthenticationTypes { get; } diff --git a/src/Microsoft.AspNet.Http.Interfaces/project.json b/src/Microsoft.AspNet.Http.Interfaces/project.json index b2d2d6f3e0..3b6666ff83 100644 --- a/src/Microsoft.AspNet.Http.Interfaces/project.json +++ b/src/Microsoft.AspNet.Http.Interfaces/project.json @@ -6,14 +6,10 @@ "aspnetcore50": { "dependencies": { "Microsoft.Net.WebSocketAbstractions": "1.0.0-*", - "System.IO": "4.0.10-beta-*", "System.Net.Primitives": "4.0.10-beta-*", - "System.Runtime": "4.0.20-beta-*", - "System.Runtime.InteropServices": "4.0.20-beta-*", "System.Security.Claims": "4.0.0-beta-*", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-*", - "System.Security.Principal": "4.0.0-beta-*", - "System.Threading.Tasks": "4.0.10-beta-*" + "System.Security.Principal": "4.0.0-beta-*" } } } diff --git a/src/Microsoft.AspNet.Http/IServerInformation.cs b/src/Microsoft.AspNet.Http/IServerInformation.cs index f7f267996c..e99042e637 100644 --- a/src/Microsoft.AspNet.Http/IServerInformation.cs +++ b/src/Microsoft.AspNet.Http/IServerInformation.cs @@ -3,7 +3,6 @@ namespace Microsoft.AspNet.Builder { - // TODO: [AssemblyNeutral] public interface IServerInformation { string Name { get; }