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

Merge pull request #6236 from aspnet/rel/2.0.0-preview1 

Change TFM to netcoreapp2.0 (#6234)
This commit is contained in:
Pranav K 2017-05-04 22:18:48 -07:00 committed by GitHub
parent aa0ed113db 1c5e417606
commit 64ffcfaa89
120 changed files with 66 additions and 67798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -4,7 +4,7 @@
<BenchmarkDotNetVersion>0.10.3</BenchmarkDotNetVersion>
<CoreFxVersion>4.3.0</CoreFxVersion>
<DependencyModelVersion>2.0.0-*</DependencyModelVersion>
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
<InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
<JsonNetBsonVersion>1.0.1</JsonNetBsonVersion>
<MoqVersion>4.7.1</MoqVersion>
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>

3
samples/MvcSandbox/MvcSandbox.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

7977
src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

7
src/Microsoft.AspNetCore.Mvc.Abstractions/breakingchanges.netframework.json
View File

@ -1,7 +0,0 @@
[
{
"TypeId": "public interface Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IModelBindingMessageProvider",
"MemberId": "System.Func<System.String> get_MissingRequestBodyRequiredValueAccessor()",
"Kind": "Addition"
}
]

2
src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
View File

@ -4,9 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Abstractions;

2
src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>

927
src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netframework.json
View File

@ -1,927 +0,0 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.Mvc.ApiExplorer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_ActionDescriptor",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ActionDescriptor",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_GroupName",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_GroupName",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_HttpMethod",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_HttpMethod",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_ParameterDescriptions",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Properties",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_RelativePath",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_RelativePath",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_SupportedRequestFormats",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_SupportedResponseTypes",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "GetProperty<T0>",
"Parameters": [
{
"Name": "apiDescription",
"Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription"
}
],
"ReturnType": "T0",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": [
{
"ParameterName": "T",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
}
]
},
{
"Kind": "Method",
"Name": "SetProperty<T0>",
"Parameters": [
{
"Name": "apiDescription",
"Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription"
},
{
"Name": "value",
"Type": "T0"
}
],
"ReturnType": "System.Void",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": [
{
"ParameterName": "T",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
}
]
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_GroupName",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Items",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "groupName",
"Type": "System.String"
},
{
"Name": "items",
"Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Items",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Version",
"Parameters": [],
"ReturnType": "System.Int32",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "items",
"Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup>"
},
{
"Name": "version",
"Type": "System.Int32"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupCollectionProvider"
],
"Members": [
{
"Kind": "Method",
"Name": "get_ApiDescriptionGroups",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupCollectionProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "actionDescriptorCollectionProvider",
"Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider"
},
{
"Name": "apiDescriptionProviders",
"Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Actions",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Results",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "actions",
"Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_ModelMetadata",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ModelMetadata",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Name",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Name",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_RouteInfo",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_RouteInfo",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Source",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Source",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Type",
"Parameters": [],
"ReturnType": "System.Type",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Type",
"Parameters": [
{
"Name": "value",
"Type": "System.Type"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Constraints",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Constraints",
"Parameters": [
{
"Name": "value",
"Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint>"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_DefaultValue",
"Parameters": [],
"ReturnType": "System.Object",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_DefaultValue",
"Parameters": [
{
"Name": "value",
"Type": "System.Object"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_IsOptional",
"Parameters": [],
"ReturnType": "System.Boolean",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_IsOptional",
"Parameters": [
{
"Name": "value",
"Type": "System.Boolean"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Formatter",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Formatter",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_MediaType",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_MediaType",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Formatter",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Formatter",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_MediaType",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_MediaType",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_ApiResponseFormats",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ApiResponseFormats",
"Parameters": [
{
"Name": "value",
"Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat>"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_ModelMetadata",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ModelMetadata",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Type",
"Parameters": [],
"ReturnType": "System.Type",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Type",
"Parameters": [
{
"Name": "value",
"Type": "System.Type"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_StatusCode",
"Parameters": [],
"ReturnType": "System.Int32",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_StatusCode",
"Parameters": [
{
"Name": "value",
"Type": "System.Int32"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.DefaultApiDescriptionProvider",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Order",
"Parameters": [],
"ReturnType": "System.Int32",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnProvidersExecuting",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
}
],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnProvidersExecuted",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
}
],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "optionsAccessor",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
},
{
"Name": "constraintResolver",
"Type": "Microsoft.AspNetCore.Routing.IInlineConstraintResolver"
},
{
"Name": "modelMetadataProvider",
"Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupCollectionProvider",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_ApiDescriptionGroups",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Order",
"Parameters": [],
"ReturnType": "System.Int32",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnProvidersExecuting",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
}
],
"ReturnType": "System.Void",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnProvidersExecuted",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
}
],
"ReturnType": "System.Void",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.Extensions.DependencyInjection.MvcApiExplorerMvcCoreBuilderExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "AddApiExplorer",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
}
]
}

34
src/Microsoft.AspNetCore.Mvc.ApiExplorer/breakingchanges.netframework.json
View File

@ -1,34 +0,0 @@
[
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType",
"Kind": "Removal"
},
{
"TypeId": "public interface Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
"Kind": "Removal"
}
]

4
src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
View File

@ -4,10 +4,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Mvc.Internal;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using Microsoft.AspNetCore.Mvc.ModelBinding;
namespace Microsoft.AspNetCore.Mvc

2
src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
View File

@ -3,9 +3,7 @@
using System;
using System.Collections.ObjectModel;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using Microsoft.AspNetCore.Mvc.Core;
namespace Microsoft.AspNetCore.Mvc.Filters

12
src/Microsoft.AspNetCore.Mvc.Core/Internal/AmbiguousActionException.cs
View File

@ -2,21 +2,14 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
#if NET46
using System.Runtime.Serialization;
#endif
namespace Microsoft.AspNetCore.Mvc.Internal
{
/// <summary>
/// An exception which indicates multiple matches in action selection.
/// </summary>
#if NET46
[Serializable]
#elif NETSTANDARD1_6
#else
#error target frameworks need to be updated
#endif
public class AmbiguousActionException : InvalidOperationException
{
public AmbiguousActionException(string message)
@ -24,14 +17,9 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{
}
#if NET46
protected AmbiguousActionException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
}
#elif NETSTANDARD1_6
#else
#error target frameworks need to be updated
#endif
}
}

6
src/Microsoft.AspNetCore.Mvc.Core/Internal/NonDisposableStream.cs
View File

@ -108,7 +108,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
}
#if NET46
/// <inheritdoc />
public override IAsyncResult BeginRead(
byte[] buffer,
@ -147,10 +146,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public override void Close()
{
}
#elif NETSTANDARD1_6
#else
#error target frameworks need to be updated.
#endif
/// <inheritdoc />
public override int ReadByte()
{

2
src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
View File

@ -12,7 +12,7 @@ Microsoft.AspNetCore.Mvc.FromBodyAttribute
Microsoft.AspNetCore.Mvc.FromFormAttribute
Microsoft.AspNetCore.Mvc.RequireHttpsAttribute
Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>

3
src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs
View File

@ -5,9 +5,6 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc.Internal;
using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;

3
src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs
View File

@ -6,9 +6,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Linq;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;

3
src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs
View File

@ -2,9 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Internal;

23391
src/Microsoft.AspNetCore.Mvc.Core/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

125
src/Microsoft.AspNetCore.Mvc.Core/breakingchanges.netframework.json
View File

@ -1,125 +0,0 @@
[
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ProducesAttribute : Microsoft.AspNetCore.Mvc.Filters.ResultFilterAttribute, Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider",
"Kind": "Removal"
},
{
"TypeId": "public static class Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResultExtensions",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ChallengeResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ChallengeResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(System.Collections.Generic.IList<System.String> authenticationSchemes, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ChallengeResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(System.String authenticationScheme, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ChallengeResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties get_Properties()",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ChallengeResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public System.Void set_Properties(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties value)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ForbidResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ForbidResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(System.Collections.Generic.IList<System.String> authenticationSchemes, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ForbidResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(System.String authenticationScheme, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ForbidResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties get_Properties()",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.ForbidResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public System.Void set_Properties(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties value)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.SignOutResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(System.Collections.Generic.IList<System.String> authenticationSchemes, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.SignOutResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(System.String authenticationScheme, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.SignOutResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties get_Properties()",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.SignOutResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public System.Void set_Properties(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties value)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.SignInResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public .ctor(System.String authenticationScheme, System.Security.Claims.ClaimsPrincipal principal, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.SignInResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties get_Properties()",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Mvc.SignInResult : Microsoft.AspNetCore.Mvc.ActionResult",
"MemberId": "public System.Void set_Properties(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties value)",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ControllerBase",
"MemberId": "public virtual Microsoft.AspNetCore.Mvc.ChallengeResult Challenge(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ControllerBase",
"MemberId": "public virtual Microsoft.AspNetCore.Mvc.ChallengeResult Challenge(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties, params System.String[] authenticationSchemes)",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ControllerBase",
"MemberId": "public virtual Microsoft.AspNetCore.Mvc.ForbidResult Forbid(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties)",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ControllerBase",
"MemberId": "public virtual Microsoft.AspNetCore.Mvc.ForbidResult Forbid(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties, params System.String[] authenticationSchemes)",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ControllerBase",
"MemberId": "public virtual Microsoft.AspNetCore.Mvc.SignInResult SignIn(System.Security.Claims.ClaimsPrincipal principal, Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties, System.String authenticationScheme)",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ControllerBase",
"MemberId": "public virtual Microsoft.AspNetCore.Mvc.SignOutResult SignOut(Microsoft.AspNetCore.Http.Authentication.AuthenticationProperties properties, params System.String[] authenticationSchemes)",
"Kind": "Removal"
}
]

2
src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC cross-origin resource sharing (CORS) features.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;cors</PackageTags>

325
src/Microsoft.AspNetCore.Mvc.Cors/baseline.netframework.json
View File

@ -1,325 +0,0 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Cors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "AddCors",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "AddCors",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
},
{
"Name": "setupAction",
"Type": "System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions>"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ConfigureCors",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
},
{
"Name": "setupAction",
"Type": "System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions>"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Mvc.Cors.Internal.ICorsAuthorizationFilter"
],
"Members": [
{
"Kind": "Method",
"Name": "get_PolicyName",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_PolicyName",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Order",
"Parameters": [],
"ReturnType": "System.Int32",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnAuthorizationAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "corsService",
"Type": "Microsoft.AspNetCore.Cors.Infrastructure.ICorsService"
},
{
"Name": "policyProvider",
"Type": "Microsoft.AspNetCore.Cors.Infrastructure.ICorsPolicyProvider"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Cors.Internal.CorsApplicationModelProvider",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Order",
"Parameters": [],
"ReturnType": "System.Int32",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnProvidersExecuted",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext"
}
],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnProvidersExecuting",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext"
}
],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Cors.Internal.CorsAuthorizationFilterFactory",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
"Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Order",
"Parameters": [],
"ReturnType": "System.Int32",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_IsReusable",
"Parameters": [],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CreateInstance",
"Parameters": [
{
"Name": "serviceProvider",
"Type": "System.IServiceProvider"
}
],
"ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "policyName",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Cors.Internal.DisableCorsAuthorizationFilter",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Mvc.Cors.Internal.ICorsAuthorizationFilter"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Order",
"Parameters": [],
"ReturnType": "System.Int32",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "OnAuthorizationAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Cors.Internal.ICorsAuthorizationFilter",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [
"Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter",
"Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
],
"Members": [],
"GenericParameters": []
}
]
}

3
src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs
View File

@ -3,9 +3,6 @@
using System;
using System.ComponentModel.DataAnnotations;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Options;

2
src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>

1347
src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;json</PackageTags>

836
src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netframework.json
View File

@ -1,836 +0,0 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Formatters.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.AspNetCore.Mvc.JsonPatchExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "ApplyTo<T0>",
"Parameters": [
{
"Name": "patchDoc",
"Type": "Microsoft.AspNetCore.JsonPatch.JsonPatchDocument<T0>"
},
{
"Name": "objectToApplyTo",
"Type": "T0"
},
{
"Name": "modelState",
"Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
}
],
"ReturnType": "System.Void",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": [
{
"ParameterName": "T",
"ParameterPosition": 0,
"Class": true,
"BaseTypeOrInterfaces": []
}
]
},
{
"Kind": "Method",
"Name": "ApplyTo<T0>",
"Parameters": [
{
"Name": "patchDoc",
"Type": "Microsoft.AspNetCore.JsonPatch.JsonPatchDocument<T0>"
},
{
"Name": "objectToApplyTo",
"Type": "T0"
},
{
"Name": "modelState",
"Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
},
{
"Name": "prefix",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": [
{
"ParameterName": "T",
"ParameterPosition": 0,
"Class": true,
"BaseTypeOrInterfaces": []
}
]
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.JsonResult",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_ContentType",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ContentType",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_SerializerSettings",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_SerializerSettings",
"Parameters": [
{
"Name": "value",
"Type": "Newtonsoft.Json.JsonSerializerSettings"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_StatusCode",
"Parameters": [],
"ReturnType": "System.Nullable<System.Int32>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_StatusCode",
"Parameters": [
{
"Name": "value",
"Type": "System.Nullable<System.Int32>"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Value",
"Parameters": [],
"ReturnType": "System.Object",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Value",
"Parameters": [
{
"Name": "value",
"Type": "System.Object"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ExecuteResultAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ActionContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Virtual": true,
"Override": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "value",
"Type": "System.Object"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "value",
"Type": "System.Object"
},
{
"Name": "serializerSettings",
"Type": "Newtonsoft.Json.JsonSerializerSettings"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.MvcJsonOptions",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_SerializerSettings",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonInputFormatter",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_SerializerSettings",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ReadRequestBodyAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
},
{
"Name": "encoding",
"Type": "System.Text.Encoding"
}
],
"ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CreateJsonSerializer",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializer",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ReleaseJsonSerializer",
"Parameters": [
{
"Name": "serializer",
"Type": "Newtonsoft.Json.JsonSerializer"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "logger",
"Type": "Microsoft.Extensions.Logging.ILogger"
},
{
"Name": "serializerSettings",
"Type": "Newtonsoft.Json.JsonSerializerSettings"
},
{
"Name": "charPool",
"Type": "System.Buffers.ArrayPool<System.Char>"
},
{
"Name": "objectPoolProvider",
"Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonOutputFormatter",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_SerializerSettings",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "WriteObject",
"Parameters": [
{
"Name": "writer",
"Type": "System.IO.TextWriter"
},
{
"Name": "value",
"Type": "System.Object"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CreateJsonWriter",
"Parameters": [
{
"Name": "writer",
"Type": "System.IO.TextWriter"
}
],
"ReturnType": "Newtonsoft.Json.JsonWriter",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CreateJsonSerializer",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializer",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "WriteResponseBodyAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
},
{
"Name": "selectedEncoding",
"Type": "System.Text.Encoding"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "serializerSettings",
"Type": "Newtonsoft.Json.JsonSerializerSettings"
},
{
"Name": "charPool",
"Type": "System.Buffers.ArrayPool<System.Char>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonPatchInputFormatter",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNetCore.Mvc.Formatters.JsonInputFormatter",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "ReadRequestBodyAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
},
{
"Name": "encoding",
"Type": "System.Text.Encoding"
}
],
"ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CanRead",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
}
],
"ReturnType": "System.Boolean",
"Virtual": true,
"Override": true,
"ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "logger",
"Type": "Microsoft.Extensions.Logging.ILogger"
},
{
"Name": "serializerSettings",
"Type": "Newtonsoft.Json.JsonSerializerSettings"
},
{
"Name": "charPool",
"Type": "System.Buffers.ArrayPool<System.Char>"
},
{
"Name": "objectPoolProvider",
"Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonSerializerSettingsProvider",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "CreateSerializerSettings",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.Json.Internal.JsonArrayPool<T0>",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Newtonsoft.Json.IArrayPool<T0>"
],
"Members": [
{
"Kind": "Method",
"Name": "Rent",
"Parameters": [
{
"Name": "minimumLength",
"Type": "System.Int32"
}
],
"ReturnType": "T0[]",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Newtonsoft.Json.IArrayPool<T0>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Return",
"Parameters": [
{
"Name": "array",
"Type": "T0[]"
}
],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Newtonsoft.Json.IArrayPool<T0>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "inner",
"Type": "System.Buffers.ArrayPool<T0>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "T",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
}
]
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.Json.Internal.JsonResultExecutor",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Logger",
"Parameters": [],
"ReturnType": "Microsoft.Extensions.Logging.ILogger",
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Options",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.MvcJsonOptions",
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_WriterFactory",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Mvc.Internal.IHttpResponseStreamWriterFactory",
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ExecuteAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Mvc.ActionContext"
},
{
"Name": "result",
"Type": "Microsoft.AspNetCore.Mvc.JsonResult"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "writerFactory",
"Type": "Microsoft.AspNetCore.Mvc.Internal.IHttpResponseStreamWriterFactory"
},
{
"Name": "logger",
"Type": "Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Mvc.Formatters.Json.Internal.JsonResultExecutor>"
},
{
"Name": "options",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcJsonOptions>"
},
{
"Name": "charPool",
"Type": "System.Buffers.ArrayPool<System.Char>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.Json.Internal.JsonSerializerObjectPolicy",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<Newtonsoft.Json.JsonSerializer>"
],
"Members": [
{
"Kind": "Method",
"Name": "Create",
"Parameters": [],
"ReturnType": "Newtonsoft.Json.JsonSerializer",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<Newtonsoft.Json.JsonSerializer>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Return",
"Parameters": [
{
"Name": "serializer",
"Type": "Newtonsoft.Json.JsonSerializer"
}
],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<Newtonsoft.Json.JsonSerializer>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "serializerSettings",
"Type": "Newtonsoft.Json.JsonSerializerSettings"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Mvc.Formatters.Json.Internal.MvcJsonMvcOptionsSetup",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.Extensions.Options.ConfigureOptions<Microsoft.AspNetCore.Mvc.MvcOptions>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "ConfigureMvc",
"Parameters": [
{
"Name": "options",
"Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
},
{
"Name": "serializerSettings",
"Type": "Newtonsoft.Json.JsonSerializerSettings"
},
{
"Name": "loggerFactory",
"Type": "Microsoft.Extensions.Logging.ILoggerFactory"
},
{
"Name": "charPool",
"Type": "System.Buffers.ArrayPool<System.Char>"
},
{
"Name": "objectPoolProvider",
"Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
}
],
"ReturnType": "System.Void",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "loggerFactory",
"Type": "Microsoft.Extensions.Logging.ILoggerFactory"
},
{
"Name": "jsonOptions",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcJsonOptions>"
},
{
"Name": "charPool",
"Type": "System.Buffers.ArrayPool<System.Char>"
},
{
"Name": "objectPoolProvider",
"Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.Extensions.DependencyInjection.MvcJsonMvcBuilderExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "AddJsonOptions",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
},
{
"Name": "setupAction",
"Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcJsonOptions>"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.Extensions.DependencyInjection.MvcJsonMvcCoreBuilderExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "AddJsonFormatters",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "AddJsonFormatters",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
},
{
"Name": "setupAction",
"Type": "System.Action<Newtonsoft.Json.JsonSerializerSettings>"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
}
]
}

8
src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
View File

@ -1,9 +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.
#if NET46
using System.Runtime.Serialization;
#endif
using System.Xml;
namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
@ -14,13 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
public static class FormattingUtilities
{
public static readonly int DefaultMaxDepth = 32;
#if NET46
public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter();
#elif NETSTANDARD1_6
#else
#error target frameworks needs to be updated.
#endif
/// <summary>
/// Gets the default Reader Quotas for XmlReader.

2
src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;xml</PackageTags>

8
src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
View File

@ -132,13 +132,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
try
{
#if NET46
// Verify that type is a valid data contract by forcing the serializer to try to create a data contract
FormattingUtilities.XsdDataContractExporter.GetRootElementName(type);
#elif NETSTANDARD1_6
#else
#error target frameworks need to be updated.
#endif
// Use FormattingUtilities here when https://github.com/aspnet/Mvc/issues/6235 is resolved.
// If the serializer does not support this type it will throw an exception.
return new DataContractSerializer(type, _serializerSettings);
}

1418
src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
View File

@ -7,7 +7,7 @@
Commonly used types:
Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer&lt;TResource&gt;
Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;localization</PackageTags>

1070
src/Microsoft.AspNetCore.Mvc.Localization/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

7
src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewManfiest.cs
View File

@ -4,9 +4,7 @@
using System;
using System.IO;
using System.Reflection;
#if NETSTANDARD1_6
using System.Runtime.Loader;
#endif
using Microsoft.AspNetCore.Mvc.ApplicationParts;
namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
@ -27,7 +25,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
private static void EnsureFeatureAssembly(AssemblyPart assemblyPart)
{
#if NETSTANDARD1_6
if (assemblyPart.Assembly.IsDynamic || string.IsNullOrEmpty(assemblyPart.Assembly.Location))
{
return;
@ -51,10 +48,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
// Don't throw if assembly cannot be loaded. This can happen if the file is not a managed assembly.
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif
}
}
}

11
src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs
View File

@ -14,16 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
private readonly CSharpCompilationOptions _compilationOptions;
private readonly CSharpParseOptions _parseOptions;
private readonly RazorReferenceManager _referenceManager;
private readonly DebugInformationFormat _pdbFormat =
#if NET46
SymbolsUtility.SupportsFullPdbGeneration() ?
DebugInformationFormat.Pdb :
DebugInformationFormat.PortablePdb;
#elif NETSTANDARD1_6
DebugInformationFormat.PortablePdb;
#else
#error target frameworks need to be updated.
#endif
private readonly DebugInformationFormat _pdbFormat = DebugInformationFormat.PortablePdb;
public CSharpCompiler(RazorReferenceManager manager, IOptions<RazorViewEngineOptions> optionsAccessor)
{

10
src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs
View File

@ -7,6 +7,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
using System.Text;
using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNetCore.Mvc.Razor.Compilation;
@ -184,14 +185,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
public static Assembly LoadAssembly(MemoryStream assemblyStream, MemoryStream pdbStream)
{
var assembly =
#if NET46
Assembly.Load(assemblyStream.ToArray(), pdbStream.ToArray());
#elif NETSTANDARD1_6
System.Runtime.Loader.AssemblyLoadContext.Default.LoadFromStream(assemblyStream, pdbStream);
#else
#error target frameworks need to be updated
#endif
var assembly = AssemblyLoadContext.Default.LoadFromStream(assemblyStream, pdbStream);
return assembly;
}

50
src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs
View File

@ -1,50 +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.
#if NET46
using System;
using System.Runtime.InteropServices;
namespace Microsoft.AspNetCore.Mvc.Razor.Internal
{
/// <summary>
/// Utility type for determining if a platform supports full pdb file generation.
/// </summary>
public class SymbolsUtility
{
private const string SymWriterGuid = "0AE2DEB0-F901-478b-BB9F-881EE8066788";
/// <summary>
/// Determines if the current platform supports full pdb generation.
/// </summary>
/// <returns><c>true</c> if full pdb generation is supported; <c>false</c> otherwise.</returns>
public static bool SupportsFullPdbGeneration()
{
if (Type.GetType("Mono.Runtime") != null)
{
return false;
}
try
{
// Check for the pdb writer component that roslyn uses to generate pdbs
var type = Marshal.GetTypeFromCLSID(new Guid(SymWriterGuid));
if (type != null)
{
// This line will throw if pdb generation is not supported.
Activator.CreateInstance(type);
return true;
}
}
catch
{
}
return false;
}
}
}
#elif NETSTANDARD1_6
#else
#error target frameworks need to be updated
#endif

6
src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC Razor view engine for CSHTML files.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;cshtml;razor</PackageTags>
@ -26,8 +26,4 @@
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PackageReference Include="System.Runtime.Loader" Version="$(CoreFxVersion)" />
</ItemGroup>
</Project>

4038
src/Microsoft.AspNetCore.Mvc.Razor/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC Razor Pages.</Description>
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;cshtml;razor</PackageTags>

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs
View File

@ -152,7 +152,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
// The key is typically too long to be useful, so we use a cryptographic hash
// as the actual key (better randomization and key distribution, so small vary
// values will generate dramatically different keys).
using (var sha256 = CryptographyAlgorithms.CreateSHA256())
using (var sha256 = SHA256.Create())
{
var contentBytes = Encoding.UTF8.GetBytes(key);
var hashedBytes = sha256.ComputeHash(contentBytes);

40
src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CryptographyAlgorithms.cs
View File

@ -1,40 +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.Security.Cryptography;
namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
{
public static class CryptographyAlgorithms
{
#if NETSTANDARD1_6
public static SHA256 CreateSHA256()
{
var sha256 = SHA256.Create();
return sha256;
}
#elif NET46
public static SHA256 CreateSHA256()
{
SHA256 sha256;
try
{
sha256 = SHA256.Create();
}
// SHA256.Create is documented to throw this exception on FIPS compliant machines.
// See: https://msdn.microsoft.com/en-us/library/z08hz7ad%28v=vs.110%29.aspx?f=255&MSPPError=-2147217396
catch (System.Reflection.TargetInvocationException)
{
// Fallback to a FIPS compliant SHA256 algorithm.
sha256 = new SHA256CryptoServiceProvider();
}
return sha256;
}
#else
#error target frameworks needs to be updated.
#endif
}
}

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileVersionProvider.cs
View File

@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
private static string GetHashForFile(IFileInfo fileInfo)
{
using (var sha256 = CryptographyAlgorithms.CreateSHA256())
using (var sha256 = SHA256.Create())
{
using (var readStream = fileInfo.CreateReadStream())
{

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC default tag helpers. Contains tag helpers for anchor tags, HTML input elements, caching, scripts, links (for CSS), and more.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;taghelper;taghelpers</PackageTags>

3
src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs
View File

@ -5,9 +5,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;

3625
src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
View File

@ -8,7 +8,7 @@ Commonly used types:
Microsoft.AspNetCore.Mvc.Controller
Microsoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute
Microsoft.AspNetCore.Mvc.ViewComponent</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

3
src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
View File

@ -5,9 +5,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
#if NETSTANDARD1_6
using System.Reflection;
#endif
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
using Microsoft.Extensions.Internal;

19237
src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Linq;
@ -293,7 +291,3 @@ namespace System.Collections.Generic
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
using System.Net.Http.Headers;
@ -50,7 +48,3 @@ namespace System.Net.Http.Formatting
public MediaTypeHeaderValue MediaType { get; set; }
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
@ -585,7 +583,3 @@ namespace System.Net.Http.Formatting
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using Microsoft.AspNetCore.WebUtilities;
using System.Collections;
using System.Collections.Generic;
@ -40,7 +38,3 @@ namespace System.Net.Http.Formatting
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
@ -237,7 +235,3 @@ namespace System.Net.Http
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
using System.Net.Http.Headers;
@ -38,7 +36,3 @@ namespace System.Net.Http.Formatting
IEnumerable<MediaTypeFormatter> formatters);
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
namespace System.Collections.ObjectModel
@ -31,7 +29,3 @@ namespace System.Collections.ObjectModel
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Net.Http.Headers;
namespace System.Net.Http.Formatting
@ -109,7 +107,3 @@ namespace System.Net.Http.Formatting
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Net.Http.Headers;
namespace System.Net.Http.Formatting
@ -57,7 +55,3 @@ namespace System.Net.Http.Formatting
public MediaTypeFormatterMatchRanking Ranking { get; private set; }
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
namespace System.Net.Http.Formatting
{
/// <summary>
@ -45,7 +43,3 @@ namespace System.Net.Http.Formatting
MatchOnRequestMediaType,
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Http.Headers;
@ -118,7 +116,3 @@ namespace System.Net.Http.Formatting
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Http.Headers;
@ -116,7 +114,3 @@ namespace System.Net.Http.Formatting
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Diagnostics;
using System.Net.Http.Headers;
@ -88,7 +86,3 @@ namespace System.Net.Http.Formatting
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

6
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
View File

@ -1,8 +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.
#if NETSTANDARD1_6
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Http.Headers;
@ -75,7 +73,3 @@ namespace System.Net.Http.Formatting
}
}
}
#elif NET46
#else
#error target frameworks needs to be updated.
#endif

41
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
View File

@ -19,47 +19,6 @@ namespace System.Net.Http
/// </summary>
public static class HttpRequestMessageExtensions
{
#if NET46
/// <summary>
/// Helper method for creating an <see cref="HttpResponseMessage"/> message with a "416 (Requested Range Not
/// Satisfiable)" status code. This response can be used in combination with the
/// <see cref="ByteRangeStreamContent"/> to indicate that the requested range or
/// ranges do not overlap with the current resource. The response contains a "Content-Range" header indicating
/// the valid upper and lower bounds for requested ranges.
/// </summary>
/// <param name="request">The request.</param>
/// <param name="invalidByteRangeException">An <see cref="InvalidByteRangeException"/> instance, typically
/// thrown by a <see cref="ByteRangeStreamContent"/> instance.</param>
/// <returns>
/// An 416 (Requested Range Not Satisfiable) error response with a Content-Range header indicating the valid
/// range.
/// </returns>
public static HttpResponseMessage CreateErrorResponse(
this HttpRequestMessage request,
InvalidByteRangeException invalidByteRangeException)
{
if (request == null)
{
throw new ArgumentNullException(nameof(request));
}
if (invalidByteRangeException == null)
{
throw new ArgumentNullException(nameof(invalidByteRangeException));
}
var rangeNotSatisfiableResponse = request.CreateErrorResponse(
HttpStatusCode.RequestedRangeNotSatisfiable,
invalidByteRangeException);
rangeNotSatisfiableResponse.Content.Headers.ContentRange = invalidByteRangeException.ContentRange;
return rangeNotSatisfiableResponse;
}
#elif NETSTANDARD1_6
#else
#error target frameworks needs to be updated.
#endif
/// <summary>
/// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/>
/// representing an error with an instance of <see cref="ObjectContent{T}"/> wrapping an

4
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj
View File

@ -6,11 +6,11 @@
<Description>Provides compatibility in ASP.NET Core MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations.
Commonly used types:
System.Web.Http.ApiController</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;aspnetwebapi</PackageTags>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
<PackageTargetFallback>$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
</PropertyGroup>
<ItemGroup>

2612
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and web APIs. ASP.NET Core MVC enables a clean separation of concerns and gives you full control over markup.</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>

51
src/Microsoft.AspNetCore.Mvc/baseline.netframework.json
View File

@ -1,51 +0,0 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.Extensions.DependencyInjection.MvcServiceCollectionExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "AddMvc",
"Parameters": [
{
"Name": "services",
"Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "AddMvc",
"Parameters": [
{
"Name": "services",
"Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
},
{
"Name": "setupAction",
"Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcOptions>"
}
],
"ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
}
]
}

3
test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

45
test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionContextAccessorTests.cs
View File

@ -1,45 +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 Xunit;
namespace Microsoft.AspNetCore.Mvc.Infrastructure
{
#if NET46
public class ActionContextAccessorTests
{
private static void DomainFunc()
{
var accessor = new ActionContextAccessor();
Assert.Equal(null, accessor.ActionContext);
accessor.ActionContext = new ActionContext();
}
[Fact]
public void ChangingAppDomainsDoesNotBreak_ActionContextAccessor()
{
// Arrange
var accessor = new ActionContextAccessor();
var context = new ActionContext();
var setupInfo = new AppDomainSetup
{
ApplicationBase = AppDomain.CurrentDomain.BaseDirectory
};
var domain = AppDomain.CreateDomain("newDomain", securityInfo: null, info: setupInfo);
// Act
domain.DoCallBack(DomainFunc);
AppDomain.Unload(domain);
accessor.ActionContext = context;
// Assert
Assert.True(ReferenceEquals(context, accessor.ActionContext));
}
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
}

3
test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
</PropertyGroup>

5
test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs
View File

@ -9,7 +9,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{
public class NonDisposableStreamTest
{
#if NET46
[Fact]
public void InnerStreamIsOpenOnClose()
{
@ -35,10 +34,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
// Act & Assert
nonDisposableStream.Close();
}
#elif NETCOREAPP2_0
#else
#error The target frameworks need to be updated
#endif
[Fact]
public void InnerStreamIsOpenOnDispose()

3
test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

19
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
View File

@ -308,28 +308,9 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
{ "This is a test 激光這兩個字是甚麼意思 string written using utf-8", "utf-8", true },
{ "This is a test 激光這兩個字是甚麼意思 string written using utf-16", "utf-16", true },
{ "This is a test 激光這兩個字是甚麼意思 string written using utf-32", "utf-32", false },
#if NET46
// CoreCLR does not like shift_jis as an encoding.
{ "This is a test 激光這兩個字是甚麼意思 string written using shift_jis", "shift_jis", false },
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
{ "This is a test æøå string written using iso-8859-1", "iso-8859-1", false },
};
#if NET46
// CoreCLR does not like iso-2022-kr as an encoding.
if (!TestPlatformHelper.IsMono)
{
// Mono issue - https://github.com/aspnet/External/issues/28
data.Add("This is a test 레이저 단어 뜻 string written using iso-2022-kr", "iso-2022-kr", false);
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
return data;
}
}

3
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
View File

@ -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.
#if NET46
using System;
using System.Collections.Generic;
using System.IO;
@ -474,4 +473,3 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
}
}
}
#endif

8
test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
View File

@ -22,17 +22,9 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public async Task CompilationOptions_AreUsedByViewsAndPartials()
{
// Arrange
#if NET46
var expected =
@"This method is running from NET46
This method is only defined in NET46";
#elif NETCOREAPP2_0
var expected =
@"This method is running from NETCOREAPP2_0
This method is only defined in NETCOREAPP2_0";
#else
#error the target framework needs to be updated.
#endif
// Act
var body = await Client.GetStringAsync("http://localhost/ViewsConsumingCompilationOptions/");

10
test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
View File

@ -94,16 +94,6 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
[Fact(Skip = "https://github.com/aspnet/Mvc/issues/6120")]
public async Task RuntimeErrorAreListedByErrorPageMiddleware()
{
// The desktop CLR does not correctly read the stack trace from portable PDBs. However generating full pdbs
// is only supported on machines with CLSID_CorSymWriter available. On desktop, we'll skip this test on
// machines without this component.
#if NET46
if (!SymbolsUtility.SupportsFullPdbGeneration())
{
return;
}
#endif
// Arrange
var expectedMessage = HtmlEncoder.Default.Encode("throw new Exception(\"Error from view\");");
var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");

17
test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
View File

@ -2,27 +2,14 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PackageTargetFallback>$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
<DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
<DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
<DefineConstants>$(DefineConstants);FUNCTIONAL_TESTS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0' ">
<!-- Work around https://github.com/dotnet/sdk/issues/926. Align with bitness of the web site projects. -->
<PlatformTarget>x86</PlatformTarget>
<!--
Work around https://github.com/Microsoft/vstest/issues/428 aka https://github.com/aspnet/Mvc/issues/5873.
Create the appropriate binding redirects.
-->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\XmlAssert.cs" />
<EmbeddedResource Include="compiler\resources\**\*" />

6
test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
View File

@ -62,12 +62,6 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
typeof(JsonMediaTypeFormatter).FullName,
typeof(XmlMediaTypeFormatter).FullName,
#if NET46
typeof(FormUrlEncodedMediaTypeFormatter).FullName,
#elif NETCOREAPP2_0
#else
#error the target framework needs to be updated.
#endif
};
// Act

3
test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

7
test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs
View File

@ -90,7 +90,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
Assert.Empty(feature.Views);
}
#if NET46
[Fact]
public void PopulateFeature_DoesNotFail_IfAssemblyHasEmptyLocation()
{
@ -107,10 +106,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
// Assert
Assert.Empty(feature.Views);
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
private class TestableViewsFeatureProvider : ViewsFeatureProvider
{
@ -151,7 +146,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
}
}
#if NET46
private class AssemblyWithEmptyLocation : Assembly
{
public override string Location => string.Empty;
@ -174,6 +168,5 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
}
}
}
#endif
}
}

5
test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
View File

@ -3,12 +3,9 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<DefineConstants>$(DefineConstants);SOME_TEST_DEFINE</DefineConstants>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

5
test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
View File

@ -2,10 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
View File

@ -2,7 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

151
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs
View File

@ -149,15 +149,6 @@ namespace System.Net.Http.Formatting
{
get
{
#if NET46
// Only mapping and accept makes sense with q != 1.0
MediaTypeFormatterMatch matchMapping10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping);
MediaTypeFormatterMatch matchMapping05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping);
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
MediaTypeFormatterMatch matchAccept10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral);
MediaTypeFormatterMatch matchAccept05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral);
@ -187,27 +178,6 @@ namespace System.Net.Http.Formatting
{ new List<MediaTypeFormatterMatch>() { matchAcceptAllRange05, matchAcceptAllRange10 }, matchAcceptAllRange10 },
{ new List<MediaTypeFormatterMatch>() { matchAcceptAllRange10, matchAcceptAllRange05 }, matchAcceptAllRange10 },
#if NET46
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10, matchMapping10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchMapping10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping10, matchMapping05 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchAccept05 }, matchMapping05 },
{ new List<MediaTypeFormatterMatch>() { matchMapping10, matchAccept10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchAcceptSubTypeRange05 }, matchMapping05 },
{ new List<MediaTypeFormatterMatch>() { matchMapping10, matchAcceptSubTypeRange10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchAcceptAllRange05 }, matchMapping05 },
{ new List<MediaTypeFormatterMatch>() { matchMapping10, matchAcceptAllRange10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchAccept10 }, matchAccept10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchAcceptAllRange10 }, matchAcceptAllRange10 },
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
};
}
}
@ -255,39 +225,6 @@ namespace System.Net.Http.Formatting
Assert.Null(result);
}
#if NET46
[Fact]
public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader()
{
// Prepare the request message
_request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
_request.Headers.Add("Browser", "IE");
_request.Headers.Add("Cookie", "ABC");
// Prepare the formatters
List<MediaTypeFormatter> formatters = new List<MediaTypeFormatter>();
formatters.Add(new JsonMediaTypeFormatter());
formatters.Add(new XmlMediaTypeFormatter());
PlainTextFormatter frmtr = new PlainTextFormatter();
frmtr.SupportedMediaTypes.Clear();
frmtr.MediaTypeMappings.Clear();
frmtr.SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/xml"));
frmtr.MediaTypeMappings.Add(new MyMediaTypeMapping(new MediaTypeHeaderValue(("application/xml"))));
formatters.Add(frmtr);
// Act
var result = _negotiator.Negotiate(typeof(string), _request, formatters);
// Assert
Assert.NotNull(result);
Assert.Equal("application/xml", result.MediaType.MediaType);
Assert.IsType<PlainTextFormatter>(result.Formatter);
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
[Fact]
public void Negotiate_ForRequestReturnsFirstMatchingFormatter()
@ -365,34 +302,6 @@ namespace System.Net.Http.Formatting
Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
}
#if NET46
[Fact]
public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders()
{
// Arrange
_request.Content = new StringContent("test");
_request.Headers.Add("x-requested-with", "XMLHttpRequest");
MediaTypeFormatterCollection formatters = new MediaTypeFormatterCollection(new MediaTypeFormatter[]
{
new XmlMediaTypeFormatter(),
new JsonMediaTypeFormatter(),
new FormUrlEncodedMediaTypeFormatter()
});
// Act
var result = _negotiator.Negotiate(typeof(string), _request, formatters);
// Assert
Assert.Equal("application/json", result.MediaType.MediaType);
Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
[Fact]
public void Negotiate_SelectsJsonFormatter_ForXHRAndJsonValueResponse()
{
@ -466,38 +375,6 @@ namespace System.Net.Http.Formatting
}
}
#if NET46
[Fact]
public void MatchMediaTypeMapping_ReturnsMatch()
{
// Arrange
MockContentNegotiator negotiator = new MockContentNegotiator();
HttpRequestMessage request = new HttpRequestMessage();
MediaTypeHeaderValue mappingMediatype = MediaTypeHeaderValue.Parse("application/other");
MockMediaTypeMapping mockMediaTypeMapping = new MockMediaTypeMapping(mappingMediatype, 0.75);
MockMediaTypeFormatter formatter = new MockMediaTypeFormatter();
formatter.MediaTypeMappings.Add(mockMediaTypeMapping);
// Act
MediaTypeFormatterMatch match = negotiator.MatchMediaTypeMapping(request, formatter);
// Assert
Assert.True(mockMediaTypeMapping.WasInvoked);
Assert.Same(request, mockMediaTypeMapping.Request);
Assert.Same(formatter, match.Formatter);
Assert.Equal(mockMediaTypeMapping.MediaType, match.MediaType);
Assert.Equal(mockMediaTypeMapping.MatchQuality, match.Quality);
Assert.Equal(MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping, match.Ranking);
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
[Theory]
[MemberData("MatchAcceptHeaderData")]
public void MatchAcceptHeader_ReturnsMatch(string[] acceptHeaders, string[] supportedMediaTypes, string expectedMediaType, double expectedQuality, int ranking)
@ -819,33 +696,5 @@ namespace System.Net.Http.Formatting
return true;
}
}
#if NET46
private class MyMediaTypeMapping : MediaTypeMapping
{
public MyMediaTypeMapping(MediaTypeHeaderValue mediaType)
: base(mediaType)
{
}
public override double TryMatchMediaType(HttpRequestMessage request)
{
if (request.Headers.Contains("Cookie"))
{
return 1.0;
}
else
{
return 0;
}
}
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
}
}

26
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
View File

@ -278,32 +278,6 @@ namespace System.Net.Http
Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType);
}
#if NET46
// API doesn't exist in CoreCLR.
[Fact]
public void CreateErrorResponseRangeNotSatisfiable_SetsCorrectStatusCodeAndContentRangeHeader()
{
// Arrange
var context = new DefaultHttpContext();
context.RequestServices = CreateServices(new DefaultContentNegotiator());
var request = CreateRequest(context);
var expectedContentRange = new ContentRangeHeaderValue(length: 128);
var invalidByteRangeException = new InvalidByteRangeException(expectedContentRange);
// Act
var response = request.CreateErrorResponse(invalidByteRangeException);
// Assert
Assert.Equal(HttpStatusCode.RequestedRangeNotSatisfiable, response.StatusCode);
Assert.Same(expectedContentRange, response.Content.Headers.ContentRange);
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
private static IServiceProvider CreateServices(
IContentNegotiator contentNegotiator = null,
MediaTypeFormatter formatter = null)

7
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj
View File

@ -3,11 +3,8 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PackageTargetFallback>$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
</PropertyGroup>
<ItemGroup>

13
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs
View File

@ -32,18 +32,7 @@ namespace System.Net.Http.Formatting.Mocks
public new Encoding SelectResponseCharacterEncoding(HttpRequestMessage request, MediaTypeFormatter formatter)
{
return base.SelectResponseCharacterEncoding(request, formatter);
}
#if NET46
public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter)
{
return base.MatchMediaTypeMapping(request, formatter);
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif
}
public new MediaTypeFormatterMatch MatchAcceptHeader(IEnumerable<MediaTypeWithQualityHeaderValue> sortedAcceptValues, MediaTypeFormatter formatter)
{

41
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs
View File

@ -1,41 +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.
#if NET46
using System.Net.Http.Headers;
namespace System.Net.Http.Formatting.Mocks
{
public class MockMediaTypeMapping : MediaTypeMapping
{
public MockMediaTypeMapping(string mediaType, double matchQuality)
: base(mediaType)
{
MatchQuality = matchQuality;
}
public MockMediaTypeMapping(MediaTypeHeaderValue mediaType, double matchQuality)
: base(mediaType)
{
MatchQuality = matchQuality;
}
public double MatchQuality { get; private set; }
public HttpRequestMessage Request { get; private set; }
public bool WasInvoked { get; private set; }
public override double TryMatchMediaType(HttpRequestMessage request)
{
WasInvoked = true;
Request = request;
return MatchQuality;
}
}
}
#elif NETCOREAPP2_0
#else
#error target frameworks needs to be updated.
#endif

3
test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/WebSites/BasicWebSite/BasicWebSite.csproj
View File

@ -2,8 +2,7 @@
<Import Project="..\..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj
View File

@ -2,7 +2,7 @@
<Import Project="..\..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
</PropertyGroup>

Some files were not shown because too many files have changed in this diff Show More