diff --git a/samples/MvcSandbox/Startup.cs b/samples/MvcSandbox/Startup.cs index 8e8e822946..d7f3fcafdf 100644 --- a/samples/MvcSandbox/Startup.cs +++ b/samples/MvcSandbox/Startup.cs @@ -14,9 +14,6 @@ namespace MvcSandbox public void ConfigureServices(IServiceCollection services) { services.AddMvc(); -#if DNX451 - services.AddMvcDnx(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/samples/MvcSandbox/project.json b/samples/MvcSandbox/project.json index e486dc7cfe..a278b1640f 100644 --- a/samples/MvcSandbox/project.json +++ b/samples/MvcSandbox/project.json @@ -21,12 +21,6 @@ "dotnet-razor-tooling": "1.0.0-*" }, "frameworks": { - "dnx451": { - "dependencies": { - "Microsoft.AspNetCore.Mvc.Dnx": "1.0.0-*", - "System.Runtime": "4.1.0-*" - } - }, "net451": { }, "netstandardapp1.5": { "imports": [ diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs index dcab0a3d8c..1186588832 100644 --- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json index 35eb91f76b..a51c11165c 100644 --- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json @@ -26,9 +26,9 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ] } diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs b/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs index 43921f94ee..6ccdc8c8fe 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using Microsoft.AspNetCore.Mvc.Core; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs b/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs index 08243af1be..ed5e7aba35 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs @@ -3,7 +3,7 @@ using System; using System.Collections.ObjectModel; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using Microsoft.AspNetCore.Mvc.Core; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs index c81b3b7996..fb9c0352b4 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DictionaryModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DictionaryModelBinder.cs index 419b242d14..cfd75211d8 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DictionaryModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DictionaryModelBinder.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs index 7387fc6a7b..2261104e4e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/GenericModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/GenericModelBinder.cs index 70b75cd708..81fffd95db 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/GenericModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/GenericModelBinder.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs index 72655a9595..467ae469be 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/project.json b/src/Microsoft.AspNetCore.Mvc.Core/project.json index 1f58114cf3..7cd2edb63c 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Core/project.json @@ -52,9 +52,9 @@ }, "frameworks": { "net451": { }, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ], "dependencies": { diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/project.json b/src/Microsoft.AspNetCore.Mvc.Cors/project.json index 1fd7a7c434..8ae4282743 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Cors/project.json @@ -19,9 +19,9 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ] } diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs index 60bcabf11a..5bde1f9234 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs @@ -3,7 +3,7 @@ using System; using System.ComponentModel.DataAnnotations; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json index a6ca43378f..f98da28d5c 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json @@ -31,9 +31,9 @@ "System.ComponentModel.DataAnnotations": "" } }, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ], "dependencies": { diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json index d7027d2b4e..e861557495 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json @@ -23,9 +23,9 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ] } diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json index 4362061f7d..b58e580d8d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json @@ -31,9 +31,9 @@ "System.Xml": "" } }, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ], "dependencies": { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json index 13e2d3d565..d12d5c95c9 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json @@ -24,7 +24,7 @@ }, "frameworks": { "net451": { }, - "netstandard1.3": { + "netstandard1.5": { "dependencies": { "System.Collections.Concurrent": "4.0.12-*", "System.ComponentModel.TypeConverter": "4.0.1-*", @@ -32,7 +32,7 @@ "System.Text.Encoding.Extensions": "4.0.11-*" }, "imports": [ - "dotnet5.4" + "dotnet5.6" ] } }, diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs index 96a9092ffe..08d9f3bc0d 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Globalization; -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Reflection; #endif using Microsoft.AspNetCore.Mvc.ModelBinding; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json index efb2520fb9..4b4d785d5e 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json @@ -42,9 +42,9 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ] } diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs index 8e431d5630..ef16268797 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.ObjectModel; using System.Diagnostics; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs index 1eb623aa3f..048ee1e74b 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; using System.Net.Http.Headers; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs index 04b616cc06..560e34f4cc 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs index 485e035917..d997cb11f4 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using Microsoft.AspNetCore.WebUtilities; using System.Collections; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs index 6058c72587..d7d7410a25 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; using System.Globalization; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs index cd26f5337d..c35eb00ece 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; using System.Net.Http.Headers; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs index 1c68458eb7..2e41b0d60d 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs index 1cd1d2caa8..2028ba7b3e 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Net.Http.Headers; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs index bca61ef8a7..d186e12af2 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Net.Http.Headers; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs index b7c4623cf4..7c081bccd4 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 namespace System.Net.Http.Formatting { diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs index d084f56a3c..844b4344a0 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs index 107b4a94ed..5f8478858a 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs index cf9dfe8f1a..83ba93ea91 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Diagnostics; using System.Net.Http.Headers; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs index d276b85d27..69fe9178d3 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs index fdf9b7cab3..875489e8b6 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs @@ -19,7 +19,7 @@ namespace System.Net.Http /// public static class HttpRequestMessageExtensions { -#if !NETSTANDARD1_3 +#if !NETSTANDARD1_5 /// /// Helper method for creating an message with a "416 (Requested Range Not diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json index f54e7ffb98..f05b49c86c 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json @@ -31,9 +31,9 @@ "System.Xml": "" } }, - "netstandard1.3": { + "netstandard1.5": { "imports": [ - "dotnet5.4", + "dotnet5.6", "portable-net451+win8" ], "dependencies": { diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json index 002f2597c1..8550b6a610 100644 --- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json @@ -9,9 +9,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -23,13 +20,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json index a27867df2f..78497cba2f 100644 --- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json @@ -14,9 +14,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -28,13 +25,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json index 75884e5bf0..38461957c0 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json @@ -24,9 +24,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -38,13 +35,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json index f5a3a7582f..9a5b965f7f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json @@ -16,9 +16,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -30,13 +27,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json index 68aba67c14..b21883cc07 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json @@ -16,9 +16,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -30,13 +27,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json index f5a3a7582f..9a5b965f7f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json @@ -16,9 +16,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -30,13 +27,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs index 1b7375a135..459a32c906 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if DNX451 +#if NET451 using System; using System.Collections.Generic; using System.IO; diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json index c82d000694..ae4cfca66c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json @@ -15,9 +15,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -29,13 +26,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs index 1ca5c61fa6..1084c8c5a2 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests public async Task CompilationOptions_AreUsedByViewsAndPartials() { // Arrange -#if NET451 || DNX451 +#if NET451 var expected = @"This method is running from NET451 This method is only defined in NET451"; diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs index 54ce70b7ef..a41b6f0d25 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs @@ -11,9 +11,6 @@ using Microsoft.AspNetCore.Mvc.Razor.Compilation; using Microsoft.AspNetCore.Mvc.Razor.Internal; using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.Testing; -#if DNX451 -using Microsoft.Extensions.CompilationAbstractions; -#endif using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.PlatformAbstractions; @@ -59,26 +56,13 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests { var startupAssembly = typeof(TStartup).GetTypeInfo().Assembly; var applicationName = startupAssembly.GetName().Name; -#if DNX451 - var libraryManager = DnxPlatformServices.Default.LibraryManager; - var library = libraryManager.GetLibrary(applicationName); - return Path.GetDirectoryName(library.Path); -#else var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath; return Path.GetFullPath(Path.Combine(applicationBasePath, relativePath, applicationName)); -#endif } protected virtual void InitializeServices(IServiceCollection services) { var startupAssembly = typeof(TStartup).GetTypeInfo().Assembly; - var applicationName = startupAssembly.GetName().Name; - - var applicationEnvironment = PlatformServices.Default.Application; -#if DNX451 - services.AddSingleton(CompilationServices.Default.LibraryExporter); - services.AddSingleton(); -#endif // Inject a custom assembly provider. Overrides AddMvc() because that uses TryAdd(). var assemblyProvider = new StaticAssemblyProvider(); diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json index 7429d9b6cf..314fd938ef 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json @@ -53,9 +53,6 @@ "XmlFormattersWebSite": "1.0.0" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "dependencies": { @@ -68,17 +65,6 @@ "portable-net451+win8" ] }, - "dnx451": { - "dependencies": { - "Microsoft.AspNetCore.Mvc.Dnx": "1.0.0-*", - "System.Collections": "4.0.11-*", - "System.IO": "4.1.0-*", - "System.Reflection": "4.1.0-*", - "System.Runtime": "4.1.0-*", - "System.Threading": "4.0.11-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": {} }, "exclude": [ diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json index 0343b3410a..2085af0428 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json @@ -15,9 +15,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -29,13 +26,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json index 4e746dbedb..3867bf2e58 100644 --- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json @@ -14,9 +14,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -28,13 +25,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json index c976378d92..3eaf33a899 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json @@ -15,9 +15,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "compilationOptions": { "define": [ "__RemoveThisBitTo__GENERATE_BASELINES" @@ -35,13 +32,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json index eb73809b2c..10a5209627 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json @@ -30,9 +30,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -44,13 +41,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json index 20e05e06b3..ad92c00f0a 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json @@ -17,9 +17,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -31,13 +28,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json index 3d202bb42d..50eab3ef4c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json @@ -11,9 +11,6 @@ "xunit": "2.1.0" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -25,13 +22,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs index 5e74ddb747..ce84da9c9b 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs @@ -211,11 +211,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents return GetAssemblyProvider() .CandidateAssemblies - .SelectMany(a => a.DefinedTypes) -#if DNX451 - .Select(t => t.GetTypeInfo()) -#endif - ; + .SelectMany(a => a.DefinedTypes); } private static IAssemblyProvider GetAssemblyProvider() diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json index 330cbfb203..d8fac1f864 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json @@ -22,9 +22,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { "netstandardapp1.5": { "imports": [ @@ -36,13 +33,6 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Runtime": "4.1.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - } - }, "net451": { "dependencies": { "Moq": "4.2.1312.1622" diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json index 0fb292b145..7107bf6a3e 100644 --- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json +++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json @@ -9,9 +9,9 @@ }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netstandard1.3": { "imports": [ - "dnxcore50", + "dotnet4.5", "portable-net451+win8" ] }