From 63507c8da9600903d762249de58a28b2b5e0554f Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Thu, 16 Feb 2017 16:45:01 -0800 Subject: [PATCH] Bump test projects up to .NET 4.5.2 - aspnet/Testing#248 - xUnit no longer supports .NET 4.5.1 - update AppVeyor config so this framework version is available - build tests for desktop .NET only on Windows --- appveyor.yml | 3 ++- .../project.json | 2 +- .../project.json | 2 +- .../Infrastructure/ActionContextAccessorTests.cs | 2 +- test/Microsoft.AspNetCore.Mvc.Core.Test/project.json | 2 +- test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../XmlSerializerInputFormatterTest.cs | 2 +- .../project.json | 2 +- .../CompilationOptionsTests.cs | 6 +++--- .../ErrorPageTests.cs | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../Microsoft.AspNetCore.Mvc.Razor.Test/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/Microsoft.AspNetCore.Mvc.Test/project.json | 2 +- .../Microsoft.AspNetCore.Mvc.TestCommon/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/WebSites/ApiExplorerWebSite/project.json | 2 +- test/WebSites/ApplicationModelWebSite/project.json | 2 +- test/WebSites/BasicWebSite/project.json | 2 +- .../ControllersFromServicesClassLibrary/project.json | 2 +- .../ControllersFromServicesWebSite/project.json | 2 +- test/WebSites/CorsWebSite/project.json | 2 +- .../WebSites/ErrorPageMiddlewareWebSite/project.json | 2 +- test/WebSites/FilesWebSite/project.json | 2 +- test/WebSites/FiltersWebSite/project.json | 2 +- test/WebSites/FormatterWebSite/project.json | 2 +- test/WebSites/HtmlGenerationWebSite/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../RazorWebSite/Services/FrameworkSpecificHelper.cs | 12 ++++++------ test/WebSites/RazorWebSite/Startup.cs | 4 ++-- .../ViewsConsumingCompilationOptions/_Partial.cshtml | 6 +++--- test/WebSites/RazorWebSite/project.json | 4 ++-- test/WebSites/RoutingWebSite/project.json | 2 +- test/WebSites/SecurityWebSite/project.json | 2 +- test/WebSites/SimpleWebSite/project.json | 2 +- test/WebSites/TagHelpersWebSite/project.json | 2 +- test/WebSites/UserClassLibrary/project.json | 2 +- test/WebSites/VersioningWebSite/project.json | 2 +- test/WebSites/WebApiCompatShimWebSite/project.json | 2 +- test/WebSites/XmlFormattersWebSite/project.json | 2 +- 49 files changed, 61 insertions(+), 60 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index be95b88d6f..13c0650228 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,4 +10,5 @@ build_script: - build.cmd --quiet verify clone_depth: 1 test: off -deploy: off \ No newline at end of file +deploy: off +os: Visual Studio 2017 RC diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json index 41e253e4ca..03d7ca23e3 100644 --- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json @@ -22,6 +22,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json index 07b57e01e2..6230530f4a 100644 --- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json @@ -21,6 +21,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionContextAccessorTests.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionContextAccessorTests.cs index e463e4d850..c0c2c88e96 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionContextAccessorTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionContextAccessorTests.cs @@ -6,7 +6,7 @@ using Xunit; namespace Microsoft.AspNetCore.Mvc.Infrastructure { -#if NET451 +#if NET452 public class ActionContextAccessorTests { private static void DomainFunc() diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json index 37021ccef8..271af4c4c0 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json @@ -34,6 +34,6 @@ "System.Xml.XmlDocument": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json index 27098327e9..cb0befa695 100644 --- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json @@ -24,6 +24,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json index c5c735a9fa..e2bfd25fc2 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json @@ -27,6 +27,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json index 0a87c8c42d..2824f889a8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json @@ -24,6 +24,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs index f9630eb0a2..b2bd48254e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET451 +#if NET452 using System; using System.Collections.Generic; using System.IO; diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json index effa285982..4fced8ff16 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json @@ -22,6 +22,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs index 4c398dffe0..60a7d4a39a 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs @@ -22,10 +22,10 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests public async Task CompilationOptions_AreUsedByViewsAndPartials() { // Arrange -#if NET451 +#if NET452 var expected = -@"This method is running from NET451 -This method is only defined in NET451"; +@"This method is running from NET452 +This method is only defined in NET452"; #elif NETCOREAPP1_1 var expected = @"This method is running from NETCOREAPP1_1 diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs index 85c1584a5f..0e6ac966c0 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs @@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests // The desktop CLR does not correctly read the stack trace from portable PDBs. However generating full pdbs // is only supported on machines with CLSID_CorSymWriter available. On desktop, we'll skip this test on // machines without this component. -#if NET451 +#if NET452 if (!SymbolsUtility.SupportsFullPdbGeneration()) { return; diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json index 9064f0abe5..adce73e729 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json @@ -96,6 +96,6 @@ }, "imports": "portable-net451+win8" }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json index 7d26e7a45f..bd8931c927 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json @@ -23,6 +23,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json index ba5ea4509e..24c8f73a85 100644 --- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json @@ -24,6 +24,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json index 1317c93189..7ad409b608 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json @@ -33,6 +33,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json index b551abdd90..d463ae82f9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json @@ -38,6 +38,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/project.json b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/project.json index be8e849000..e8d65aaad4 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/project.json @@ -25,6 +25,6 @@ } } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json index 4663080e01..71cb439783 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json @@ -32,6 +32,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json index 24a58912d1..65cceee53f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json @@ -24,6 +24,6 @@ "System.Xml.XmlDocument": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json b/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json index c8f9d4b77b..71c04895c0 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "frameworks": { - "net451": {}, + "net452": {}, "netstandard1.6": { "dependencies": { "System.ComponentModel.Annotations": "4.3.0" diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json index e962a59b7d..3413b670c2 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json @@ -1,7 +1,7 @@ { "shared": "**/*.cs", "frameworks": { - "net451": {}, + "net452": {}, "netstandard1.3": { "dependencies": { "NETStandard.Library": "1.6.1" diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json index 14827e290f..6e1ed22b72 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json @@ -30,6 +30,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json index d78c532e99..14c1770cbb 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json @@ -27,6 +27,6 @@ "System.Diagnostics.TraceSource": "4.3.0" } }, - "net451": {} + "net452": {} } } diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json index 1dec5d2e70..7ee2b52874 100644 --- a/test/WebSites/ApiExplorerWebSite/project.json +++ b/test/WebSites/ApiExplorerWebSite/project.json @@ -14,7 +14,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json index 732e977863..8f6a1d78b5 100644 --- a/test/WebSites/ApplicationModelWebSite/project.json +++ b/test/WebSites/ApplicationModelWebSite/project.json @@ -13,7 +13,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index d555b4776b..2a314b4e8f 100644 --- a/test/WebSites/BasicWebSite/project.json +++ b/test/WebSites/BasicWebSite/project.json @@ -19,7 +19,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/ControllersFromServicesClassLibrary/project.json b/test/WebSites/ControllersFromServicesClassLibrary/project.json index d7ecf53868..a8036be30e 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/project.json +++ b/test/WebSites/ControllersFromServicesClassLibrary/project.json @@ -6,7 +6,7 @@ "Microsoft.AspNetCore.Mvc": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": {} } } \ No newline at end of file diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index ec23bee44f..7b05dc8784 100644 --- a/test/WebSites/ControllersFromServicesWebSite/project.json +++ b/test/WebSites/ControllersFromServicesWebSite/project.json @@ -19,7 +19,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json index ff65587454..cf0abfda3a 100644 --- a/test/WebSites/CorsWebSite/project.json +++ b/test/WebSites/CorsWebSite/project.json @@ -20,7 +20,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json index c7b6b251cf..e877142fda 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/project.json +++ b/test/WebSites/ErrorPageMiddlewareWebSite/project.json @@ -14,7 +14,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json index 6669fbb275..ca58a21137 100644 --- a/test/WebSites/FilesWebSite/project.json +++ b/test/WebSites/FilesWebSite/project.json @@ -17,7 +17,7 @@ "Microsoft.Extensions.FileProviders.Embedded": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index 3d89d977b3..940b8de5cd 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -16,7 +16,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index 1dec5d2e70..7ee2b52874 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -14,7 +14,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/HtmlGenerationWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json index 6f2fe44ec8..f11277445e 100644 --- a/test/WebSites/HtmlGenerationWebSite/project.json +++ b/test/WebSites/HtmlGenerationWebSite/project.json @@ -17,7 +17,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json index a419f9d40e..4165fb9212 100644 --- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json +++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json @@ -8,7 +8,7 @@ "NETStandard.Library": "1.6.1" }, "frameworks": { - "net451": {}, + "net452": {}, "netstandard1.3": {} } } \ No newline at end of file diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json index bc7125978f..e802604d6d 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json @@ -14,7 +14,7 @@ "Microsoft.Extensions.DiagnosticAdapter": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs index e34d84e115..0a1d416356 100644 --- a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs +++ b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs @@ -7,22 +7,22 @@ namespace RazorWebSite { public string ExecuteOperation() { -#if NET451 || DNX451 - return "This method is running from NET451"; +#if NET452 + return "This method is running from NET452"; #elif NETCOREAPP1_1 return "This method is running from NETCOREAPP1_1"; #endif } -#if NET451_CUSTOM_DEFINE - public string ExecuteNet451Operation() +#if NET452_CUSTOM_DEFINE + public string ExecuteNet452Operation() { - return "This method is only defined in NET451"; + return "This method is only defined in NET452"; } #endif #if NETCOREAPP1_1_CUSTOM_DEFINE - public string ExecuteNetCoreApp1_0Operation() + public string ExecuteNetCoreApp1_1Operation() { return "This method is only defined in NETCOREAPP1_1"; } diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs index f9b2f2a7f1..b9552dbb2d 100644 --- a/test/WebSites/RazorWebSite/Startup.cs +++ b/test/WebSites/RazorWebSite/Startup.cs @@ -29,8 +29,8 @@ namespace RazorWebSite $"{nameof(RazorWebSite)}.EmbeddedViews")); options.FileProviders.Add(updateableFileProvider); options.ViewLocationExpanders.Add(new NonMainPageViewLocationExpander()); -#if NET451 - options.ParseOptions = options.ParseOptions.WithPreprocessorSymbols("DNX451", "NET451_CUSTOM_DEFINE"); +#if NET452 + options.ParseOptions = options.ParseOptions.WithPreprocessorSymbols("NET452", "NET452_CUSTOM_DEFINE"); #endif }) .AddViewOptions(options => diff --git a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml b/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml index f276f026ec..d0d0bbd744 100644 --- a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml +++ b/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml @@ -1,11 +1,11 @@ @inject FrameworkSpecificHelper MyHelper @{ string value = -#if NET451_CUSTOM_DEFINE - MyHelper.ExecuteNet451Operation(); +#if NET452_CUSTOM_DEFINE + MyHelper.ExecuteNet452Operation(); #endif #if NETCOREAPP1_1_CUSTOM_DEFINE - MyHelper.ExecuteNetCoreApp1_0Operation(); + MyHelper.ExecuteNetCoreApp1_1Operation(); #endif } @value \ No newline at end of file diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json index 07b9acf221..3bdcb9bf33 100644 --- a/test/WebSites/RazorWebSite/project.json +++ b/test/WebSites/RazorWebSite/project.json @@ -24,10 +24,10 @@ "Microsoft.Extensions.FileProviders.Embedded": "1.2.0-*" }, "frameworks": { - "net451": { + "net452": { "buildOptions": { "define": [ - "NET451_CUSTOM_DEFINE" + "NET452_CUSTOM_DEFINE" ] } }, diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json index 732e977863..8f6a1d78b5 100644 --- a/test/WebSites/RoutingWebSite/project.json +++ b/test/WebSites/RoutingWebSite/project.json @@ -13,7 +13,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/SecurityWebSite/project.json b/test/WebSites/SecurityWebSite/project.json index 866ef2bfc1..adb5a9c2af 100644 --- a/test/WebSites/SecurityWebSite/project.json +++ b/test/WebSites/SecurityWebSite/project.json @@ -18,7 +18,7 @@ } } }, - "net451": {} + "net452": {} }, "publishOptions": { "include": [ diff --git a/test/WebSites/SimpleWebSite/project.json b/test/WebSites/SimpleWebSite/project.json index 172569db18..8f06104172 100644 --- a/test/WebSites/SimpleWebSite/project.json +++ b/test/WebSites/SimpleWebSite/project.json @@ -9,7 +9,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/TagHelpersWebSite/project.json b/test/WebSites/TagHelpersWebSite/project.json index 374076ee68..9aa09f36cc 100644 --- a/test/WebSites/TagHelpersWebSite/project.json +++ b/test/WebSites/TagHelpersWebSite/project.json @@ -19,7 +19,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/UserClassLibrary/project.json b/test/WebSites/UserClassLibrary/project.json index 68ead1774e..88493d8bdf 100644 --- a/test/WebSites/UserClassLibrary/project.json +++ b/test/WebSites/UserClassLibrary/project.json @@ -1,6 +1,6 @@ { "frameworks": { - "net451": {}, + "net452": {}, "netstandard1.3": { "dependencies": { "NETStandard.Library": "1.6.1" diff --git a/test/WebSites/VersioningWebSite/project.json b/test/WebSites/VersioningWebSite/project.json index 732e977863..8f6a1d78b5 100644 --- a/test/WebSites/VersioningWebSite/project.json +++ b/test/WebSites/VersioningWebSite/project.json @@ -13,7 +13,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/WebApiCompatShimWebSite/project.json b/test/WebSites/WebApiCompatShimWebSite/project.json index 7ae7db698c..cf325f2c10 100644 --- a/test/WebSites/WebApiCompatShimWebSite/project.json +++ b/test/WebSites/WebApiCompatShimWebSite/project.json @@ -14,7 +14,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "imports": "portable-net451+win8", "dependencies": { diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json index 1dec5d2e70..7ee2b52874 100644 --- a/test/WebSites/XmlFormattersWebSite/project.json +++ b/test/WebSites/XmlFormattersWebSite/project.json @@ -14,7 +14,7 @@ "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, "frameworks": { - "net451": {}, + "net452": {}, "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": {