From 30e54609ccb2b083e7ea254cc96043f94f937545 Mon Sep 17 00:00:00 2001 From: Kirthi Krishnamraju Date: Thu, 23 Apr 2015 12:09:59 -0700 Subject: [PATCH] Fix #1911 : Create a separate package for ApiExplorer --- Mvc.NoFun.sln | 30 +++++++++++++++++++ Mvc.sln | 30 +++++++++++++++++++ .../MvcSample.Web/ApiExplorerController.cs | 2 +- .../Views/ApiExplorer/All.cshtml | 2 +- .../Views/ApiExplorer/_ApiDescription.cshtml | 2 +- .../ApiDescription.cs | 2 +- .../ApiDescriptionExtensions.cs | 2 +- .../ApiDescriptionGroup.cs | 2 +- .../ApiDescriptionGroupCollection.cs | 2 +- .../ApiDescriptionGroupCollectionProvider.cs | 2 +- .../ApiDescriptionProviderContext.cs | 2 +- .../ApiExplorerSettingsAttribute.cs | 6 ++-- .../ApiParameterDescription.cs | 4 +-- .../ApiParameterRouteInfo.cs | 6 ++-- .../ApiResponseFormat.cs | 2 +- .../DefaultApiDescriptionProvider.cs | 4 +-- .../IApiDescriptionGroupCollectionProvider.cs | 2 +- .../IApiDescriptionProvider.cs | 2 +- .../Microsoft.AspNet.Mvc.ApiExplorer.xproj | 20 +++++++++++++ .../project.json | 17 +++++++++++ .../ApiDescriptionActionData.cs | 6 ++-- .../IApiDescriptionGroupNameProvider.cs | 6 ++-- .../IApiDescriptionVisibilityProvider.cs | 6 ++-- .../IApiResponseFormatMetadataProvider.cs | 8 ++--- .../IApiResponseMetadataProvider.cs | 2 +- .../ApplicationModels/ApiExplorerModel.cs | 6 ++-- .../DefaultActionModelBuilder.cs | 2 +- .../DefaultControllerModelBuilder.cs | 2 +- .../ControllerActionDescriptorBuilder.cs | 2 +- .../DefaultAssemblyProvider.cs | 3 +- .../Filters/FormatFilter.cs | 2 +- .../Filters/ProducesAttribute.cs | 2 +- .../Formatters/OutputFormatter.cs | 2 +- src/Microsoft.AspNet.Mvc/MvcServices.cs | 2 +- src/Microsoft.AspNet.Mvc/project.json | 1 + .../DefaultApiDescriptionProviderTest.cs | 1 + ...icrosoft.AspNet.Mvc.ApiExplorer.Test.xproj | 20 +++++++++++++ .../project.json | 20 +++++++++++++ ...ControllerActionDescriptorProviderTests.cs | 2 +- .../DefaultOrderTest.cs | 2 +- .../ApiExplorerDataFilter.cs | 2 +- 41 files changed, 189 insertions(+), 51 deletions(-) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiDescription.cs (98%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiDescriptionExtensions.cs (97%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiDescriptionGroup.cs (96%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiDescriptionGroupCollection.cs (96%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiDescriptionGroupCollectionProvider.cs (98%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiDescriptionProviderContext.cs (96%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiExplorerSettingsAttribute.cs (86%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiParameterDescription.cs (93%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiParameterRouteInfo.cs (94%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/ApiResponseFormat.cs (93%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/DefaultApiDescriptionProvider.cs (99%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/IApiDescriptionGroupCollectionProvider.cs (92%) rename src/{Microsoft.AspNet.Mvc.Core/Description => Microsoft.AspNet.Mvc.ApiExplorer}/IApiDescriptionProvider.cs (91%) create mode 100644 src/Microsoft.AspNet.Mvc.ApiExplorer/Microsoft.AspNet.Mvc.ApiExplorer.xproj create mode 100644 src/Microsoft.AspNet.Mvc.ApiExplorer/project.json rename src/Microsoft.AspNet.Mvc.Core/{Description => ApiExplorer}/ApiDescriptionActionData.cs (63%) rename src/Microsoft.AspNet.Mvc.Core/{Description => ApiExplorer}/IApiDescriptionGroupNameProvider.cs (62%) rename src/Microsoft.AspNet.Mvc.Core/{Description => ApiExplorer}/IApiDescriptionVisibilityProvider.cs (62%) rename src/Microsoft.AspNet.Mvc.Core/{Description => ApiExplorer}/IApiResponseFormatMetadataProvider.cs (88%) rename src/Microsoft.AspNet.Mvc.Core/{Description => ApiExplorer}/IApiResponseMetadataProvider.cs (94%) rename test/{Microsoft.AspNet.Mvc.Core.Test/Description => Microsoft.AspNet.Mvc.ApiExplorer.Test}/DefaultApiDescriptionProviderTest.cs (99%) create mode 100644 test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj create mode 100644 test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json diff --git a/Mvc.NoFun.sln b/Mvc.NoFun.sln index 2f77d9633b..751cfe2c27 100644 --- a/Mvc.NoFun.sln +++ b/Mvc.NoFun.sln @@ -66,6 +66,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Abstra EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Abstractions.Test", "test\Microsoft.AspNet.Mvc.Abstractions.Test\Microsoft.AspNet.Mvc.Abstractions.Test.xproj", "{DA000953-7532-4DF5-8DB9-8143DF98D999}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ApiExplorer", "src\Microsoft.AspNet.Mvc.ApiExplorer\Microsoft.AspNet.Mvc.ApiExplorer.xproj", "{A2B72833-5D70-4C42-AE85-E0319926FB8A}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ApiExplorer.Test", "test\Microsoft.AspNet.Mvc.ApiExplorer.Test\Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj", "{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -363,6 +367,30 @@ Global {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.Build.0 = Release|Any CPU {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.ActiveCfg = Release|Any CPU {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.Build.0 = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.ActiveCfg = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.Build.0 = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.Build.0 = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.ActiveCfg = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.Build.0 = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.ActiveCfg = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.Build.0 = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.Build.0 = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.ActiveCfg = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -394,5 +422,7 @@ Global {864FA09D-1E48-403A-A6C8-4F079D2A30F0} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {1154203C-7579-4525-906E-BC55268421C1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {A2B72833-5D70-4C42-AE85-E0319926FB8A} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} EndGlobalSection EndGlobal diff --git a/Mvc.sln b/Mvc.sln index 9c188d1dec..414ea97b9d 100644 --- a/Mvc.sln +++ b/Mvc.sln @@ -164,6 +164,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Abstra EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Abstractions.Test", "test\Microsoft.AspNet.Mvc.Abstractions.Test\Microsoft.AspNet.Mvc.Abstractions.Test.xproj", "{DA000953-7532-4DF5-8DB9-8143DF98D999}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ApiExplorer", "src\Microsoft.AspNet.Mvc.ApiExplorer\Microsoft.AspNet.Mvc.ApiExplorer.xproj", "{A2B72833-5D70-4C42-AE85-E0319926FB8A}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ApiExplorer.Test", "test\Microsoft.AspNet.Mvc.ApiExplorer.Test\Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj", "{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -982,6 +986,30 @@ Global {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.Build.0 = Release|Any CPU {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.ActiveCfg = Release|Any CPU {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.Build.0 = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.ActiveCfg = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.Build.0 = Debug|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.Build.0 = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.ActiveCfg = Release|Any CPU + {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.Build.0 = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.ActiveCfg = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.Build.0 = Debug|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.Build.0 = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.ActiveCfg = Release|Any CPU + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1062,5 +1090,7 @@ Global {864FA09D-1E48-403A-A6C8-4F079D2A30F0} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {1154203C-7579-4525-906E-BC55268421C1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {A2B72833-5D70-4C42-AE85-E0319926FB8A} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} EndGlobalSection EndGlobal diff --git a/samples/MvcSample.Web/ApiExplorerController.cs b/samples/MvcSample.Web/ApiExplorerController.cs index 334b46899a..86e69b382c 100644 --- a/samples/MvcSample.Web/ApiExplorerController.cs +++ b/samples/MvcSample.Web/ApiExplorerController.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Description; +using Microsoft.AspNet.Mvc.ApiExplorer; namespace MvcSample.Web { diff --git a/samples/MvcSample.Web/Views/ApiExplorer/All.cshtml b/samples/MvcSample.Web/Views/ApiExplorer/All.cshtml index 279a29526a..5564d29336 100644 --- a/samples/MvcSample.Web/Views/ApiExplorer/All.cshtml +++ b/samples/MvcSample.Web/Views/ApiExplorer/All.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.AspNet.Mvc.Description +@using Microsoft.AspNet.Mvc.ApiExplorer @model IReadOnlyList @section header diff --git a/samples/MvcSample.Web/Views/ApiExplorer/_ApiDescription.cshtml b/samples/MvcSample.Web/Views/ApiExplorer/_ApiDescription.cshtml index f79624a5a8..8b7417a863 100644 --- a/samples/MvcSample.Web/Views/ApiExplorer/_ApiDescription.cshtml +++ b/samples/MvcSample.Web/Views/ApiExplorer/_ApiDescription.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.AspNet.Mvc.Description +@using Microsoft.AspNet.Mvc.ApiExplorer @model ApiDescription
diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescription.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiDescription.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs index 052b311876..5d80ac34a2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescription.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Mvc.ModelBinding; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Represents an API exposed by this application. diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionExtensions.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionExtensions.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionExtensions.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionExtensions.cs index d4b35d242c..992731f6fc 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionExtensions.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Extension methods for . diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroup.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroup.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroup.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroup.cs index 4cd76d408a..0d3c9a1125 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroup.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroup.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Represents a group of related apis. diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollection.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollection.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs index 83663e2ada..2c108e7b97 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollection.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// A cached collection of . diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollectionProvider.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs index 6b72eb42b4..801314ae7a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollectionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// public class ApiDescriptionGroupCollectionProvider : IApiDescriptionGroupCollectionProvider diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionProviderContext.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionProviderContext.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs index d9c0e18870..bd6e15a7d1 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// A context object for providers. diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiExplorerSettingsAttribute.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiExplorerSettingsAttribute.cs similarity index 86% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiExplorerSettingsAttribute.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiExplorerSettingsAttribute.cs index 235cae7e62..bc81aa345b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiExplorerSettingsAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiExplorerSettingsAttribute.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Mvc.Description; +using Microsoft.AspNet.Mvc.ApiExplorer; namespace Microsoft.AspNet.Mvc { /// - /// Controls the visibility and group name for an of the associated - /// controller class or action method. + /// Controls the visibility and group name for an + /// of the associated controller class or action method. /// [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)] public class ApiExplorerSettingsAttribute : diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterDescription.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterDescription.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterDescription.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterDescription.cs index 14935089b7..4404072cb2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterDescription.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterDescription.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNet.Mvc.ModelBinding; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// A metadata description of an input to an API. @@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.Description public ModelMetadata ModelMetadata { get; set; } /// - /// Gets or sets the name. + /// Gets or sets the name. /// public string Name { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterRouteInfo.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterRouteInfo.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterRouteInfo.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterRouteInfo.cs index 12caf8d4ad..2b8447d15b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterRouteInfo.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterRouteInfo.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Routing; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// A metadata description of routing information for an . @@ -31,9 +31,9 @@ namespace Microsoft.AspNet.Mvc.Description /// /// An optional parameter is considered optional by the routing system. This does not imply /// that the parameter is considered optional by the action. - /// + /// /// If the parameter uses for the value of - /// then the value may also come from the + /// then the value may also come from the /// URL query string or form data. /// public bool IsOptional { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiResponseFormat.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiResponseFormat.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs index 10c9b5e755..8374e00c8d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiResponseFormat.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs @@ -3,7 +3,7 @@ using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Represents a possible format for the body of a response. diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs index ea6590521b..25948aea73 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs @@ -4,17 +4,15 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.ModelBinding.Metadata; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing.Template; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Implements a provider of for actions represented diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupCollectionProvider.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs index 5c283d9755..e8845b4d34 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupCollectionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Provides access to a collection of . diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionProvider.cs similarity index 91% rename from src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionProvider.cs rename to src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionProvider.cs index fd8e0d1d7c..103b47affd 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionProvider.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { public interface IApiDescriptionProvider { diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/Microsoft.AspNet.Mvc.ApiExplorer.xproj b/src/Microsoft.AspNet.Mvc.ApiExplorer/Microsoft.AspNet.Mvc.ApiExplorer.xproj new file mode 100644 index 0000000000..9e594915b6 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/Microsoft.AspNet.Mvc.ApiExplorer.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + a2b72833-5d70-4c42-ae85-e0319926fb8a + Microsoft.AspNet.Mvc.ApiExplorer + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + + 2.0 + + + diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNet.Mvc.ApiExplorer/project.json new file mode 100644 index 0000000000..829dd8a38d --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/project.json @@ -0,0 +1,17 @@ +{ + "description": "Contains API explorer functionality for ASP.NET MVC for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.", + "version": "6.0.0-*", + "compilationOptions": { + "warningsAsErrors": true + }, + "dependencies": { + "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" }, + "Microsoft.AspNet.Mvc.Core": "6.0.0-*", + "Microsoft.Framework.PropertyHelper.Internal": { "version": "1.0.0-*", "type": "build" }, + "Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" } + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionActionData.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs similarity index 63% rename from src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionActionData.cs rename to src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs index 74a19b1180..b323ad76a5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionActionData.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs @@ -1,16 +1,16 @@ // 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. -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// - /// Represents data used to build an , stored as part of the + /// Represents data used to build an ApiDescription, stored as part of the /// . /// public class ApiDescriptionActionData { /// - /// The of objects for the associated + /// The ApiDescription.GroupName of ApiDescription objects for the associated /// action. /// public string GroupName { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupNameProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs similarity index 62% rename from src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupNameProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs index 2ecd2cfb33..f074d28339 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupNameProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs @@ -1,15 +1,15 @@ // 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. -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// - /// Represents group name metadata for an . + /// Represents group name metadata for an ApiDescription. /// public interface IApiDescriptionGroupNameProvider { /// - /// The group name for the of the associated action or controller. + /// The group name for the ApiDescription of the associated action or controller. /// string GroupName { get; } } diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionVisibilityProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs similarity index 62% rename from src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionVisibilityProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs index e5e425d3ff..2eaf25d284 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionVisibilityProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs @@ -1,15 +1,15 @@ // 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. -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// - /// Represents visibility metadata for an . + /// Represents visibility metadata for an ApiDescription. /// public interface IApiDescriptionVisibilityProvider { /// - /// If false then no objects will be created for the associated controller + /// If false then no ApiDescription objects will be created for the associated controller /// or action. /// bool IgnoreApi { get; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseFormatMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs similarity index 88% rename from src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseFormatMetadataProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs index 20b2610c2d..69ded8dfe2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseFormatMetadataProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs @@ -5,19 +5,19 @@ using System; using System.Collections.Generic; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// - /// Provides metadata information about the response format to an . + /// Provides metadata information about the response format to an IApiDescriptionProvider. /// /// /// An should implement this interface to expose metadata information - /// to an . + /// to an IApiDescriptionProvider. /// public interface IApiResponseFormatMetadataProvider { /// - /// Gets a filtered list of content types which are supported by the + /// Gets a filtered list of content types which are supported by the /// for the and . /// /// The declared type for which the supported content types are desired. diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseMetadataProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs index f8bf78b380..8ca0f2ef62 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseMetadataProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Description +namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Provides a return type and a set of possible content types returned by a successful execution of the action. diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApiExplorerModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApiExplorerModel.cs index 8aa37f2d9d..0db5d95429 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApiExplorerModel.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApiExplorerModel.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels } /// - /// If true, objects will be created for the associated + /// If true, APIExplorer.ApiDescription objects will be created for the associated /// controller or action. /// /// @@ -37,8 +37,8 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels public bool? IsVisible { get; set; } /// - /// The value for of - /// objects created for the associated controller or action. + /// The value for APIExplorer.ApiDescription.GroupName of + /// APIExplorer.ApiDescription objects created for the associated controller or action. /// public string GroupName { get; set; } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultActionModelBuilder.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultActionModelBuilder.cs index 7bd851855b..f56cb19d2a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultActionModelBuilder.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultActionModelBuilder.cs @@ -8,7 +8,7 @@ using System.Reflection; using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Cors; using Microsoft.AspNet.Cors.Core; -using Microsoft.AspNet.Mvc.Description; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Metadata; using Microsoft.AspNet.Mvc.Routing; diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultControllerModelBuilder.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultControllerModelBuilder.cs index 54272e789d..b1319defd6 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultControllerModelBuilder.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultControllerModelBuilder.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Cors.Core; -using Microsoft.AspNet.Mvc.Description; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Routing; diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs b/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs index 63a6947aa2..31cb23e997 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs @@ -7,9 +7,9 @@ using System.Diagnostics; using System.Globalization; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.ApplicationModels; using Microsoft.AspNet.Mvc.Core; -using Microsoft.AspNet.Mvc.Description; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs index 808504dc27..48b943c7bf 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs @@ -30,7 +30,8 @@ namespace Microsoft.AspNet.Mvc protected virtual HashSet ReferenceAssemblies { get; } = new HashSet(StringComparer.Ordinal) { "Microsoft.AspNet.Mvc", - "Microsoft.AspNet.Mvc.Abstractions", + "Microsoft.AspNet.Mvc.Abstractions", + "Microsoft.AspNet.Mvc.ApiExplorer", "Microsoft.AspNet.Mvc.Core", "Microsoft.AspNet.Mvc.Razor", "Microsoft.AspNet.Mvc.Razor.Host", diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/FormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FormatFilter.cs index 0a657f18eb..834e7cdf89 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/FormatFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FormatFilter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Description; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/ProducesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ProducesAttribute.cs index 5099503252..79b797aaff 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/ProducesAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/ProducesAttribute.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Core; -using Microsoft.AspNet.Mvc.Description; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs index 6fa41b6647..41768cfc4d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs @@ -7,8 +7,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Core; -using Microsoft.AspNet.Mvc.Description; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs index 188463de53..6f60719b2d 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServices.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc.ActionConstraints; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.ApplicationModels; using Microsoft.AspNet.Mvc.Core; -using Microsoft.AspNet.Mvc.Description; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json index 40eb5de371..f960a8aa1a 100644 --- a/src/Microsoft.AspNet.Mvc/project.json +++ b/src/Microsoft.AspNet.Mvc/project.json @@ -7,6 +7,7 @@ "dependencies": { "Microsoft.AspNet.Authorization": "1.0.0-*", "Microsoft.AspNet.Cors": "1.0.0-*", + "Microsoft.AspNet.Mvc.ApiExplorer": "6.0.0-*", "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" }, "Microsoft.AspNet.Mvc.Razor": "6.0.0-*", "Microsoft.Framework.Caching.Memory": "1.0.0-*", diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Description/DefaultApiDescriptionProviderTest.cs b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Description/DefaultApiDescriptionProviderTest.cs rename to test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs index 70d660a378..5827f008fe 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Description/DefaultApiDescriptionProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs @@ -7,6 +7,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Metadata; using Microsoft.AspNet.Mvc.Routing; diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj new file mode 100644 index 0000000000..28b82f4506 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 4c2ad8ab-8ac0-46c4-80c6-c5577c7255f6 + Microsoft.AspNet.Mvc.ApiExplorer.Test + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + + 2.0 + + + diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json new file mode 100644 index 0000000000..f881939122 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json @@ -0,0 +1,20 @@ +{ + "compilationOptions": { + "warningsAsErrors": "true" + }, + "dependencies": { + "Microsoft.AspNet.Mvc" : "6.0.0-*", + "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, + "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.Framework.Logging.Testing": "1.0.0-*", + "Moq": "4.2.1312.1622", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { } + } +} \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs index 452d53c451..bbb0a7ea47 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.ApplicationModels; using Microsoft.AspNet.Mvc.Core; -using Microsoft.AspNet.Mvc.Description; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.Internal; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs index 9beb3a0f19..1f13578c44 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc.ActionConstraints; using Microsoft.AspNet.Mvc.Core; -using Microsoft.AspNet.Mvc.Description; +using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Razor; using Microsoft.AspNet.Mvc.ViewComponents; using Microsoft.Framework.DependencyInjection; diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs index b412d3c881..79e3a49263 100644 --- a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs +++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Description; +using Microsoft.AspNet.Mvc.ApiExplorer; namespace ApiExplorerWebSite {