huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #1911 : Create a separate package for ApiExplorer

This commit is contained in:
Kirthi Krishnamraju 2015-04-23 12:09:59 -07:00
parent 3ca018375a
commit 30e54609cc
41 changed files with 189 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Mvc.NoFun.sln
View File

@ -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

30
Mvc.sln
View File

@ -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

2
samples/MvcSample.Web/ApiExplorerController.cs
View File

@ -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
{

2
samples/MvcSample.Web/Views/ApiExplorer/All.cshtml
View File

@ -1,4 +1,4 @@
@using Microsoft.AspNet.Mvc.Description
@using Microsoft.AspNet.Mvc.ApiExplorer
@model IReadOnlyList<ApiDescriptionGroup>
@section header

2
samples/MvcSample.Web/Views/ApiExplorer/_ApiDescription.cshtml
View File

@ -1,4 +1,4 @@
@using Microsoft.AspNet.Mvc.Description
@using Microsoft.AspNet.Mvc.ApiExplorer
@model ApiDescription
<div class="api-description">

2
src/Microsoft.AspNet.Mvc.Core/Description/ApiDescription.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs
View File

@ -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
{
/// <summary>
/// Represents an API exposed by this application.

2
src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionExtensions.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionExtensions.cs
View File

@ -3,7 +3,7 @@
using Microsoft.Framework.Internal;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <summary>
/// Extension methods for <see cref="ApiDescription"/>.

2
src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroup.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroup.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <summary>
/// Represents a group of related apis.

2
src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollection.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs
View File

@ -4,7 +4,7 @@
using System.Collections.Generic;
using Microsoft.Framework.Internal;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <summary>
/// A cached collection of <see cref="ApiDescriptionGroup" />.

2
src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionGroupCollectionProvider.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
View File

@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Linq;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <inheritdoc />
public class ApiDescriptionGroupCollectionProvider : IApiDescriptionGroupCollectionProvider

2
src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionProviderContext.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs
View File

@ -4,7 +4,7 @@
using System.Collections.Generic;
using Microsoft.Framework.Internal;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <summary>
/// A context object for <see cref="ApiDescription"/> providers.

6
src/Microsoft.AspNet.Mvc.Core/Description/ApiExplorerSettingsAttribute.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiExplorerSettingsAttribute.cs
View File

@ -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
{
/// <summary>
/// Controls the visibility and group name for an <see cref="ApiDescription"/> of the associated
/// controller class or action method.
/// Controls the visibility and group name for an <see cref="ApiDescription"/>
/// of the associated controller class or action method.
/// </summary>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
public class ApiExplorerSettingsAttribute :

4
src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterDescription.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterDescription.cs
View File

@ -4,7 +4,7 @@
using System;
using Microsoft.AspNet.Mvc.ModelBinding;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <summary>
/// A metadata description of an input to an API.
@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.Description
public ModelMetadata ModelMetadata { get; set; }
/// <summary>
/// Gets or sets the name.
/// Gets or sets the name.
/// </summary>
public string Name { get; set; }

6
src/Microsoft.AspNet.Mvc.Core/Description/ApiParameterRouteInfo.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiParameterRouteInfo.cs
View File

@ -4,7 +4,7 @@
using System.Collections.Generic;
using Microsoft.AspNet.Routing;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <summary>
/// A metadata description of routing information for an <see cref="ApiParameterDescription"/>.
@ -31,9 +31,9 @@ namespace Microsoft.AspNet.Mvc.Description
/// <remarks>
/// 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 <see cref="ModelBinding.BindingSource.ModelBinding"/> for the value of
/// <see cref="ApiParameterDescription.Source"/> then the value may also come from the
/// <see cref="ApiParameterDescription.Source"/> then the value may also come from the
/// URL query string or form data.
/// </remarks>
public bool IsOptional { get; set; }

2
src/Microsoft.AspNet.Mvc.Core/Description/ApiResponseFormat.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/ApiResponseFormat.cs
View File

@ -3,7 +3,7 @@
using Microsoft.Net.Http.Headers;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
/// <summary>
/// Represents a possible format for the body of a response.

4
src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
View File

@ -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
{
/// <summary>
/// Implements a provider of <see cref="ApiDescription"/> for actions represented

2
src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupCollectionProvider.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs
View File

@ -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
{
/// <summary>
/// Provides access to a collection of <see cref="ApiDescriptionGroup"/>.

2
src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionProvider.cs → src/Microsoft.AspNet.Mvc.ApiExplorer/IApiDescriptionProvider.cs
View File

@ -3,7 +3,7 @@
using Microsoft.Framework.Internal;
namespace Microsoft.AspNet.Mvc.Description
namespace Microsoft.AspNet.Mvc.ApiExplorer
{
public interface IApiDescriptionProvider
{

20
src/Microsoft.AspNet.Mvc.ApiExplorer/Microsoft.AspNet.Mvc.ApiExplorer.xproj Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>a2b72833-5d70-4c42-ae85-e0319926fb8a</ProjectGuid>
<RootNamespace>Microsoft.AspNet.Mvc.ApiExplorer</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

17
src/Microsoft.AspNet.Mvc.ApiExplorer/project.json Normal file
View File

@ -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": { }
}
}

6
src/Microsoft.AspNet.Mvc.Core/Description/ApiDescriptionActionData.cs → src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
View File

@ -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
{
/// <summary>
/// Represents data used to build an <see cref="ApiDescription"/>, stored as part of the
/// Represents data used to build an <c>ApiDescription</c>, stored as part of the
/// <see cref="ActionDescriptor.Properties"/>.
/// </summary>
public class ApiDescriptionActionData
{
/// <summary>
/// The <see cref="ApiDescription.GroupName"/> of <see cref="ApiDescription"/> objects for the associated
/// The <c>ApiDescription.GroupName</c> of <c>ApiDescription</c> objects for the associated
/// action.
/// </summary>
public string GroupName { get; set; }

6
src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionGroupNameProvider.cs → src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs
View File

@ -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
{
/// <summary>
/// Represents group name metadata for an <see cref="ApiDescription"/>.
/// Represents group name metadata for an <c>ApiDescription</c>.
/// </summary>
public interface IApiDescriptionGroupNameProvider
{
/// <summary>
/// The group name for the <see cref="ApiDescription"/> of the associated action or controller.
/// The group name for the <c>ApiDescription</c> of the associated action or controller.
/// </summary>
string GroupName { get; }
}

6
src/Microsoft.AspNet.Mvc.Core/Description/IApiDescriptionVisibilityProvider.cs → src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs
View File

@ -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
{
/// <summary>
/// Represents visibility metadata for an <see cref="ApiDescription"/>.
/// Represents visibility metadata for an <c>ApiDescription</c>.
/// </summary>
public interface IApiDescriptionVisibilityProvider
{
/// <summary>
/// If <c>false</c> then no <see cref="ApiDescription"/> objects will be created for the associated controller
/// If <c>false</c> then no <c>ApiDescription</c> objects will be created for the associated controller
/// or action.
/// </summary>
bool IgnoreApi { get; }

8
src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseFormatMetadataProvider.cs → src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseFormatMetadataProvider.cs
View File

@ -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
{
/// <summary>
/// Provides metadata information about the response format to an <see cref="IApiDescriptionProvider"/>.
/// Provides metadata information about the response format to an <c>IApiDescriptionProvider</c>.
/// </summary>
/// <remarks>
/// An <see cref="IOutputFormatter"/> should implement this interface to expose metadata information
/// to an <see cref="IApiDescriptionProvider"/>.
/// to an <c>IApiDescriptionProvider</c>.
/// </remarks>
public interface IApiResponseFormatMetadataProvider
{
/// <summary>
/// Gets a filtered list of content types which are supported by the <see cref="IOutputFormatter"/>
/// Gets a filtered list of content types which are supported by the <see cref="IOutputFormatter"/>
/// for the <paramref name="declaredType"/> and <paramref name="contentType"/>.
/// </summary>
/// <param name="declaredType">The declared type for which the supported content types are desired.</param>

2
src/Microsoft.AspNet.Mvc.Core/Description/IApiResponseMetadataProvider.cs → src/Microsoft.AspNet.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs
View File

@ -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
{
/// <summary>
/// Provides a return type and a set of possible content types returned by a successful execution of the action.

6
src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApiExplorerModel.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
}
/// <summary>
/// If <c>true</c>, <see cref="Description.ApiDescription"/> objects will be created for the associated
/// If <c>true</c>, <c>APIExplorer.ApiDescription</c> objects will be created for the associated
/// controller or action.
/// </summary>
/// <remarks>
@ -37,8 +37,8 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
public bool? IsVisible { get; set; }
/// <summary>
/// The value for <see cref="Description.ApiDescription.GroupName"/> of
/// <see cref="Description.ApiDescription"/> objects created for the associated controller or action.
/// The value for <c>APIExplorer.ApiDescription.GroupName</c> of
/// <c>APIExplorer.ApiDescription</c> objects created for the associated controller or action.
/// </summary>
public string GroupName { get; set; }
}

2
src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultActionModelBuilder.cs
View File

@ -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;

2
src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultControllerModelBuilder.cs
View File

@ -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;

2
src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorBuilder.cs
View File

@ -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;

3
src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs
View File

@ -30,7 +30,8 @@ namespace Microsoft.AspNet.Mvc
protected virtual HashSet<string> ReferenceAssemblies { get; } = new HashSet<string>(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",

2
src/Microsoft.AspNet.Mvc.Core/Filters/FormatFilter.cs
View File

@ -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;

2
src/Microsoft.AspNet.Mvc.Core/Filters/ProducesAttribute.cs
View File

@ -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;

2
src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs
View File

@ -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;

2
src/Microsoft.AspNet.Mvc/MvcServices.cs
View File

@ -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;

1
src/Microsoft.AspNet.Mvc/project.json
View File

@ -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-*",

1
test/Microsoft.AspNet.Mvc.Core.Test/Description/DefaultApiDescriptionProviderTest.cs → test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
View File

@ -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;

20
test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>4c2ad8ab-8ac0-46c4-80c6-c5577c7255f6</ProjectGuid>
<RootNamespace>Microsoft.AspNet.Mvc.ApiExplorer.Test</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

20
test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json Normal file
View File

@ -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": { }
}
}

2
test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs
View File

@ -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;

2
test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
View File

@ -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
{