From 4373b6bf62744241210b7500c30c4d6545438596 Mon Sep 17 00:00:00 2001 From: Praburaj Date: Sat, 14 Mar 2015 07:30:29 -0700 Subject: [PATCH] Using [NotNull] from the common repo package --- src/Microsoft.AspNet.Session/DistributedSession.cs | 1 + .../DistributedSessionStore.cs | 1 + src/Microsoft.AspNet.Session/NotNullAttribute.cs | 12 ------------ src/Microsoft.AspNet.Session/SessionFactory.cs | 1 + src/Microsoft.AspNet.Session/SessionMiddleware.cs | 1 + .../SessionMiddlewareExtensions.cs | 1 + .../SessionServiceCollectionExtensions.cs | 1 + src/Microsoft.AspNet.Session/project.json | 3 ++- 8 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 src/Microsoft.AspNet.Session/NotNullAttribute.cs diff --git a/src/Microsoft.AspNet.Session/DistributedSession.cs b/src/Microsoft.AspNet.Session/DistributedSession.cs index 3f90a832e1..bc7393a9ca 100644 --- a/src/Microsoft.AspNet.Session/DistributedSession.cs +++ b/src/Microsoft.AspNet.Session/DistributedSession.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Text; using Microsoft.AspNet.Http; using Microsoft.Framework.Caching.Distributed; +using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; namespace Microsoft.AspNet.Session diff --git a/src/Microsoft.AspNet.Session/DistributedSessionStore.cs b/src/Microsoft.AspNet.Session/DistributedSessionStore.cs index 78d1a3e530..8e0efd6a71 100644 --- a/src/Microsoft.AspNet.Session/DistributedSessionStore.cs +++ b/src/Microsoft.AspNet.Session/DistributedSessionStore.cs @@ -4,6 +4,7 @@ using System; using Microsoft.AspNet.Http; using Microsoft.Framework.Caching.Distributed; +using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; namespace Microsoft.AspNet.Session diff --git a/src/Microsoft.AspNet.Session/NotNullAttribute.cs b/src/Microsoft.AspNet.Session/NotNullAttribute.cs deleted file mode 100644 index a649da0de4..0000000000 --- a/src/Microsoft.AspNet.Session/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.Session -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Session/SessionFactory.cs b/src/Microsoft.AspNet.Session/SessionFactory.cs index 99bd37aaac..345e88f287 100644 --- a/src/Microsoft.AspNet.Session/SessionFactory.cs +++ b/src/Microsoft.AspNet.Session/SessionFactory.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Http; +using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Session { diff --git a/src/Microsoft.AspNet.Session/SessionMiddleware.cs b/src/Microsoft.AspNet.Session/SessionMiddleware.cs index 45a422e10e..b5db2ab79e 100644 --- a/src/Microsoft.AspNet.Session/SessionMiddleware.cs +++ b/src/Microsoft.AspNet.Session/SessionMiddleware.cs @@ -8,6 +8,7 @@ using System.Security.Cryptography; using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; +using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.cs b/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.cs index 83585bcb45..561947872f 100644 --- a/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.cs +++ b/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.cs @@ -6,6 +6,7 @@ using Microsoft.AspNet.Session; using Microsoft.Framework.Caching.Distributed; using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs index 5c9d9bd9ae..fe985f6023 100644 --- a/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Session; +using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection { diff --git a/src/Microsoft.AspNet.Session/project.json b/src/Microsoft.AspNet.Session/project.json index 1160ee8438..7c4a467910 100644 --- a/src/Microsoft.AspNet.Session/project.json +++ b/src/Microsoft.AspNet.Session/project.json @@ -5,7 +5,8 @@ "Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "Microsoft.Framework.Caching.Distributed": "1.0.0-*", - "Microsoft.Framework.Logging.Interfaces": "1.0.0-*" + "Microsoft.Framework.Logging.Interfaces": "1.0.0-*", + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } }, "compilationOptions": { "allowUnsafe": true