From 33d1aea8ea66543e16b25e3e4229ed3bebb67079 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 26 Feb 2016 11:11:16 -0800 Subject: [PATCH] Transition to Netstandard. - dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs. --- samples/ActionConstraintSample.Web/project.json | 9 ++++++--- samples/CustomRouteSample.Web/project.json | 7 +++++-- samples/EmbeddedViewSample.Web/project.json | 7 +++++-- samples/FormatFilterSample.Web/project.json | 7 +++++-- samples/InlineConstraintSample.Web/project.json | 7 +++++-- samples/JsonPatchSample.Web/project.json | 7 +++++-- samples/LocalizationSample.Web/project.json | 7 +++++-- samples/MvcSandbox/project.json | 7 +++++-- samples/MvcSubAreaSample.Web/project.json | 7 +++++-- samples/TagHelperSample.Web/project.json | 7 +++++-- samples/UrlHelperSample.Web/project.json | 7 +++++-- .../project.json | 11 ++++++++--- .../project.json | 11 ++++++++--- .../ModelBinding/CollectionModelBinder.cs | 2 +- .../ModelBinding/DictionaryModelBinder.cs | 2 +- .../ModelBinding/FormFileModelBinder.cs | 2 +- .../ModelBinding/GenericModelBinder.cs | 2 +- .../ModelBinding/HeaderModelBinder.cs | 2 +- src/Microsoft.AspNetCore.Mvc.Core/project.json | 13 +++++++++---- src/Microsoft.AspNetCore.Mvc.Cors/project.json | 11 ++++++++--- .../DataAnnotationsModelValidatorProvider.cs | 2 +- .../project.json | 11 ++++++++--- .../project.json | 11 ++++++++--- .../project.json | 11 ++++++++--- .../LocalizedHtmlString.cs | 2 +- .../project.json | 11 ++++++++--- .../project.json | 11 ++++++++--- .../Internal/DefaultRoslynCompilationService.cs | 8 ++++---- src/Microsoft.AspNetCore.Mvc.Razor/project.json | 11 ++++++++--- .../project.json | 11 ++++++++--- .../ViewFeatures/ViewDataDictionary.cs | 2 +- .../project.json | 11 ++++++++--- .../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 +- .../MediaTypeFormatterMatchRanking.cs | 2 +- .../MediaTypeHeaderValueExtensions.cs | 2 +- .../MediaTypeWithQualityHeaderComparer.cs | 2 +- .../ParsedMediaTypeHeaderValue.cs | 2 +- .../StringWithQualityHeaderValueComparer.cs | 2 +- .../HttpRequestMessageExtensions.cs | 2 +- .../project.json | 11 ++++++++--- src/Microsoft.AspNetCore.Mvc/project.json | 11 ++++++++--- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../Internal/AttributeRoutingTest.cs | 2 +- .../Internal/DefaultObjectValidatorTests.cs | 2 +- .../NonDisposableStreamTest.cs | 4 ++-- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../JsonOutputFormatterTests.cs | 4 ++-- .../project.json | 7 +++++-- ...XmlDataContractSerializerOutputFormatterTest.cs | 2 +- .../project.json | 7 +++++-- .../CompilationOptionsTests.cs | 6 +++--- .../ErrorPageTests.cs | 4 ++-- .../MvcSampleFixture.cs | 2 +- .../MvcTestFixture.cs | 2 +- .../WebApiCompatShimBasicTest.cs | 2 +- .../project.json | 9 ++++++--- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 9 ++++++--- .../project.json | 7 +++++-- test/Microsoft.AspNetCore.Mvc.Test/project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../DefaultContentNegotiatorTest.cs | 14 +++++++------- .../HttpRequestMessageExtensionsTest.cs | 2 +- .../Mocks/MockContentNegotiator.cs | 2 +- .../Mocks/MockMediaTypeMapping.cs | 2 +- .../project.json | 7 +++++-- test/WebSites/ApiExplorerWebSite/project.json | 7 +++++-- test/WebSites/ApplicationModelWebSite/project.json | 7 +++++-- test/WebSites/BasicWebSite/project.json | 7 +++++-- .../project.json | 7 +++++-- .../ControllersFromServicesWebSite/project.json | 7 +++++-- test/WebSites/CorsWebSite/project.json | 7 +++++-- .../ErrorPageMiddlewareWebSite/project.json | 7 +++++-- test/WebSites/FilesWebSite/project.json | 7 +++++-- test/WebSites/FiltersWebSite/project.json | 7 +++++-- test/WebSites/FormatterWebSite/project.json | 7 +++++-- test/WebSites/HtmlGenerationWebSite/project.json | 7 +++++-- .../project.json | 11 +++++++---- .../project.json | 7 +++++-- .../Services/FrameworkSpecificHelper.cs | 10 +++++----- .../_Partial.cshtml | 4 ++-- test/WebSites/RazorWebSite/project.json | 9 ++++++--- test/WebSites/RoutingWebSite/project.json | 7 +++++-- test/WebSites/SimpleWebSite/project.json | 7 +++++-- test/WebSites/TagHelpersWebSite/project.json | 7 +++++-- test/WebSites/UserClassLibrary/project.json | 11 +++++++---- test/WebSites/VersioningWebSite/project.json | 7 +++++-- test/WebSites/WebApiCompatShimWebSite/project.json | 7 +++++-- test/WebSites/XmlFormattersWebSite/project.json | 7 +++++-- 104 files changed, 430 insertions(+), 210 deletions(-) diff --git a/samples/ActionConstraintSample.Web/project.json b/samples/ActionConstraintSample.Web/project.json index 485147b61a..147cf4a168 100644 --- a/samples/ActionConstraintSample.Web/project.json +++ b/samples/ActionConstraintSample.Web/project.json @@ -12,9 +12,12 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "frameworks": { - "net451": { }, - "dnxcore50": { - "imports": "portable-net451+win8", + "net451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/CustomRouteSample.Web/project.json b/samples/CustomRouteSample.Web/project.json index e75e5f7b7c..87802af22b 100644 --- a/samples/CustomRouteSample.Web/project.json +++ b/samples/CustomRouteSample.Web/project.json @@ -13,8 +13,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/EmbeddedViewSample.Web/project.json b/samples/EmbeddedViewSample.Web/project.json index 19460365db..453a4b0197 100644 --- a/samples/EmbeddedViewSample.Web/project.json +++ b/samples/EmbeddedViewSample.Web/project.json @@ -15,8 +15,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/FormatFilterSample.Web/project.json b/samples/FormatFilterSample.Web/project.json index ed3366feb9..e0a416ee41 100644 --- a/samples/FormatFilterSample.Web/project.json +++ b/samples/FormatFilterSample.Web/project.json @@ -14,8 +14,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/InlineConstraintSample.Web/project.json b/samples/InlineConstraintSample.Web/project.json index 96895467c3..295c444f38 100644 --- a/samples/InlineConstraintSample.Web/project.json +++ b/samples/InlineConstraintSample.Web/project.json @@ -13,8 +13,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/JsonPatchSample.Web/project.json b/samples/JsonPatchSample.Web/project.json index b26dc22289..3ff687c15d 100644 --- a/samples/JsonPatchSample.Web/project.json +++ b/samples/JsonPatchSample.Web/project.json @@ -13,8 +13,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/LocalizationSample.Web/project.json b/samples/LocalizationSample.Web/project.json index 78caf71df1..33ce2422bf 100644 --- a/samples/LocalizationSample.Web/project.json +++ b/samples/LocalizationSample.Web/project.json @@ -13,8 +13,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/MvcSandbox/project.json b/samples/MvcSandbox/project.json index ed2d20a344..69744c3475 100644 --- a/samples/MvcSandbox/project.json +++ b/samples/MvcSandbox/project.json @@ -27,8 +27,11 @@ } }, "net451": { }, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/MvcSubAreaSample.Web/project.json b/samples/MvcSubAreaSample.Web/project.json index 2f1e8f3738..1292312ca3 100644 --- a/samples/MvcSubAreaSample.Web/project.json +++ b/samples/MvcSubAreaSample.Web/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/TagHelperSample.Web/project.json b/samples/TagHelperSample.Web/project.json index d473db7515..657d40d0d5 100644 --- a/samples/TagHelperSample.Web/project.json +++ b/samples/TagHelperSample.Web/project.json @@ -21,8 +21,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/samples/UrlHelperSample.Web/project.json b/samples/UrlHelperSample.Web/project.json index d4a0f9fa88..7f549a3c23 100644 --- a/samples/UrlHelperSample.Web/project.json +++ b/samples/UrlHelperSample.Web/project.json @@ -12,8 +12,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "NETStandard.Library": "1.0.0-*" } diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json index 439c1b112a..588b840cb6 100644 --- a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -33,13 +35,16 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "Microsoft.CSharp": "4.0.1-*", "System.ComponentModel.TypeConverter": "4.0.1-*", "System.Reflection.Extensions": "4.0.1-*", "System.Text.Encoding.Extensions": "4.0.11-*" - } + }, + "imports": [ + "dotnet5.4" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json index fa0664a164..35eb91f76b 100644 --- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -24,8 +26,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8" + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CollectionModelBinder.cs b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CollectionModelBinder.cs index 2d261f92cb..932d34a032 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CollectionModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CollectionModelBinder.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Linq; -#if DOTNET5_4 +#if NETSTANDARD1_3 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 47f7800323..e08a20be20 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 DOTNET5_4 +#if NETSTANDARD1_3 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 2d67487d24..c405b5d250 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -#if DOTNET5_4 +#if NETSTANDARD1_3 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 99eb8eb1cb..70b75cd708 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 DOTNET5_4 +#if NETSTANDARD1_3 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 e32c0505a5..5b5d192c1e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -#if DOTNET5_4 +#if NETSTANDARD1_3 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 fd09312e8c..29c9e5586c 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Core/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -55,11 +57,14 @@ "System.Runtime": "" } }, - "dotnet5.4": { - "imports": "portable-net451+win8", + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ], "dependencies": { "System.Text.Encoding": "4.0.11-*" } } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/project.json b/src/Microsoft.AspNetCore.Mvc.Cors/project.json index ab48c315b4..1fd7a7c434 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Cors/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -17,8 +19,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8" + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs index c745bbf100..60bcabf11a 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 DOTNET5_4 +#if NETSTANDARD1_3 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 73e9e3b3df..a6ca43378f 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -29,8 +31,11 @@ "System.ComponentModel.DataAnnotations": "" } }, - "dotnet5.4": { - "imports": "portable-net451+win8", + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ], "dependencies": { "System.ComponentModel.Annotations": "4.1.0-*" } diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json index bc3793a212..d7027d2b4e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -21,8 +23,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8" + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json index 032dad4259..4362061f7d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -29,8 +31,11 @@ "System.Xml": "" } }, - "dotnet5.4": { - "imports": "portable-net451+win8", + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ], "dependencies": { "System.Runtime.Serialization.Xml": "4.1.0-*", "System.Xml.XmlSerializer": "4.0.11-*" diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs b/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs index aac0739a5a..b6322850d9 100644 --- a/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs +++ b/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization /// public class LocalizedHtmlString : IHtmlContent { -#if DOTNET5_5 +#if NETSTANDARD1_4 private static readonly object[] EmptyArguments = Array.Empty(); #else private static readonly object[] EmptyArguments = new object[0]; diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/project.json b/src/Microsoft.AspNetCore.Mvc.Localization/project.json index cb5ed771aa..02dda23075 100644 --- a/src/Microsoft.AspNetCore.Mvc.Localization/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Localization/project.json @@ -4,7 +4,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -19,8 +21,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.6": { - "imports": "portable-net45+win8" + "netstandard1.5": { + "imports": [ + "dotnet5.6", + "portable-net45+win8" + ] } }, "exclude": [ diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json index 5a211fe9d1..46a2cf6266 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -26,14 +28,17 @@ "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*" } }, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "System.Collections.Concurrent": "4.0.12-*", "System.ComponentModel.TypeConverter": "4.0.1-*", "System.Reflection.Extensions": "4.0.1-*", "System.Text.Encoding.Extensions": "4.0.11-*" - } + }, + "imports": [ + "dotnet5.4" + ] } }, "exclude": [ diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs index 1173c54336..9f00803326 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs @@ -9,7 +9,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Reflection.PortableExecutable; -#if DOTNET5_6 +#if NETSTANDARD1_5 using System.Runtime.Loader; #endif using System.Text; @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal private readonly ILogger _logger; private readonly DependencyContext _dependencyContext; -#if DOTNET5_6 +#if NETSTANDARD1_5 private readonly RazorLoadContext _razorLoadContext; #endif @@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal _compilationOptions = optionsAccessor.Value.CompilationOptions; _logger = loggerFactory.CreateLogger(); -#if DOTNET5_6 +#if NETSTANDARD1_5 _razorLoadContext = new RazorLoadContext(); #endif @@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal mappedLineSpan.EndLinePosition.Character + 1); } -#if DOTNET5_6 +#if NETSTANDARD1_5 private class RazorLoadContext : AssemblyLoadContext { protected override Assembly Load(AssemblyName assemblyName) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/project.json b/src/Microsoft.AspNetCore.Mvc.Razor/project.json index 75a48f0195..d17d59963f 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -39,8 +41,11 @@ "System.Threading.Tasks": "" } }, - "dotnet5.6": { - "imports": "portable-net45+win8", + "netstandard1.5": { + "imports": [ + "dotnet5.6", + "portable-net45+win8" + ], "dependencies": { "System.Text.Encoding": "4.0.11-*", "System.Runtime.Loader": "4.0.0-*", diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json index d205ae11b0..8cab060d66 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -31,8 +33,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.6": { - "imports": "portable-net45+win8", + "netstandard1.5": { + "imports": [ + "dotnet5.6", + "portable-net45+win8" + ], "dependencies": { "System.Security.Cryptography.Algorithms": "4.0.0-*" } diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs index 4bd321ce8c..96a9092ffe 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 DOTNET5_4 +#if NETSTANDARD1_3 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 6f76f532c6..058622e030 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -40,8 +42,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8", + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs index 89461b0c8c..8e431d5630 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 DOTNET5_4 +#if NETSTANDARD1_3 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 2c0a2a67a1..1eb623aa3f 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 DOTNET5_4 +#if NETSTANDARD1_3 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 8ee0b6b222..04b616cc06 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 DOTNET5_4 +#if NETSTANDARD1_3 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 9f9cdc3fa9..485e035917 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 DOTNET5_4 +#if NETSTANDARD1_3 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 d2536ded1c..6058c72587 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 DOTNET5_4 +#if NETSTANDARD1_3 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 0438d4be56..cd26f5337d 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 DOTNET5_4 +#if NETSTANDARD1_3 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 7b6b930378..1c68458eb7 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 DOTNET5_4 +#if NETSTANDARD1_3 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 10d7265dda..1cd1d2caa8 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 DOTNET5_4 +#if NETSTANDARD1_3 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 85ba927a63..bca61ef8a7 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 DOTNET5_4 +#if NETSTANDARD1_3 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 dbfea5e472..b7c4623cf4 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 DOTNET5_4 +#if NETSTANDARD1_3 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 8ea738594c..d084f56a3c 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 DOTNET5_4 +#if NETSTANDARD1_3 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 6ea60c0b14..107b4a94ed 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 DOTNET5_4 +#if NETSTANDARD1_3 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 98debec8d5..cf9dfe8f1a 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 DOTNET5_4 +#if NETSTANDARD1_3 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 9a3efa8bbc..d276b85d27 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 DOTNET5_4 +#if NETSTANDARD1_3 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 6877b88f74..fdf9b7cab3 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 !DOTNET5_4 +#if !NETSTANDARD1_3 /// /// 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 976df4e161..f54e7ffb98 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -29,8 +31,11 @@ "System.Xml": "" } }, - "dotnet5.4": { - "imports": "portable-net451+win8", + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ], "dependencies": { "System.Net.Http": "4.0.1-*", "System.Runtime.Serialization.Xml": "4.1.0-*", diff --git a/src/Microsoft.AspNetCore.Mvc/project.json b/src/Microsoft.AspNetCore.Mvc/project.json index 8a3643264f..3f368436c5 100644 --- a/src/Microsoft.AspNetCore.Mvc/project.json +++ b/src/Microsoft.AspNetCore.Mvc/project.json @@ -8,7 +8,9 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ "CS1591" ], + "nowarn": [ + "CS1591" + ], "xmlDoc": true }, "dependencies": { @@ -28,8 +30,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.6": { - "imports": "portable-net451+win8" + "netstandard1.5": { + "imports": [ + "dotnet5.6", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json index 1c5583b5d3..5490f3ac81 100644 --- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json @@ -13,8 +13,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json index 60ec35a11e..d7f58e5cc2 100644 --- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json @@ -18,8 +18,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs index d23ef7fc48..a137140d5c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Text.Encodings.Web; -#if DNXCORE50 +#if NETSTANDARDAPP1_5 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs index 5505f42424..d585845d04 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -#if DNXCORE50 +#if NETSTANDARDAPP1_5 using System.Reflection; #endif using Microsoft.AspNetCore.Http; diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs index 0a4f4f9766..1c1abff373 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal { public class NonDisposableStreamTest { -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 [Fact] public void InnerStreamIsOpenOnClose() { @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal nonDisposableStream.Dispose(); } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 [Fact] public void InnerStreamIsNotFlushedOnClose() { diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json index b27deadebc..2234554f99 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json @@ -27,8 +27,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json index 9c0b3bfb19..aa17a56ede 100644 --- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json @@ -20,8 +20,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json index 7fb3beeba7..060bcf4674 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json @@ -20,8 +20,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs index 6b2741a111..ac48d008e6 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs @@ -219,14 +219,14 @@ 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 !DNXCORE50 +#if !NETSTANDARDAPP1_5 // CoreCLR does not like shift_jis as an encoding. { "This is a test 激光這兩個字是甚麼意思 string written using shift_jis", "shift_jis", false }, #endif { "This is a test æøå string written using iso-8859-1", "iso-8859-1", false }, }; -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 // CoreCLR does not like iso-2022-kr as an encoding. if (!TestPlatformHelper.IsMono) { diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json index 9c0b3bfb19..aa17a56ede 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json @@ -20,8 +20,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs index ba9de64a2a..3a9239f5d9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs @@ -427,7 +427,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml } } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 // DataContractSerializer in CoreCLR does not throw if the declared type is different from the type being // serialized. [ConditionalFact] diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json index 88c47ed209..bd7632f2be 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json @@ -19,8 +19,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs index 2741c6f28e..1ca5c61fa6 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs @@ -26,10 +26,10 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests var expected = @"This method is running from NET451 This method is only defined in NET451"; -#elif DNXCORE50 +#elif NETSTANDARDAPP1_5 var expected = -@"This method is running from DNXCORE50 -This method is only defined in DNXCORE50"; +@"This method is running from NETSTANDARDAPP1_5 +This method is only defined in NETSTANDARDAPP1_5"; #endif // Act diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs index df88157b84..c12ad7effe 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs @@ -5,7 +5,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 using Microsoft.AspNetCore.Testing.xunit; #endif using Xunit; @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests public HttpClient Client { get; } -#if DNXCORE50 +#if NETSTANDARDAPP1_5 [Theory] #else [ConditionalTheory] diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs index 415ed5d8c9..35352ab73d 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs @@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests public class MvcSampleFixture : MvcTestFixture { public MvcSampleFixture() -#if DNXCORE50 +#if NETSTANDARDAPP1_5 :base("../../../../../../samples/") #else : base("../../../../samples/") diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs index 3ece1d20b0..c18388c8c7 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests private readonly TestServer _server; public MvcTestFixture() -#if DNXCORE50 +#if NETSTANDARDAPP1_5 : this(Path.Combine("..", "..", "..", "..", "..", "WebSites")) #else : this(Path.Combine("..", "..", "..", "WebSites")) diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs index 0afa8c0822..cd42ad1d29 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs @@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests { typeof(JsonMediaTypeFormatter).FullName, typeof(XmlMediaTypeFormatter).FullName, -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 typeof(FormUrlEncodedMediaTypeFormatter).FullName, #endif }; diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json index 2fd6f380f7..4e662bb0ed 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json @@ -57,13 +57,16 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { "dependencies": { "Microsoft.Dnx.Compilation.CSharp.Common": "1.0.0-*", "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*", "dotnet-test-xunit": "1.0.0-dev-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] }, "dnx451": { "dependencies": { @@ -71,7 +74,7 @@ "xunit.runner.aspnet": "2.0.0-aspnet-*" } }, - "net451": { } + "net451": {} }, "exclude": [ "wwwroot", diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json index b540c7e6ff..6c3277df9e 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json @@ -19,8 +19,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json index 322a120290..f345f6709b 100644 --- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json @@ -18,8 +18,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json index b243747d0a..657f228418 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json @@ -25,8 +25,11 @@ "keyFile": "../../tools/Key.snk" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json index f52936f1e7..d02ef9eb7a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json @@ -33,8 +33,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" @@ -57,4 +60,4 @@ "node_modules", "bower_components" ] -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json index 2de94cef2d..5aaa248e10 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json @@ -21,8 +21,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json index 9d0bea763f..18c371029e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json @@ -15,8 +15,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json b/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json index b9b75a8151..4c1ab9961d 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json @@ -3,10 +3,13 @@ "shared": "**/*.cs", "frameworks": { "net451": {}, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "System.Runtime": "4.1.0-*" - } + }, + "imports": [ + "dotnet5.4" + ] } } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json index b9b75a8151..4c1ab9961d 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json @@ -3,10 +3,13 @@ "shared": "**/*.cs", "frameworks": { "net451": {}, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "System.Runtime": "4.1.0-*" - } + }, + "imports": [ + "dotnet5.4" + ] } } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json index 180624b784..b6d73866e2 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json @@ -26,8 +26,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs index 833afd8225..c927b3e191 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs @@ -149,7 +149,7 @@ namespace System.Net.Http.Formatting { get { -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 // Only mapping and accept makes sense with q != 1.0 MediaTypeFormatterMatch matchMapping10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping); MediaTypeFormatterMatch matchMapping05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping); @@ -176,7 +176,7 @@ namespace System.Net.Http.Formatting { new List() { matchType10, matchRequest10, matchAcceptAllRange10 }, matchAcceptAllRange10 }, { new List() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 }, { new List() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10 }, matchAccept10 }, -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 { new List() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10, matchMapping10 }, matchMapping10 }, #endif { new List() { matchAccept05, matchAccept10 }, matchAccept10 }, @@ -187,7 +187,7 @@ namespace System.Net.Http.Formatting { new List() { matchAcceptAllRange05, matchAcceptAllRange10 }, matchAcceptAllRange10 }, { new List() { matchAcceptAllRange10, matchAcceptAllRange05 }, matchAcceptAllRange10 }, -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 { new List() { matchMapping05, matchMapping10 }, matchMapping10 }, { new List() { matchMapping10, matchMapping05 }, matchMapping10 }, @@ -251,7 +251,7 @@ namespace System.Net.Http.Formatting Assert.Null(result); } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 [Fact] public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader() @@ -359,7 +359,7 @@ namespace System.Net.Http.Formatting Assert.IsType(result.Formatter); } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 [Fact] public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders() @@ -458,7 +458,7 @@ namespace System.Net.Http.Formatting } } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 [Fact] public void MatchMediaTypeMapping_ReturnsMatch() @@ -810,7 +810,7 @@ namespace System.Net.Http.Formatting } } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 private class MyMediaTypeMapping : MediaTypeMapping { diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs index a247efe83f..5c0366bb02 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs @@ -282,7 +282,7 @@ namespace System.Net.Http Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType); } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 // API doesn't exist in CoreCLR. [Fact] public void CreateErrorResponseRangeNotSatisfiable_SetsCorrectStatusCodeAndContentRangeHeader() diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs index f87ae49c10..c466badbf7 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs @@ -34,7 +34,7 @@ namespace System.Net.Http.Formatting.Mocks return base.SelectResponseCharacterEncoding(request, formatter); } -#if !DNXCORE50 +#if !NETSTANDARDAPP1_5 public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter) { diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs index 820028afb0..8ff6ddcec2 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.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 !DNXCORE50 +#if !NETSTANDARDAPP1_5 using System.Net.Http.Headers; diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json index 1492cfb745..1984515f45 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json @@ -16,8 +16,11 @@ "test": "xunit.runner.aspnet" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json index f41d89cadb..9e554a052d 100644 --- a/test/WebSites/ApiExplorerWebSite/project.json +++ b/test/WebSites/ApiExplorerWebSite/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json index 38e4039e65..fb174889c6 100644 --- a/test/WebSites/ApplicationModelWebSite/project.json +++ b/test/WebSites/ApplicationModelWebSite/project.json @@ -15,8 +15,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index 42171beaa7..18b9acb190 100644 --- a/test/WebSites/BasicWebSite/project.json +++ b/test/WebSites/BasicWebSite/project.json @@ -17,8 +17,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } }, "exclude": [ diff --git a/test/WebSites/ControllersFromServicesClassLibrary/project.json b/test/WebSites/ControllersFromServicesClassLibrary/project.json index 04d335f7d2..1ecb768c2a 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/project.json +++ b/test/WebSites/ControllersFromServicesClassLibrary/project.json @@ -5,8 +5,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index cde5732bd0..1df0bdd369 100644 --- a/test/WebSites/ControllersFromServicesWebSite/project.json +++ b/test/WebSites/ControllersFromServicesWebSite/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json index 3fb00ca3a2..33010b06db 100644 --- a/test/WebSites/CorsWebSite/project.json +++ b/test/WebSites/CorsWebSite/project.json @@ -17,8 +17,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json index 3d30a87a1f..02e08b64de 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/project.json +++ b/test/WebSites/ErrorPageMiddlewareWebSite/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json index 6201961c21..e1a5b99c7e 100644 --- a/test/WebSites/FilesWebSite/project.json +++ b/test/WebSites/FilesWebSite/project.json @@ -17,8 +17,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index 9f0d165b71..c64253675f 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -17,8 +17,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index 7fbb933b35..75a3bb0d00 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/HtmlGenerationWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json index 715d4d66f3..8cbd7b2f69 100644 --- a/test/WebSites/HtmlGenerationWebSite/project.json +++ b/test/WebSites/HtmlGenerationWebSite/project.json @@ -15,8 +15,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json index fa13fdbcbb..0fb292b145 100644 --- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json +++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json @@ -8,9 +8,12 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "net451": { }, - "dnxcore50": { - "imports": "portable-net451+win8" + "net451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } -} +} \ No newline at end of file diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json index 4b41cce457..81c0be9a4d 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs index d11b5362fa..c2b8f8d8e8 100644 --- a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs +++ b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs @@ -9,8 +9,8 @@ namespace RazorWebSite { #if NET451 || DNX451 return "This method is running from NET451"; -#elif DNXCORE50 - return "This method is running from DNXCORE50"; +#elif NETSTANDARDAPP1_5 + return "This method is running from NETSTANDARDAPP1_5"; #endif } @@ -21,10 +21,10 @@ namespace RazorWebSite } #endif -#if DNXCORE50_CUSTOM_DEFINE - public string ExecuteDnxCore50Operation() +#if NETSTANDARDAPP1_5_CUSTOM_DEFINE + public string ExecuteNetStandardApp1_5Operation() { - return "This method is only defined in DNXCORE50"; + return "This method is only defined in NETSTANDARDAPP1_5"; } #endif } diff --git a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml b/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml index b9d426a64c..999f5ce9db 100644 --- a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml +++ b/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml @@ -4,8 +4,8 @@ #if NET451_CUSTOM_DEFINE MyHelper.ExecuteNet451Operation(); #endif -#if DNXCORE50_CUSTOM_DEFINE - MyHelper.ExecuteDnxCore50Operation(); +#if NETSTANDARDAPP1_5_CUSTOM_DEFINE + MyHelper.ExecuteNetStandardApp1_5Operation(); #endif } @value \ No newline at end of file diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json index c875a7fa16..325add3869 100644 --- a/test/WebSites/RazorWebSite/project.json +++ b/test/WebSites/RazorWebSite/project.json @@ -23,13 +23,16 @@ ] } }, - "dnxcore50": { + "netstandardapp1.5": { "compilationOptions": { "define": [ - "DNXCORE50_CUSTOM_DEFINE" + "NETSTANDARDAPP1_5_CUSTOM_DEFINE" ] }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json index cbd7fcdeb7..0fa285efe3 100644 --- a/test/WebSites/RoutingWebSite/project.json +++ b/test/WebSites/RoutingWebSite/project.json @@ -15,8 +15,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/SimpleWebSite/project.json b/test/WebSites/SimpleWebSite/project.json index d6f73d9ab9..d2fd670d49 100644 --- a/test/WebSites/SimpleWebSite/project.json +++ b/test/WebSites/SimpleWebSite/project.json @@ -13,8 +13,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/TagHelpersWebSite/project.json b/test/WebSites/TagHelpersWebSite/project.json index 1c591aff40..36241d5d01 100644 --- a/test/WebSites/TagHelpersWebSite/project.json +++ b/test/WebSites/TagHelpersWebSite/project.json @@ -18,8 +18,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/UserClassLibrary/project.json b/test/WebSites/UserClassLibrary/project.json index 26aa4274aa..e96bb1face 100644 --- a/test/WebSites/UserClassLibrary/project.json +++ b/test/WebSites/UserClassLibrary/project.json @@ -1,10 +1,13 @@ { "frameworks": { - "net451": { }, - "dotnet54": { + "net451": {}, + "netstandard1.3": { "dependencies": { "System.Runtime": "4.1.0-*" - } + }, + "imports": [ + "dotnet54" + ] } } -} +} \ No newline at end of file diff --git a/test/WebSites/VersioningWebSite/project.json b/test/WebSites/VersioningWebSite/project.json index 849e1d7581..888472ae93 100644 --- a/test/WebSites/VersioningWebSite/project.json +++ b/test/WebSites/VersioningWebSite/project.json @@ -15,8 +15,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/WebApiCompatShimWebSite/project.json b/test/WebSites/WebApiCompatShimWebSite/project.json index 2364c92ee5..76b82267eb 100644 --- a/test/WebSites/WebApiCompatShimWebSite/project.json +++ b/test/WebSites/WebApiCompatShimWebSite/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json index 702c934368..c23b8b5589 100644 --- a/test/WebSites/XmlFormattersWebSite/project.json +++ b/test/WebSites/XmlFormattersWebSite/project.json @@ -16,8 +16,11 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "System.Linq.Queryable": "4.0.1-*" }