huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Updating to netcoreapp1.1" 

This reverts commit 398a104810.
This commit is contained in:
Pranav K 2016-10-12 16:09:12 -07:00
parent 398a104810
commit ed1378a365
47 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/MvcSandbox/project.json
View File

@ -30,7 +30,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
View File

@ -13,7 +13,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
View File

@ -18,7 +18,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs
View File

@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
using System.Text.Encodings.Web;
#if NETCOREAPP1_1
#if NETCOREAPP1_0
using System.Reflection;
#endif
using System.Threading.Tasks;

4
test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs
View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{
public class NonDisposableStreamTest
{
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
[Fact]
public void InnerStreamIsOpenOnClose()
{
@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
nonDisposableStream.Dispose();
}
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
[Fact]
public void InnerStreamIsNotFlushedOnClose()
{

2
test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
View File

@ -28,7 +28,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
View File

@ -20,7 +20,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
View File

@ -24,7 +24,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

4
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
View File

@ -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_1
#if !NETCOREAPP1_0
// 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_1
#if !NETCOREAPP1_0
// CoreCLR does not like iso-2022-kr as an encoding.
if (!TestPlatformHelper.IsMono)
{

2
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
View File

@ -20,7 +20,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
View File

@ -19,7 +19,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

6
test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
View File

@ -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_1
#elif NETCOREAPP1_0
var expected =
@"This method is running from NETCOREAPP1_1
This method is only defined in NETCOREAPP1_1";
@"This method is running from NETCOREAPP1_0
This method is only defined in NETCOREAPP1_0";
#endif
// Act

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
View File

@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
typeof(JsonMediaTypeFormatter).FullName,
typeof(XmlMediaTypeFormatter).FullName,
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
typeof(FormUrlEncodedMediaTypeFormatter).FullName,
#endif
};

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
View File

@ -46,7 +46,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
View File

@ -19,7 +19,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
View File

@ -18,7 +18,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
View File

@ -30,7 +30,7 @@
}
},
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
View File

@ -40,7 +40,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
View File

@ -22,7 +22,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.Test/project.json
View File

@ -14,7 +14,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
View File

@ -27,7 +27,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

14
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs
View File

@ -149,7 +149,7 @@ namespace System.Net.Http.Formatting
{
get
{
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
// 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<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10 }, matchAcceptAllRange10 },
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 },
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10 }, matchAccept10 },
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10, matchMapping10 }, matchMapping10 },
#endif
{ new List<MediaTypeFormatterMatch>() { matchAccept05, matchAccept10 }, matchAccept10 },
@ -187,7 +187,7 @@ namespace System.Net.Http.Formatting
{ new List<MediaTypeFormatterMatch>() { matchAcceptAllRange05, matchAcceptAllRange10 }, matchAcceptAllRange10 },
{ new List<MediaTypeFormatterMatch>() { matchAcceptAllRange10, matchAcceptAllRange05 }, matchAcceptAllRange10 },
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchMapping10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping10, matchMapping05 }, matchMapping10 },
@ -251,7 +251,7 @@ namespace System.Net.Http.Formatting
Assert.Null(result);
}
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
[Fact]
public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader()
@ -359,7 +359,7 @@ namespace System.Net.Http.Formatting
Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
}
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
[Fact]
public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders()
@ -458,7 +458,7 @@ namespace System.Net.Http.Formatting
}
}
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
[Fact]
public void MatchMediaTypeMapping_ReturnsMatch()
@ -810,7 +810,7 @@ namespace System.Net.Http.Formatting
}
}
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
private class MyMediaTypeMapping : MediaTypeMapping
{

2
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
View File

@ -278,7 +278,7 @@ namespace System.Net.Http
Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType);
}
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
// API doesn't exist in CoreCLR.
[Fact]
public void CreateErrorResponseRangeNotSatisfiable_SetsCorrectStatusCodeAndContentRangeHeader()

2
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs
View File

@ -34,7 +34,7 @@ namespace System.Net.Http.Formatting.Mocks
return base.SelectResponseCharacterEncoding(request, formatter);
}
#if !NETCOREAPP1_1
#if !NETCOREAPP1_0
public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter)
{

2
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs
View File

@ -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_1
#if !NETCOREAPP1_0
using System.Net.Http.Headers;

2
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
View File

@ -15,7 +15,7 @@
},
"testRunner": "xunit",
"frameworks": {
"netcoreapp1.1": {
"netcoreapp1.0": {
"imports": [
"portable-net451+win8"
],

2
test/WebSites/ApiExplorerWebSite/project.json
View File

@ -13,7 +13,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/ApplicationModelWebSite/project.json
View File

@ -12,7 +12,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/BasicWebSite/project.json
View File

@ -18,7 +18,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/ControllersFromServicesClassLibrary/project.json
View File

@ -7,6 +7,6 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {}
"netcoreapp1.0": {}
}
}

2
test/WebSites/ControllersFromServicesWebSite/project.json
View File

@ -16,7 +16,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/CorsWebSite/project.json
View File

@ -19,7 +19,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/ErrorPageMiddlewareWebSite/project.json
View File

@ -13,7 +13,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/FilesWebSite/project.json
View File

@ -16,7 +16,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/FiltersWebSite/project.json
View File

@ -15,7 +15,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/FormatterWebSite/project.json
View File

@ -13,7 +13,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/HtmlGenerationWebSite/project.json
View File

@ -16,7 +16,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
View File

@ -13,7 +13,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

10
test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
View File

@ -9,8 +9,8 @@ namespace RazorWebSite
{
#if NET451 || DNX451
return "This method is running from NET451";
#elif NETCOREAPP1_1
return "This method is running from NETCOREAPP1_1";
#elif NETCOREAPP1_0
return "This method is running from NETCOREAPP1_0";
#endif
}
@ -21,10 +21,10 @@ namespace RazorWebSite
}
#endif
#if NETCOREAPP1_1_CUSTOM_DEFINE
public string ExecuteNetCoreAppOperation()
#if NETCOREAPP1_0_CUSTOM_DEFINE
public string ExecuteNetCoreApp1_0Operation()
{
return "This method is only defined in NETCOREAPP1_1";
return "This method is only defined in NETCOREAPP1_0";
}
#endif
}

4
test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
View File

@ -4,8 +4,8 @@
#if NET451_CUSTOM_DEFINE
MyHelper.ExecuteNet451Operation();
#endif
#if NETCOREAPP1_1_CUSTOM_DEFINE
MyHelper.ExecuteNetCoreAppOperation();
#if NETCOREAPP1_0_CUSTOM_DEFINE
MyHelper.ExecuteNetCoreApp1_0Operation();
#endif
}
@value

4
test/WebSites/RazorWebSite/project.json
View File

@ -27,10 +27,10 @@
]
}
},
"netcoreapp1.1": {
"netcoreapp1.0": {
"buildOptions": {
"define": [
"NETCOREAPP1_1_CUSTOM_DEFINE"
"NETCOREAPP1_0_CUSTOM_DEFINE"
]
},
"dependencies": {

2
test/WebSites/RoutingWebSite/project.json
View File

@ -12,7 +12,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/SimpleWebSite/project.json
View File

@ -10,7 +10,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/TagHelpersWebSite/project.json
View File

@ -18,7 +18,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/VersioningWebSite/project.json
View File

@ -12,7 +12,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",

2
test/WebSites/WebApiCompatShimWebSite/project.json
View File

@ -13,7 +13,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"imports": "portable-net451+win8",
"dependencies": {
"Microsoft.NETCore.App": {

2
test/WebSites/XmlFormattersWebSite/project.json
View File

@ -13,7 +13,7 @@
},
"frameworks": {
"net451": {},
"netcoreapp1.1": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",