From b77e9d2d9ccdf78e4cd0941af53aff08931b8374 Mon Sep 17 00:00:00 2001 From: Praburaj Date: Fri, 13 Mar 2015 17:44:51 -0700 Subject: [PATCH] Using [NotNull] attribute from the Common repo package --- .../FeatureCollection.cs | 1 + .../NotNullAttribute.cs | 12 ------------ src/Microsoft.AspNet.FeatureModel/project.json | 9 +++++---- .../Authentication/AuthenticateContext.cs | 1 + .../Authentication/ChallengeContext.cs | 1 + .../Authentication/SignInContext.cs | 1 + .../Authentication/SignOutContext.cs | 1 + src/Microsoft.AspNet.Http.Core/BufferingHelper.cs | 1 + .../Collections/FormCollection.cs | 2 +- .../Collections/HeaderDictionary.cs | 3 +-- .../Collections/ReadableStringCollection.cs | 3 +-- .../Collections/ResponseCookies.cs | 1 + src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs | 6 +++--- .../DefaultHttpResponse.cs | 1 + src/Microsoft.AspNet.Http.Core/FormFeature.cs | 3 +-- .../Infrastructure/ParsingHelpers.cs | 2 +- src/Microsoft.AspNet.Http.Core/NotNullAttribute.cs | 12 ------------ src/Microsoft.AspNet.Http.Core/QueryFeature.cs | 1 + .../ReferenceReadStream.cs | 1 + .../RequestCookiesFeature.cs | 1 + src/Microsoft.AspNet.Http.Core/project.json | 1 + .../FormFileExtensions.cs | 1 + .../HeaderDictionaryTypeExtensions.cs | 1 + .../HttpResponseSendingExtensions.cs | 1 + .../NotNullAttribute.cs | 12 ------------ .../RequestHeaders.cs | 1 + .../ResponseHeaders.cs | 1 + .../SendFileResponseExtensions.cs | 1 + src/Microsoft.AspNet.Http.Extensions/project.json | 1 + .../Authentication/AuthenticateResult.cs | 1 + .../Authentication/AuthenticationDescription.cs | 1 + .../Extensions/MapExtensions.cs | 1 + .../Extensions/MapMiddleware.cs | 1 + .../Extensions/MapWhenExtensions.cs | 1 + .../Extensions/MapWhenMiddleware.cs | 1 + .../Extensions/RunExtensions.cs | 1 + src/Microsoft.AspNet.Http/FragmentString.cs | 1 + src/Microsoft.AspNet.Http/HostString.cs | 1 + .../HttpResponseWritingExtensions.cs | 1 + src/Microsoft.AspNet.Http/NotNullAttribute.cs | 12 ------------ src/Microsoft.AspNet.Http/PathString.cs | 1 + src/Microsoft.AspNet.Http/QueryString.cs | 1 + src/Microsoft.AspNet.Http/project.json | 1 + src/Microsoft.AspNet.Owin/NotNullAttribute.cs | 12 ------------ src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs | 1 + src/Microsoft.AspNet.Owin/project.json | 3 ++- .../BufferedReadStream.cs | 1 + .../FileBufferingReadStream.cs | 1 + src/Microsoft.AspNet.WebUtilities/FormReader.cs | 1 + .../KeyValueAccumulator.cs | 1 + src/Microsoft.AspNet.WebUtilities/MultipartReader.cs | 1 + .../MultipartReaderStream.cs | 1 + .../NotNullAttribute.cs | 12 ------------ src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs | 1 + src/Microsoft.AspNet.WebUtilities/WebEncoders.cs | 1 + src/Microsoft.AspNet.WebUtilities/project.json | 1 + src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs | 1 + .../GenericHeaderParser.cs | 2 ++ src/Microsoft.Net.Http.Headers/NotNullAttribute.cs | 12 ------------ .../SetCookieHeaderValue.cs | 1 + .../StringWithQualityHeaderValueComparer.cs | 1 + src/Microsoft.Net.Http.Headers/project.json | 1 + 62 files changed, 63 insertions(+), 100 deletions(-) delete mode 100644 src/Microsoft.AspNet.FeatureModel/NotNullAttribute.cs delete mode 100644 src/Microsoft.AspNet.Http.Core/NotNullAttribute.cs delete mode 100644 src/Microsoft.AspNet.Http.Extensions/NotNullAttribute.cs delete mode 100644 src/Microsoft.AspNet.Http/NotNullAttribute.cs delete mode 100644 src/Microsoft.AspNet.Owin/NotNullAttribute.cs delete mode 100644 src/Microsoft.AspNet.WebUtilities/NotNullAttribute.cs delete mode 100644 src/Microsoft.Net.Http.Headers/NotNullAttribute.cs diff --git a/src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs b/src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs index b86a3832b1..28e01101ff 100644 --- a/src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs +++ b/src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs @@ -6,6 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Threading; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.FeatureModel { diff --git a/src/Microsoft.AspNet.FeatureModel/NotNullAttribute.cs b/src/Microsoft.AspNet.FeatureModel/NotNullAttribute.cs deleted file mode 100644 index 3869edda12..0000000000 --- a/src/Microsoft.AspNet.FeatureModel/NotNullAttribute.cs +++ /dev/null @@ -1,12 +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.AspNet.FeatureModel -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.FeatureModel/project.json b/src/Microsoft.AspNet.FeatureModel/project.json index 5513054416..1d28c1258f 100644 --- a/src/Microsoft.AspNet.FeatureModel/project.json +++ b/src/Microsoft.AspNet.FeatureModel/project.json @@ -1,8 +1,9 @@ { - "version": "1.0.0-*", - "description": "ASP.NET 5 HTTP feature infrastructure.", - "dependencies": { - }, + "version": "1.0.0-*", + "description": "ASP.NET 5 HTTP feature infrastructure.", + "dependencies": { + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } + }, "frameworks": { "dnx451": {}, "dnxcore50": { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs b/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs index b623f15c50..1fa87a6417 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs +++ b/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticateContext.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Security.Claims; using Microsoft.AspNet.Http.Authentication; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Authentication { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/ChallengeContext.cs b/src/Microsoft.AspNet.Http.Core/Authentication/ChallengeContext.cs index 00c5a1c6fb..7b86337ccd 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/ChallengeContext.cs +++ b/src/Microsoft.AspNet.Http.Core/Authentication/ChallengeContext.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http.Authentication; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Authentication { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/SignInContext.cs b/src/Microsoft.AspNet.Http.Core/Authentication/SignInContext.cs index b5d8361ad6..6d067c3919 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/SignInContext.cs +++ b/src/Microsoft.AspNet.Http.Core/Authentication/SignInContext.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Security.Claims; using Microsoft.AspNet.Http.Authentication; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Authentication { diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/SignOutContext.cs b/src/Microsoft.AspNet.Http.Core/Authentication/SignOutContext.cs index 3676102e03..318be62c70 100644 --- a/src/Microsoft.AspNet.Http.Core/Authentication/SignOutContext.cs +++ b/src/Microsoft.AspNet.Http.Core/Authentication/SignOutContext.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http.Authentication; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Authentication { diff --git a/src/Microsoft.AspNet.Http.Core/BufferingHelper.cs b/src/Microsoft.AspNet.Http.Core/BufferingHelper.cs index 32dde60d46..3c0120f725 100644 --- a/src/Microsoft.AspNet.Http.Core/BufferingHelper.cs +++ b/src/Microsoft.AspNet.Http.Core/BufferingHelper.cs @@ -4,6 +4,7 @@ using System; using System.IO; using Microsoft.AspNet.WebUtilities; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/FormCollection.cs b/src/Microsoft.AspNet.Http.Core/Collections/FormCollection.cs index 55d7b321a0..ffef8fcaa2 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/FormCollection.cs +++ b/src/Microsoft.AspNet.Http.Core/Collections/FormCollection.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Http; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Collections { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/HeaderDictionary.cs b/src/Microsoft.AspNet.Http.Core/Collections/HeaderDictionary.cs index 72dc55ec36..487f1c4190 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/HeaderDictionary.cs +++ b/src/Microsoft.AspNet.Http.Core/Collections/HeaderDictionary.cs @@ -5,9 +5,8 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http.Infrastructure; -using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Core.Infrastructure; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Collections { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/ReadableStringCollection.cs b/src/Microsoft.AspNet.Http.Core/Collections/ReadableStringCollection.cs index 91f3b8c8f3..38aa497e12 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/ReadableStringCollection.cs +++ b/src/Microsoft.AspNet.Http.Core/Collections/ReadableStringCollection.cs @@ -1,10 +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 System; using System.Collections; using System.Collections.Generic; -using Microsoft.AspNet.Http; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Collections { diff --git a/src/Microsoft.AspNet.Http.Core/Collections/ResponseCookies.cs b/src/Microsoft.AspNet.Http.Core/Collections/ResponseCookies.cs index 8066450f98..056df67640 100644 --- a/src/Microsoft.AspNet.Http.Core/Collections/ResponseCookies.cs +++ b/src/Microsoft.AspNet.Http.Core/Collections/ResponseCookies.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using Microsoft.AspNet.Http.Infrastructure; +using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; namespace Microsoft.AspNet.Http.Core.Collections diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs index d178aa90e0..90dff4c588 100644 --- a/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs @@ -9,12 +9,12 @@ using System.Security.Claims; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.FeatureModel; +using Microsoft.AspNet.Http.Authentication; +using Microsoft.AspNet.Http.Core.Authentication; using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.Http.Core.Infrastructure; -using Microsoft.AspNet.Http.Core.Authentication; using Microsoft.AspNet.Http.Infrastructure; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Authentication; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core { diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs index fd2dab86ed..fda8dd0ff3 100644 --- a/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs @@ -12,6 +12,7 @@ using Microsoft.AspNet.Http.Core.Authentication; using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.Http.Core.Infrastructure; using Microsoft.AspNet.Http.Infrastructure; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core { diff --git a/src/Microsoft.AspNet.Http.Core/FormFeature.cs b/src/Microsoft.AspNet.Http.Core/FormFeature.cs index a0f1d5db07..33f84e3745 100644 --- a/src/Microsoft.AspNet.Http.Core/FormFeature.cs +++ b/src/Microsoft.AspNet.Http.Core/FormFeature.cs @@ -4,13 +4,12 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.WebUtilities; +using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Http.Core diff --git a/src/Microsoft.AspNet.Http.Core/Infrastructure/ParsingHelpers.cs b/src/Microsoft.AspNet.Http.Core/Infrastructure/ParsingHelpers.cs index 85208daa0d..d9c9a3540e 100644 --- a/src/Microsoft.AspNet.Http.Core/Infrastructure/ParsingHelpers.cs +++ b/src/Microsoft.AspNet.Http.Core/Infrastructure/ParsingHelpers.cs @@ -6,8 +6,8 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; -using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Infrastructure; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core.Infrastructure { diff --git a/src/Microsoft.AspNet.Http.Core/NotNullAttribute.cs b/src/Microsoft.AspNet.Http.Core/NotNullAttribute.cs deleted file mode 100644 index 2328b5d5d8..0000000000 --- a/src/Microsoft.AspNet.Http.Core/NotNullAttribute.cs +++ /dev/null @@ -1,12 +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.AspNet.Http.Core -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Http.Core/QueryFeature.cs b/src/Microsoft.AspNet.Http.Core/QueryFeature.cs index 16923fe544..bda0ab5fc4 100644 --- a/src/Microsoft.AspNet.Http.Core/QueryFeature.cs +++ b/src/Microsoft.AspNet.Http.Core/QueryFeature.cs @@ -6,6 +6,7 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.Http.Core.Infrastructure; using Microsoft.AspNet.WebUtilities; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core { diff --git a/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs b/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs index ec692ee014..4b1093a66a 100644 --- a/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs +++ b/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs @@ -5,6 +5,7 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core { diff --git a/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs index 192c5f866f..a04d2b7016 100644 --- a/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs +++ b/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.Http.Core.Infrastructure; using Microsoft.AspNet.Http.Infrastructure; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Core { diff --git a/src/Microsoft.AspNet.Http.Core/project.json b/src/Microsoft.AspNet.Http.Core/project.json index 569d667698..61d978811d 100644 --- a/src/Microsoft.AspNet.Http.Core/project.json +++ b/src/Microsoft.AspNet.Http.Core/project.json @@ -6,6 +6,7 @@ "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.WebEncoders.Core": "1.0.0-*", "Microsoft.Net.Http.Headers": "1.0.0-*" }, diff --git a/src/Microsoft.AspNet.Http.Extensions/FormFileExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/FormFileExtensions.cs index e97059c66b..358be0ad3a 100644 --- a/src/Microsoft.AspNet.Http.Extensions/FormFileExtensions.cs +++ b/src/Microsoft.AspNet.Http.Extensions/FormFileExtensions.cs @@ -4,6 +4,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http { diff --git a/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs index fc4438c018..02178a65cd 100644 --- a/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs +++ b/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.AspNet.Http.Headers; +using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Http diff --git a/src/Microsoft.AspNet.Http.Extensions/HttpResponseSendingExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/HttpResponseSendingExtensions.cs index b97da7c13b..40d4f1c3c7 100644 --- a/src/Microsoft.AspNet.Http.Extensions/HttpResponseSendingExtensions.cs +++ b/src/Microsoft.AspNet.Http.Extensions/HttpResponseSendingExtensions.cs @@ -5,6 +5,7 @@ using System; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http { diff --git a/src/Microsoft.AspNet.Http.Extensions/NotNullAttribute.cs b/src/Microsoft.AspNet.Http.Extensions/NotNullAttribute.cs deleted file mode 100644 index d43b93e4e4..0000000000 --- a/src/Microsoft.AspNet.Http.Extensions/NotNullAttribute.cs +++ /dev/null @@ -1,12 +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.AspNet.Http -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Http.Extensions/RequestHeaders.cs b/src/Microsoft.AspNet.Http.Extensions/RequestHeaders.cs index eeeef90b24..21499b8092 100644 --- a/src/Microsoft.AspNet.Http.Extensions/RequestHeaders.cs +++ b/src/Microsoft.AspNet.Http.Extensions/RequestHeaders.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Http.Headers diff --git a/src/Microsoft.AspNet.Http.Extensions/ResponseHeaders.cs b/src/Microsoft.AspNet.Http.Extensions/ResponseHeaders.cs index 4169f237a7..c88430eed8 100644 --- a/src/Microsoft.AspNet.Http.Extensions/ResponseHeaders.cs +++ b/src/Microsoft.AspNet.Http.Extensions/ResponseHeaders.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http.Extensions; +using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Http.Headers diff --git a/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs index 2dcbdafc8a..029ce3d4be 100644 --- a/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs +++ b/src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http.Extensions; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http { diff --git a/src/Microsoft.AspNet.Http.Extensions/project.json b/src/Microsoft.AspNet.Http.Extensions/project.json index 383484ef75..1a418e3bdf 100644 --- a/src/Microsoft.AspNet.Http.Extensions/project.json +++ b/src/Microsoft.AspNet.Http.Extensions/project.json @@ -5,6 +5,7 @@ "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.WebEncoders.Core": "1.0.0-*", "Microsoft.Net.Http.Headers": "1.0.0-*" }, diff --git a/src/Microsoft.AspNet.Http/Authentication/AuthenticateResult.cs b/src/Microsoft.AspNet.Http/Authentication/AuthenticateResult.cs index e1d3918dbc..9488cd52c4 100644 --- a/src/Microsoft.AspNet.Http/Authentication/AuthenticateResult.cs +++ b/src/Microsoft.AspNet.Http/Authentication/AuthenticateResult.cs @@ -2,6 +2,7 @@ // 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.Internal; namespace Microsoft.AspNet.Http.Authentication { diff --git a/src/Microsoft.AspNet.Http/Authentication/AuthenticationDescription.cs b/src/Microsoft.AspNet.Http/Authentication/AuthenticationDescription.cs index 7df6a014c0..81653dd166 100644 --- a/src/Microsoft.AspNet.Http/Authentication/AuthenticationDescription.cs +++ b/src/Microsoft.AspNet.Http/Authentication/AuthenticationDescription.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http.Authentication { diff --git a/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs index 9696b99da7..5f71a1b792 100644 --- a/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs @@ -4,6 +4,7 @@ using System; using Microsoft.AspNet.Http; using Microsoft.AspNet.Builder.Extensions; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { diff --git a/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs b/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs index 5bf26af0b8..5e2d8891b7 100644 --- a/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder.Extensions { diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs index 63e65a0a11..117b8cacc1 100644 --- a/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs @@ -8,6 +8,7 @@ using Microsoft.AspNet.Builder.Extensions; namespace Microsoft.AspNet.Builder { + using Microsoft.Framework.Internal; using Predicate = Func; using PredicateAsync = Func>; diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs index 51606e609c..b4f5c78b0b 100644 --- a/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs +++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder.Extensions { diff --git a/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs index 4b74158aae..c0cb5af259 100644 --- a/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs +++ b/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs @@ -4,6 +4,7 @@ using System; using Microsoft.AspNet.Http; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Builder { diff --git a/src/Microsoft.AspNet.Http/FragmentString.cs b/src/Microsoft.AspNet.Http/FragmentString.cs index f40ba626a1..32b4ba6f52 100644 --- a/src/Microsoft.AspNet.Http/FragmentString.cs +++ b/src/Microsoft.AspNet.Http/FragmentString.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http { diff --git a/src/Microsoft.AspNet.Http/HostString.cs b/src/Microsoft.AspNet.Http/HostString.cs index c91ce65a5b..55fdb988ec 100644 --- a/src/Microsoft.AspNet.Http/HostString.cs +++ b/src/Microsoft.AspNet.Http/HostString.cs @@ -4,6 +4,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Globalization; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http { diff --git a/src/Microsoft.AspNet.Http/HttpResponseWritingExtensions.cs b/src/Microsoft.AspNet.Http/HttpResponseWritingExtensions.cs index 464513f895..1035c1aaaa 100644 --- a/src/Microsoft.AspNet.Http/HttpResponseWritingExtensions.cs +++ b/src/Microsoft.AspNet.Http/HttpResponseWritingExtensions.cs @@ -5,6 +5,7 @@ using System; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Http { diff --git a/src/Microsoft.AspNet.Http/NotNullAttribute.cs b/src/Microsoft.AspNet.Http/NotNullAttribute.cs deleted file mode 100644 index d43b93e4e4..0000000000 --- a/src/Microsoft.AspNet.Http/NotNullAttribute.cs +++ /dev/null @@ -1,12 +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.AspNet.Http -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Http/PathString.cs b/src/Microsoft.AspNet.Http/PathString.cs index 8a7f5d945c..5e6f03ec70 100644 --- a/src/Microsoft.AspNet.Http/PathString.cs +++ b/src/Microsoft.AspNet.Http/PathString.cs @@ -3,6 +3,7 @@ using System; using System.Linq; +using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; namespace Microsoft.AspNet.Http diff --git a/src/Microsoft.AspNet.Http/QueryString.cs b/src/Microsoft.AspNet.Http/QueryString.cs index 6b61d92f99..48d68b292a 100644 --- a/src/Microsoft.AspNet.Http/QueryString.cs +++ b/src/Microsoft.AspNet.Http/QueryString.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; namespace Microsoft.AspNet.Http diff --git a/src/Microsoft.AspNet.Http/project.json b/src/Microsoft.AspNet.Http/project.json index 30d577d013..33d1c1c46a 100644 --- a/src/Microsoft.AspNet.Http/project.json +++ b/src/Microsoft.AspNet.Http/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "description": "ASP.NET 5 HTTP object model. HttpContext and family.", "dependencies": { + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.WebEncoders.Core": "1.0.0-*" }, "frameworks": { diff --git a/src/Microsoft.AspNet.Owin/NotNullAttribute.cs b/src/Microsoft.AspNet.Owin/NotNullAttribute.cs deleted file mode 100644 index a42aa58d4a..0000000000 --- a/src/Microsoft.AspNet.Owin/NotNullAttribute.cs +++ /dev/null @@ -1,12 +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.AspNet.Owin -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs index 7d30044171..0c7af1986a 100644 --- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs +++ b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs @@ -20,6 +20,7 @@ using Microsoft.AspNet.Http.Authentication; namespace Microsoft.AspNet.Owin { + using Microsoft.Framework.Internal; using SendFileFunc = Func; public class OwinFeatureCollection : diff --git a/src/Microsoft.AspNet.Owin/project.json b/src/Microsoft.AspNet.Owin/project.json index 90a7af6c7f..e7274c329b 100644 --- a/src/Microsoft.AspNet.Owin/project.json +++ b/src/Microsoft.AspNet.Owin/project.json @@ -4,7 +4,8 @@ "dependencies": { "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http.Core": "1.0.0-*" + "Microsoft.AspNet.Http.Core": "1.0.0-*", + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } }, "frameworks": { "dnx451": { }, diff --git a/src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs b/src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs index 2e6e39b6d2..2ffc33ad46 100644 --- a/src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs +++ b/src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs @@ -6,6 +6,7 @@ using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs b/src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs index aecd6e9ee5..26fba82548 100644 --- a/src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs +++ b/src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs @@ -5,6 +5,7 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/FormReader.cs b/src/Microsoft.AspNet.WebUtilities/FormReader.cs index 1682e7c5b2..dd11b0cff2 100644 --- a/src/Microsoft.AspNet.WebUtilities/FormReader.cs +++ b/src/Microsoft.AspNet.WebUtilities/FormReader.cs @@ -7,6 +7,7 @@ using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs b/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs index 4c9d629a47..286f2a8a6f 100644 --- a/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs +++ b/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs @@ -2,6 +2,7 @@ // 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.Internal; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs b/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs index 766e5361dc..d9966ffd48 100644 --- a/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs +++ b/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs b/src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs index 1bbf55e57c..bb8e07c25e 100644 --- a/src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs +++ b/src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs @@ -7,6 +7,7 @@ using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/NotNullAttribute.cs b/src/Microsoft.AspNet.WebUtilities/NotNullAttribute.cs deleted file mode 100644 index d489cf36b3..0000000000 --- a/src/Microsoft.AspNet.WebUtilities/NotNullAttribute.cs +++ /dev/null @@ -1,12 +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.AspNet.WebUtilities -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs b/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs index d7584b536a..8266dc4fb5 100644 --- a/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs +++ b/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Text; +using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; namespace Microsoft.AspNet.WebUtilities diff --git a/src/Microsoft.AspNet.WebUtilities/WebEncoders.cs b/src/Microsoft.AspNet.WebUtilities/WebEncoders.cs index f73c3c249f..2a559d0ec9 100644 --- a/src/Microsoft.AspNet.WebUtilities/WebEncoders.cs +++ b/src/Microsoft.AspNet.WebUtilities/WebEncoders.cs @@ -3,6 +3,7 @@ using System; using System.Diagnostics; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/project.json b/src/Microsoft.AspNet.WebUtilities/project.json index 19bedc2195..d47cde29be 100644 --- a/src/Microsoft.AspNet.WebUtilities/project.json +++ b/src/Microsoft.AspNet.WebUtilities/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "description": "ASP.NET 5 common helper methods.", "dependencies": { + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.WebEncoders.Core": "1.0.0-*" }, "frameworks": { diff --git a/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs b/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs index c4c1207380..a7911d164f 100644 --- a/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs +++ b/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Contracts; using System.Text; +using Microsoft.Framework.Internal; namespace Microsoft.Net.Http.Headers { diff --git a/src/Microsoft.Net.Http.Headers/GenericHeaderParser.cs b/src/Microsoft.Net.Http.Headers/GenericHeaderParser.cs index c8e5f933e2..5796d89fae 100644 --- a/src/Microsoft.Net.Http.Headers/GenericHeaderParser.cs +++ b/src/Microsoft.Net.Http.Headers/GenericHeaderParser.cs @@ -1,6 +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.Internal; + namespace Microsoft.Net.Http.Headers { internal sealed class GenericHeaderParser : BaseHeaderParser diff --git a/src/Microsoft.Net.Http.Headers/NotNullAttribute.cs b/src/Microsoft.Net.Http.Headers/NotNullAttribute.cs deleted file mode 100644 index a725ce11fe..0000000000 --- a/src/Microsoft.Net.Http.Headers/NotNullAttribute.cs +++ /dev/null @@ -1,12 +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.Net.Http.Headers -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs b/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs index 3556454156..568f204fa7 100644 --- a/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs +++ b/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Contracts; using System.Text; +using Microsoft.Framework.Internal; namespace Microsoft.Net.Http.Headers { diff --git a/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValueComparer.cs b/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValueComparer.cs index d7a3def9e1..982a97b131 100644 --- a/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValueComparer.cs +++ b/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValueComparer.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using Microsoft.Framework.Internal; namespace Microsoft.Net.Http.Headers { diff --git a/src/Microsoft.Net.Http.Headers/project.json b/src/Microsoft.Net.Http.Headers/project.json index fd40eace65..07da653d6f 100644 --- a/src/Microsoft.Net.Http.Headers/project.json +++ b/src/Microsoft.Net.Http.Headers/project.json @@ -1,6 +1,7 @@ { "version": "1.0.0-*", "dependencies": { + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } }, "frameworks" : { "net45" : { },