Update Mvc.Core and dependencies to netstandard1.6

2016-05-26 15:57:57 -07:00 · 2016-05-26 15:57:57 -07:00 · bb226aef6b
parent b6794ab1b7
commit bb226aef6b
38 changed files with 38 additions and 38 deletions
--- 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;
--- 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"
      ]
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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"
      ],
--- 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"
      ]
--- 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;
--- 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"
      ],
--- 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"
      ]
--- 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"
      ],
--- 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"
      ]
--- 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-*",
--- 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"
      ],
--- 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;
--- 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"
      ]
--- 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;
--- 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-*"
      },
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;

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

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

--- 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
 {
--- 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;
--- 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;
--- 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;
--- 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;
--- 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
    /// </summary>
    public static class HttpRequestMessageExtensions
    {
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6

        /// <summary>
        /// Helper method for creating an <see cref="HttpResponseMessage"/> message with a "416 (Requested Range Not
--- 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"
      ],
--- 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"
      ]