diff --git a/samples/MvcSandbox/project.json b/samples/MvcSandbox/project.json index 889d0bc382..9559a07553 100644 --- a/samples/MvcSandbox/project.json +++ b/samples/MvcSandbox/project.json @@ -30,7 +30,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json index a1fea52738..47116d771a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json @@ -13,7 +13,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json index 96f0b3fd0d..4c2c06ad54 100644 --- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json @@ -18,7 +18,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs index f6eedb826e..271246ffa6 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 NETCOREAPP1_0 +#if NETCOREAPP1_1 using System.Reflection; #endif using System.Threading.Tasks; diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs index dcdc2a2e32..866a5b099f 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 [Fact] public void InnerStreamIsOpenOnClose() { @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal nonDisposableStream.Dispose(); } -#if !NETCOREAPP1_0 +#if !NETCOREAPP1_1 [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 fbaf6d0bf1..9e2e43d6d4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json @@ -28,7 +28,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json index a5c4b6a90d..51474dc8f7 100644 --- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json @@ -20,7 +20,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json index 48501d87a7..6f4e58d1ab 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json @@ -24,7 +24,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs index ddf6ee5185..21393f9f66 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs @@ -308,14 +308,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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 // 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 // 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 a5c4b6a90d..51474dc8f7 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json @@ -20,7 +20,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json index 56cb052dd9..52cca3f7d4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json @@ -19,7 +19,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs index 3e2b07daf2..4c398dffe0 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 NETCOREAPP1_0 +#elif NETCOREAPP1_1 var expected = -@"This method is running from NETCOREAPP1_0 -This method is only defined in NETCOREAPP1_0"; +@"This method is running from NETCOREAPP1_1 +This method is only defined in NETCOREAPP1_1"; #endif // Act diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs index dd659f02ba..f8eb768320 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 typeof(FormUrlEncodedMediaTypeFormatter).FullName, #endif }; diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json index 7fbfba5e25..935f6bdbdb 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json @@ -46,7 +46,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json index 979d8071e6..a8933c9a05 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json @@ -19,7 +19,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json index c51bf4af8d..b66ffbaa22 100644 --- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json @@ -18,7 +18,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json index 41c9c72a38..06194fdc79 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json @@ -30,7 +30,7 @@ } }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json index a97d4881ea..4cae2cf422 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json @@ -40,7 +40,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json index 95eb0206ff..c19f8eb6f0 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json @@ -22,7 +22,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json index 6582ea195d..d1122778f3 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json @@ -14,7 +14,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json index 8a42860067..ef991b1d81 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json @@ -27,7 +27,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs index bfd63a4e89..6ca612bd1a 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 // 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 { 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 { new List() { matchMapping05, matchMapping10 }, matchMapping10 }, { new List() { matchMapping10, matchMapping05 }, matchMapping10 }, @@ -251,7 +251,7 @@ namespace System.Net.Http.Formatting Assert.Null(result); } -#if !NETCOREAPP1_0 +#if !NETCOREAPP1_1 [Fact] public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader() @@ -359,7 +359,7 @@ namespace System.Net.Http.Formatting Assert.IsType(result.Formatter); } -#if !NETCOREAPP1_0 +#if !NETCOREAPP1_1 [Fact] public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders() @@ -458,7 +458,7 @@ namespace System.Net.Http.Formatting } } -#if !NETCOREAPP1_0 +#if !NETCOREAPP1_1 [Fact] public void MatchMediaTypeMapping_ReturnsMatch() @@ -810,7 +810,7 @@ namespace System.Net.Http.Formatting } } -#if !NETCOREAPP1_0 +#if !NETCOREAPP1_1 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 90f1cdfa9f..1859119584 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs @@ -278,7 +278,7 @@ namespace System.Net.Http Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType); } -#if !NETCOREAPP1_0 +#if !NETCOREAPP1_1 // 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 bd81d64592..907a65c746 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 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 98544136ac..7c32a618ee 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 !NETCOREAPP1_0 +#if !NETCOREAPP1_1 using System.Net.Http.Headers; diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json index a41dbb2a1e..7dbe747d9a 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json @@ -15,7 +15,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ "portable-net451+win8" ], diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json index 1aad9d1944..979175c361 100644 --- a/test/WebSites/ApiExplorerWebSite/project.json +++ b/test/WebSites/ApiExplorerWebSite/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json index 37b1ecaaed..4f855c0b84 100644 --- a/test/WebSites/ApplicationModelWebSite/project.json +++ b/test/WebSites/ApplicationModelWebSite/project.json @@ -12,7 +12,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index fa4d80c904..78e8c6ef8a 100644 --- a/test/WebSites/BasicWebSite/project.json +++ b/test/WebSites/BasicWebSite/project.json @@ -18,7 +18,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/ControllersFromServicesClassLibrary/project.json b/test/WebSites/ControllersFromServicesClassLibrary/project.json index aed9401f2c..328ddf79ac 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/project.json +++ b/test/WebSites/ControllersFromServicesClassLibrary/project.json @@ -7,6 +7,6 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": {} + "netcoreapp1.1": {} } } \ No newline at end of file diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index 1e7b94d98f..3f2d905652 100644 --- a/test/WebSites/ControllersFromServicesWebSite/project.json +++ b/test/WebSites/ControllersFromServicesWebSite/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json index 4130b019d2..0802a4cf58 100644 --- a/test/WebSites/CorsWebSite/project.json +++ b/test/WebSites/CorsWebSite/project.json @@ -19,7 +19,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json index 9b49a7c5a4..baf32b67eb 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/project.json +++ b/test/WebSites/ErrorPageMiddlewareWebSite/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json index 2b559baf97..f9939b7a36 100644 --- a/test/WebSites/FilesWebSite/project.json +++ b/test/WebSites/FilesWebSite/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index dd3a0b96da..1988fe890e 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -15,7 +15,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index 1aad9d1944..979175c361 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/HtmlGenerationWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json index fff9fbaaca..93da06ee17 100644 --- a/test/WebSites/HtmlGenerationWebSite/project.json +++ b/test/WebSites/HtmlGenerationWebSite/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json index fd653858bb..97ab684f4b 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs index 9f51d632a5..fa07f3b063 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 NETCOREAPP1_0 - return "This method is running from NETCOREAPP1_0"; +#elif NETCOREAPP1_1 + return "This method is running from NETCOREAPP1_1"; #endif } @@ -21,10 +21,10 @@ namespace RazorWebSite } #endif -#if NETCOREAPP1_0_CUSTOM_DEFINE - public string ExecuteNetCoreApp1_0Operation() +#if NETCOREAPP1_1_CUSTOM_DEFINE + public string ExecuteNetCoreAppOperation() { - return "This method is only defined in NETCOREAPP1_0"; + return "This method is only defined in NETCOREAPP1_1"; } #endif } diff --git a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml b/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml index cc02c02597..d2d7967f59 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 NETCOREAPP1_0_CUSTOM_DEFINE - MyHelper.ExecuteNetCoreApp1_0Operation(); +#if NETCOREAPP1_1_CUSTOM_DEFINE + MyHelper.ExecuteNetCoreAppOperation(); #endif } @value \ No newline at end of file diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json index 04e6d11786..97fe2d13f4 100644 --- a/test/WebSites/RazorWebSite/project.json +++ b/test/WebSites/RazorWebSite/project.json @@ -27,10 +27,10 @@ ] } }, - "netcoreapp1.0": { + "netcoreapp1.1": { "buildOptions": { "define": [ - "NETCOREAPP1_0_CUSTOM_DEFINE" + "NETCOREAPP1_1_CUSTOM_DEFINE" ] }, "dependencies": { diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json index 37b1ecaaed..4f855c0b84 100644 --- a/test/WebSites/RoutingWebSite/project.json +++ b/test/WebSites/RoutingWebSite/project.json @@ -12,7 +12,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/SimpleWebSite/project.json b/test/WebSites/SimpleWebSite/project.json index 9ab72abc81..a3ab81c119 100644 --- a/test/WebSites/SimpleWebSite/project.json +++ b/test/WebSites/SimpleWebSite/project.json @@ -10,7 +10,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/TagHelpersWebSite/project.json b/test/WebSites/TagHelpersWebSite/project.json index b2005c4bf3..a7458b3473 100644 --- a/test/WebSites/TagHelpersWebSite/project.json +++ b/test/WebSites/TagHelpersWebSite/project.json @@ -18,7 +18,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/VersioningWebSite/project.json b/test/WebSites/VersioningWebSite/project.json index 37b1ecaaed..4f855c0b84 100644 --- a/test/WebSites/VersioningWebSite/project.json +++ b/test/WebSites/VersioningWebSite/project.json @@ -12,7 +12,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/WebSites/WebApiCompatShimWebSite/project.json b/test/WebSites/WebApiCompatShimWebSite/project.json index 4f5c79deb3..a4ca0d383a 100644 --- a/test/WebSites/WebApiCompatShimWebSite/project.json +++ b/test/WebSites/WebApiCompatShimWebSite/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": "portable-net451+win8", "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json index 1aad9d1944..979175c361 100644 --- a/test/WebSites/XmlFormattersWebSite/project.json +++ b/test/WebSites/XmlFormattersWebSite/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*",