From bb226aef6be3e91c23e4ced99a6b8baae4fceac8 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 26 May 2016 15:57:57 -0700 Subject: [PATCH] Update Mvc.Core and dependencies to netstandard1.6 --- .../DefaultApiDescriptionProvider.cs | 2 +- src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs | 2 +- src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs | 2 +- .../Internal/ControllerActionInvoker.cs | 2 +- .../ModelBinding/Binders/DictionaryModelBinder.cs | 2 +- .../ModelBinding/Binders/FormFileModelBinder.cs | 2 +- .../ModelBinding/Binders/HeaderModelBinder.cs | 2 +- src/Microsoft.AspNetCore.Mvc.Core/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.Cors/project.json | 2 +- .../Internal/DataAnnotationsModelValidatorProvider.cs | 2 +- src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.Localization/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.Razor/project.json | 2 +- src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs | 2 +- src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json | 2 +- .../ViewFeatures/ViewDataDictionary.cs | 2 +- src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json | 2 +- .../ContentNegotiator/CollectionExtensions.cs | 2 +- .../ContentNegotiator/ContentNegotiationResult.cs | 2 +- .../ContentNegotiator/DefaultContentNegotiator.cs | 2 +- .../ContentNegotiator/FormDataCollection.cs | 2 +- .../ContentNegotiator/FormattingUtilities.cs | 2 +- .../ContentNegotiator/IContentNegotiator.cs | 2 +- .../ContentNegotiator/ListWrapperCollection.cs | 2 +- .../ContentNegotiator/MediaTypeConstants.cs | 2 +- .../ContentNegotiator/MediaTypeFormatterMatch.cs | 2 +- .../ContentNegotiator/MediaTypeFormatterMatchRanking.cs | 2 +- .../ContentNegotiator/MediaTypeHeaderValueExtensions.cs | 2 +- .../ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs | 2 +- .../ContentNegotiator/ParsedMediaTypeHeaderValue.cs | 2 +- .../ContentNegotiator/StringWithQualityHeaderValueComparer.cs | 2 +- .../HttpRequestMessage/HttpRequestMessageExtensions.cs | 2 +- src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json | 2 +- src/Microsoft.AspNetCore.Mvc/project.json | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs index d22bdb81a6..2483e89ca9 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_5 +#if NETSTANDARD1_6 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 f47a44aee2..4181b53cc3 100644 --- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json @@ -32,7 +32,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ] diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs b/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs index d3ee7257fd..08e80d744e 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_5 +#if NETSTANDARD1_6 using System.Reflection; #endif using Microsoft.AspNetCore.Mvc.ModelBinding; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs b/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs index ed5e7aba35..f1c455ab5f 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_5 +#if NETSTANDARD1_6 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 939f481539..cec356ad37 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_5 +#if NETSTANDARD1_6 using System.Reflection; #endif using System.Runtime.ExceptionServices; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs index 3c52c73797..303baa26c8 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -#if NETSTANDARD1_5 +#if NETSTANDARD1_6 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs index 7befd27a33..4d3a4ead4d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; -#if NETSTANDARD1_5 +#if NETSTANDARD1_6 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs index 81053db11f..5b613c8141 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/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_5 +#if NETSTANDARD1_6 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 1237773b14..50f6a72214 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Core/project.json @@ -58,7 +58,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ], diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/project.json b/src/Microsoft.AspNetCore.Mvc.Cors/project.json index 41aa898e94..32f024d776 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Cors/project.json @@ -26,7 +26,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ] diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs index 5bde1f9234..2bd190f5fb 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_5 +#if NETSTANDARD1_6 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 4e4a1282c6..17775c49c5 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json @@ -37,7 +37,7 @@ "System.ComponentModel.DataAnnotations": "" } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ], diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json index 2878ba60b4..b8c7e06ffa 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json @@ -30,7 +30,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ] diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json index 9e633c76af..5d11eb90c6 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json @@ -38,7 +38,7 @@ "System.Xml": "" } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ], diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/project.json b/src/Microsoft.AspNetCore.Mvc.Localization/project.json index 82900cfc51..d62f09b01d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Localization/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Localization/project.json @@ -21,7 +21,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+win8" ] diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json index c90e804789..69881888ec 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json @@ -32,7 +32,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "dependencies": { "System.Collections.Concurrent": "4.0.12-*", "System.ComponentModel.TypeConverter": "4.0.1-*", diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/project.json b/src/Microsoft.AspNetCore.Mvc.Razor/project.json index 2977950999..e59567968d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor/project.json @@ -44,7 +44,7 @@ "frameworkAssemblies": { } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ], diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs index e53c1ed1c3..794ee1a4ee 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -#if NETSTANDARD1_5 +#if NETSTANDARD1_6 using System.Reflection; #endif using Microsoft.AspNetCore.Mvc.ModelBinding; diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json index e2cd46bccd..7a18f23fc2 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json @@ -41,7 +41,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+win8" ] diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs index e506d992f9..6a29fb94bb 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_5 +#if NETSTANDARD1_6 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 3318d23d09..7884ef4d10 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json @@ -52,7 +52,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "dependencies": { "System.Runtime.Serialization.Primitives": "4.1.1-*" }, diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs index ef16268797..547f323354 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_5 +#if NETSTANDARD1_6 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 048ee1e74b..7439ca0fc4 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_5 +#if NETSTANDARD1_6 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 560e34f4cc..1184871d1d 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_5 +#if NETSTANDARD1_6 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 d997cb11f4..6d9e3b7e8c 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_5 +#if NETSTANDARD1_6 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 d7d7410a25..1a9921221f 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_5 +#if NETSTANDARD1_6 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 c35eb00ece..bf9582d2f4 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_5 +#if NETSTANDARD1_6 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 2e41b0d60d..8c3c4abc1c 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_5 +#if NETSTANDARD1_6 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 2028ba7b3e..3377eaba24 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_5 +#if NETSTANDARD1_6 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 d186e12af2..3161670da2 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_5 +#if NETSTANDARD1_6 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 7c081bccd4..319372745b 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_5 +#if NETSTANDARD1_6 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 844b4344a0..bffca363ec 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_5 +#if NETSTANDARD1_6 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 5f8478858a..e1cc2a1299 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_5 +#if NETSTANDARD1_6 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 83ba93ea91..fc9ae86882 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_5 +#if NETSTANDARD1_6 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 69fe9178d3..f42e2bd0bc 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_5 +#if NETSTANDARD1_6 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 875489e8b6..4654d3ca7c 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_5 +#if !NETSTANDARD1_6 /// /// 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 d27a52780f..52f4f2f20d 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json @@ -38,7 +38,7 @@ "System.Xml": "" } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ], diff --git a/src/Microsoft.AspNetCore.Mvc/project.json b/src/Microsoft.AspNetCore.Mvc/project.json index 691956d0e5..345dc29d62 100644 --- a/src/Microsoft.AspNetCore.Mvc/project.json +++ b/src/Microsoft.AspNetCore.Mvc/project.json @@ -37,7 +37,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net451+win8" ]