From 78e90d7f0424361749520f3f60dd643c8733f9d9 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 17 Nov 2015 18:59:46 -0800 Subject: [PATCH] Update ifdefs from DNXCORE50 to DOTNET5_4 Fixes #467 --- src/Microsoft.AspNet.Http/FormCollection.cs | 3 ++- src/Microsoft.AspNet.Http/HeaderDictionary.cs | 2 +- src/Microsoft.AspNet.Http/QueryCollection.cs | 2 +- src/Microsoft.AspNet.Http/RequestCookieCollection.cs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNet.Http/FormCollection.cs b/src/Microsoft.AspNet.Http/FormCollection.cs index fbc3b88a38..b8e13fb315 100644 --- a/src/Microsoft.AspNet.Http/FormCollection.cs +++ b/src/Microsoft.AspNet.Http/FormCollection.cs @@ -1,6 +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. +using System; using System.Collections; using System.Collections.Generic; using Microsoft.Extensions.Primitives; @@ -13,7 +14,7 @@ namespace Microsoft.AspNet.Http.Internal public class FormCollection : IFormCollection { public static readonly FormCollection Empty = new FormCollection(); -#if DNXCORE50 +#if DOTNET5_4 private static readonly string[] EmptyKeys = Array.Empty(); private static readonly StringValues[] EmptyValues = Array.Empty(); #else diff --git a/src/Microsoft.AspNet.Http/HeaderDictionary.cs b/src/Microsoft.AspNet.Http/HeaderDictionary.cs index 530c5f31e0..181c938ca1 100644 --- a/src/Microsoft.AspNet.Http/HeaderDictionary.cs +++ b/src/Microsoft.AspNet.Http/HeaderDictionary.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Http.Internal /// public class HeaderDictionary : IHeaderDictionary { -#if DNXCORE50 +#if DOTNET5_4 private static readonly string[] EmptyKeys = Array.Empty(); private static readonly StringValues[] EmptyValues = Array.Empty(); #else diff --git a/src/Microsoft.AspNet.Http/QueryCollection.cs b/src/Microsoft.AspNet.Http/QueryCollection.cs index 2b9168d500..6ea9c379ac 100644 --- a/src/Microsoft.AspNet.Http/QueryCollection.cs +++ b/src/Microsoft.AspNet.Http/QueryCollection.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Http.Internal public class QueryCollection : IQueryCollection { public static readonly QueryCollection Empty = new QueryCollection(); -#if DNXCORE50 +#if DOTNET5_4 private static readonly string[] EmptyKeys = Array.Empty(); private static readonly StringValues[] EmptyValues = Array.Empty(); #else diff --git a/src/Microsoft.AspNet.Http/RequestCookieCollection.cs b/src/Microsoft.AspNet.Http/RequestCookieCollection.cs index 8b2a44239c..9751eee486 100644 --- a/src/Microsoft.AspNet.Http/RequestCookieCollection.cs +++ b/src/Microsoft.AspNet.Http/RequestCookieCollection.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Http.Internal public class RequestCookieCollection : IRequestCookieCollection { public static readonly RequestCookieCollection Empty = new RequestCookieCollection(); -#if DNXCORE50 +#if DOTNET5_4 private static readonly string[] EmptyKeys = Array.Empty(); #else private static readonly string[] EmptyKeys = new string[0];