diff --git a/HttpAbstractions.sln b/HttpAbstractions.sln index 8dc4e204..872a0e3a 100644 --- a/HttpAbstractions.sln +++ b/HttpAbstractions.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23017.0 +VisualStudioVersion = 14.0.22823.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5A15F1C-885A-452A-A731-B0173DDBD913}" EndProject @@ -13,11 +13,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Abstr EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Features", "src\Microsoft.AspNet.Http.Features\Microsoft.AspNet.Http.Features.xproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel", "src\Microsoft.AspNet.FeatureModel\Microsoft.AspNet.FeatureModel.xproj", "{32A4C918-30EE-41DB-8E26-8A3BB88ED231}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Tests", "test\Microsoft.AspNet.Http.Tests\Microsoft.AspNet.Http.Tests.xproj", "{AA99AF26-F7B1-4A6B-A922-5C25539F6391}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel.Tests", "test\Microsoft.AspNet.FeatureModel.Tests\Microsoft.AspNet.FeatureModel.Tests.xproj", "{C5D2BAE1-E182-48A0-AA74-1AF14B782BF7}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Features.Tests", "test\Microsoft.AspNet.Http.Features.Tests\Microsoft.AspNet.Http.Features.Tests.xproj", "{C5D2BAE1-E182-48A0-AA74-1AF14B782BF7}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Abstractions.Tests", "test\Microsoft.AspNet.Http.Abstractions.Tests\Microsoft.AspNet.Http.Abstractions.Tests.xproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}" EndProject @@ -85,16 +83,6 @@ Global {D9128247-8F97-48B8-A863-F1F21A029FCE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {D9128247-8F97-48B8-A863-F1F21A029FCE}.Release|Mixed Platforms.Build.0 = Release|Any CPU {D9128247-8F97-48B8-A863-F1F21A029FCE}.Release|x86.ActiveCfg = Release|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Debug|x86.ActiveCfg = Debug|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Release|Any CPU.Build.0 = Release|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {32A4C918-30EE-41DB-8E26-8A3BB88ED231}.Release|x86.ActiveCfg = Release|Any CPU {AA99AF26-F7B1-4A6B-A922-5C25539F6391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA99AF26-F7B1-4A6B-A922-5C25539F6391}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA99AF26-F7B1-4A6B-A922-5C25539F6391}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -265,7 +253,6 @@ Global {BCF0F967-8753-4438-BD07-AADCA9CE509A} = {A5A15F1C-885A-452A-A731-B0173DDBD913} {22071333-15BA-4D16-A1D5-4D5B1A83FBDD} = {A5A15F1C-885A-452A-A731-B0173DDBD913} {D9128247-8F97-48B8-A863-F1F21A029FCE} = {A5A15F1C-885A-452A-A731-B0173DDBD913} - {32A4C918-30EE-41DB-8E26-8A3BB88ED231} = {A5A15F1C-885A-452A-A731-B0173DDBD913} {AA99AF26-F7B1-4A6B-A922-5C25539F6391} = {F31FF137-390C-49BF-A3BD-7C6ED3597C21} {C5D2BAE1-E182-48A0-AA74-1AF14B782BF7} = {F31FF137-390C-49BF-A3BD-7C6ED3597C21} {F16692B8-9F38-4DCA-A582-E43172B989C6} = {F31FF137-390C-49BF-A3BD-7C6ED3597C21} diff --git a/src/Microsoft.AspNet.FeatureModel/FeatureObject.cs b/src/Microsoft.AspNet.FeatureModel/FeatureObject.cs deleted file mode 100644 index bc6bc2b2..00000000 --- a/src/Microsoft.AspNet.FeatureModel/FeatureObject.cs +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright (c) .NET Foundation. 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 System.Reflection; -using System.Linq; - -namespace Microsoft.AspNet.FeatureModel -{ - public class FeatureObject : IFeatureCollection - { - private readonly object _instance; - - public FeatureObject(object instance) - { - _instance = instance; - } - - public void Dispose() - { - var disposable = _instance as IDisposable; - if (disposable != null) - { - disposable.Dispose(); - } - } - - public object GetInterface(Type type) - { - if (type.IsInstanceOfType(_instance)) - { - return _instance; - } - - return null; - } - - public void SetInterface(Type type, object feature) - { - throw new NotImplementedException(); - } - - public int Revision - { - get { return 0; } - } - - public IEnumerator> GetEnumerator() - { - return GetTypeInterfaces() - .Select(interfaceType => new KeyValuePair(interfaceType, _instance)) - .GetEnumerator(); - } - - private IEnumerable GetTypeInterfaces() - { - return _instance.GetType() - .GetTypeInfo() - .ImplementedInterfaces; - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - public void Add(KeyValuePair item) - { - throw new NotImplementedException(); - } - - public void Clear() - { - throw new NotImplementedException(); - } - - public bool Contains(KeyValuePair item) - { - throw new NotImplementedException(); - } - - public void CopyTo(KeyValuePair[] array, int arrayIndex) - { - var enumerator = GetTypeInterfaces().GetEnumerator(); - for (var index = 0; index != arrayIndex; ++index) - { - if (!enumerator.MoveNext()) - { - throw new IndexOutOfRangeException(); - } - } - - for (var index = 0; index != array.Length; ++index) - { - if (!enumerator.MoveNext()) - { - throw new IndexOutOfRangeException(); - } - array[index] = new KeyValuePair(enumerator.Current, _instance); - } - } - - public bool Remove(KeyValuePair item) - { - throw new NotImplementedException(); - } - - public int Count - { - get { return GetTypeInterfaces().Count(); } - } - - public bool IsReadOnly - { - get { return true; } - } - - public bool ContainsKey(Type key) - { - return key.GetTypeInfo().IsAssignableFrom(_instance.GetType().GetTypeInfo()); - } - - public void Add(Type key, object value) - { - throw new NotImplementedException(); - } - - public bool Remove(Type key) - { - throw new NotImplementedException(); - } - - public bool TryGetValue(Type key, out object value) - { - value = GetInterface(key); - return value != null; - } - - public object this[Type key] - { - get { return GetInterface(key); } - set { throw new NotImplementedException(); } - } - - public ICollection Keys - { - get { return GetTypeInterfaces().ToArray(); } - } - - public ICollection Values - { - get - { - var length = GetTypeInterfaces().Count(); - var array = new object[length]; - for (var index = 0; index != length; ++index) - { - array[index] = _instance; - } - return array; - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.FeatureModel/Microsoft.AspNet.FeatureModel.xproj b/src/Microsoft.AspNet.FeatureModel/Microsoft.AspNet.FeatureModel.xproj deleted file mode 100644 index bd9dcea2..00000000 --- a/src/Microsoft.AspNet.FeatureModel/Microsoft.AspNet.FeatureModel.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 32a4c918-30ee-41db-8e26-8a3bb88ed231 - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.FeatureModel/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.FeatureModel/Properties/AssemblyInfo.cs deleted file mode 100644 index 025a9459..00000000 --- a/src/Microsoft.AspNet.FeatureModel/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; - -[assembly: AssemblyMetadata("Serviceable", "True")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.FeatureModel/project.json b/src/Microsoft.AspNet.FeatureModel/project.json deleted file mode 100644 index 8ae4b384..00000000 --- a/src/Microsoft.AspNet.FeatureModel/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "ASP.NET 5 HTTP feature infrastructure.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/httpabstractions" - }, - "dependencies": { - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } - }, - "frameworks": { - "dnx451": {}, - "dnxcore50": { - "dependencies": { - "System.Collections": "4.0.10-beta-*", - "System.Linq": "4.0.0-beta-*", - "System.Reflection": "4.0.10-beta-*", - "System.Reflection.TypeExtensions": "4.0.0-beta-*", - "System.Runtime": "4.0.20-beta-*", - "System.Runtime.InteropServices": "4.0.20-beta-*", - "System.Threading": "4.0.10-beta-*" - } - } - } -} diff --git a/src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs b/src/Microsoft.AspNet.Http.Features/FeatureCollection.cs similarity index 99% rename from src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs rename to src/Microsoft.AspNet.Http.Features/FeatureCollection.cs index 40e386a4..1fbbaf42 100644 --- a/src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs +++ b/src/Microsoft.AspNet.Http.Features/FeatureCollection.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.FeatureModel +namespace Microsoft.AspNet.Http.Features { public class FeatureCollection : IFeatureCollection { diff --git a/src/Microsoft.AspNet.FeatureModel/FeatureReference.cs b/src/Microsoft.AspNet.Http.Features/FeatureReference.cs similarity index 96% rename from src/Microsoft.AspNet.FeatureModel/FeatureReference.cs rename to src/Microsoft.AspNet.Http.Features/FeatureReference.cs index fba03637..7ffb94d5 100644 --- a/src/Microsoft.AspNet.FeatureModel/FeatureReference.cs +++ b/src/Microsoft.AspNet.Http.Features/FeatureReference.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.FeatureModel +namespace Microsoft.AspNet.Http.Features { public struct FeatureReference { diff --git a/src/Microsoft.AspNet.FeatureModel/IFeatureCollection.cs b/src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs similarity index 89% rename from src/Microsoft.AspNet.FeatureModel/IFeatureCollection.cs rename to src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs index e4b26818..70f91770 100644 --- a/src/Microsoft.AspNet.FeatureModel/IFeatureCollection.cs +++ b/src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.FeatureModel +namespace Microsoft.AspNet.Http.Features { public interface IFeatureCollection : IDictionary, IDisposable { diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs index 526dfea4..d0cec090 100644 --- a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs +++ b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.AspNet.Http.Features.Authentication.Internal; diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs index 5237739a..30a7ace3 100644 --- a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs +++ b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs @@ -5,7 +5,6 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features.Internal; diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs index 5dc1c96c..0ff8ae2b 100644 --- a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Security.Claims; using System.Threading; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Authentication.Internal; using Microsoft.AspNet.Http.Features; diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs index bf374999..479ead6e 100644 --- a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs @@ -5,7 +5,6 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs index cf3b0069..0dae9253 100644 --- a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs @@ -4,7 +4,6 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs index c329ffe0..7a8f87d1 100644 --- a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs +++ b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Net.WebSockets; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs index a46b6ecb..02545c50 100644 --- a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs +++ b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs index e0ba1dcc..08317fdd 100644 --- a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs +++ b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Internal; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs index 410fce7a..96504f1f 100644 --- a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs +++ b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Internal; namespace Microsoft.AspNet.Http.Features.Internal diff --git a/src/Microsoft.AspNet.Http/project.json b/src/Microsoft.AspNet.Http/project.json index f2d67287..991ddf31 100644 --- a/src/Microsoft.AspNet.Http/project.json +++ b/src/Microsoft.AspNet.Http/project.json @@ -6,7 +6,6 @@ "url": "git://github.com/aspnet/httpabstractions" }, "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", "Microsoft.AspNet.Http.Abstractions": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs index 93b48700..770f02fb 100644 --- a/src/Microsoft.AspNet.Owin/OwinExtensions.cs +++ b/src/Microsoft.AspNet.Owin/OwinExtensions.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder.Internal; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Owin; namespace Microsoft.AspNet.Builder diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs index b718d360..ca1cca50 100644 --- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs +++ b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs @@ -14,7 +14,6 @@ using System.Security.Principal; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.Framework.Internal; diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/IThing.cs b/test/Microsoft.AspNet.Http.Features.Tests/IThing.cs similarity index 83% rename from test/Microsoft.AspNet.FeatureModel.Tests/IThing.cs rename to test/Microsoft.AspNet.Http.Features.Tests/IThing.cs index fca3041b..7210b982 100644 --- a/test/Microsoft.AspNet.FeatureModel.Tests/IThing.cs +++ b/test/Microsoft.AspNet.Http.Features.Tests/IThing.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.FeatureModel.Tests +namespace Microsoft.AspNet.Http.Features { public interface IThing { diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/InterfaceDictionaryTests.cs b/test/Microsoft.AspNet.Http.Features.Tests/InterfaceDictionaryTests.cs similarity index 98% rename from test/Microsoft.AspNet.FeatureModel.Tests/InterfaceDictionaryTests.cs rename to test/Microsoft.AspNet.Http.Features.Tests/InterfaceDictionaryTests.cs index 27d2f565..3d4879f0 100644 --- a/test/Microsoft.AspNet.FeatureModel.Tests/InterfaceDictionaryTests.cs +++ b/test/Microsoft.AspNet.Http.Features.Tests/InterfaceDictionaryTests.cs @@ -4,7 +4,7 @@ using System; using Xunit; -namespace Microsoft.AspNet.FeatureModel.Tests +namespace Microsoft.AspNet.Http.Features { public class InterfaceDictionaryTests { diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/Microsoft.AspNet.FeatureModel.Tests.xproj b/test/Microsoft.AspNet.Http.Features.Tests/Microsoft.AspNet.Http.Features.Tests.xproj similarity index 100% rename from test/Microsoft.AspNet.FeatureModel.Tests/Microsoft.AspNet.FeatureModel.Tests.xproj rename to test/Microsoft.AspNet.Http.Features.Tests/Microsoft.AspNet.Http.Features.Tests.xproj diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNet.Http.Features.Tests/Properties/AssemblyInfo.cs similarity index 91% rename from test/Microsoft.AspNet.FeatureModel.Tests/Properties/AssemblyInfo.cs rename to test/Microsoft.AspNet.Http.Features.Tests/Properties/AssemblyInfo.cs index 898c5f8f..86561ba5 100644 --- a/test/Microsoft.AspNet.FeatureModel.Tests/Properties/AssemblyInfo.cs +++ b/test/Microsoft.AspNet.Http.Features.Tests/Properties/AssemblyInfo.cs @@ -8,11 +8,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Microsoft.AspNet.FeatureModel.Tests")] +[assembly: AssemblyTitle("Microsoft.AspNet.Http.Features.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.AspNet.FeatureModel.Tests")] +[assembly: AssemblyProduct("Microsoft.AspNet.Http.Features.Tests")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/Thing.cs b/test/Microsoft.AspNet.Http.Features.Tests/Thing.cs similarity index 86% rename from test/Microsoft.AspNet.FeatureModel.Tests/Thing.cs rename to test/Microsoft.AspNet.Http.Features.Tests/Thing.cs index 217833d5..7f39f86a 100644 --- a/test/Microsoft.AspNet.FeatureModel.Tests/Thing.cs +++ b/test/Microsoft.AspNet.Http.Features.Tests/Thing.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.FeatureModel.Tests +namespace Microsoft.AspNet.Http.Features { public class Thing : IThing { diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/project.json b/test/Microsoft.AspNet.Http.Features.Tests/project.json similarity index 79% rename from test/Microsoft.AspNet.FeatureModel.Tests/project.json rename to test/Microsoft.AspNet.Http.Features.Tests/project.json index a09a4171..12e00145 100644 --- a/test/Microsoft.AspNet.FeatureModel.Tests/project.json +++ b/test/Microsoft.AspNet.Http.Features.Tests/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", + "Microsoft.AspNet.Http.Features": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": { diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs index c8c1b0bc..f24035e6 100644 --- a/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features.Internal; using Xunit; diff --git a/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs b/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs index a110b099..61d2ed4d 100644 --- a/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs +++ b/test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.FeatureModel; using Xunit; namespace Microsoft.AspNet.Http.Features.Internal diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs index 03f2258a..74ddec0d 100644 --- a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs +++ b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http.Features; using Xunit; @@ -32,7 +31,7 @@ public void OwinHttpEnvironmentCanBeCreated() { "owin.RequestPathBase", "/pathBase" }, { "owin.RequestQueryString", "name=value" }, }; - var features = new FeatureObject(new OwinFeatureCollection(env)); + var features = new OwinFeatureCollection(env); var requestFeature = Get(features); Assert.Equal(requestFeature.Method, "POST"); @@ -51,7 +50,7 @@ public void OwinHttpEnvironmentCanBeModified() { "owin.RequestPathBase", "/pathBase" }, { "owin.RequestQueryString", "name=value" }, }; - var features = new FeatureObject(new OwinFeatureCollection(env)); + var features = new OwinFeatureCollection(env); var requestFeature = Get(features); requestFeature.Method = "GET"; @@ -72,11 +71,10 @@ public void ImplementedInterfacesAreEnumerated() { {"owin.RequestMethod", "POST"} }; - var features = new FeatureObject(new OwinFeatureCollection(env)); + var features = new OwinFeatureCollection(env); var entries = features.ToArray(); var keys = features.Keys.ToArray(); - var values = features.Values.ToArray(); Assert.Contains(typeof(IHttpRequestFeature), keys); Assert.Contains(typeof(IHttpResponseFeature), keys);