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

Migrate tests, tools and samples to portable

This commit is contained in:
Pavel Krymets 2016-04-15 16:12:08 -07:00
parent 7a1ac034f9
commit 42c3397b6e
61 changed files with 310 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/ActionConstraintSample.Web/project.json
View File

@ -6,18 +6,20 @@
"dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/CustomRouteSample.Web/project.json
View File

@ -6,18 +6,20 @@
"dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/EmbeddedViewSample.Web/project.json
View File

@ -8,18 +8,20 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/FormatFilterSample.Web/project.json
View File

@ -7,18 +7,20 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/InlineConstraintSample.Web/project.json
View File

@ -6,18 +6,20 @@
"dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/JsonPatchSample.Web/project.json
View File

@ -6,18 +6,20 @@
"dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/LocalizationSample.Web/project.json
View File

@ -6,18 +6,20 @@
"dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/MvcSandbox/project.json
View File

@ -12,8 +12,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.Extensions.Configuration.Json": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"content": [
"Views",
@ -21,13 +20,16 @@
],
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
}

10
samples/MvcSubAreaSample.Web/project.json
View File

@ -9,18 +9,20 @@
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/TagHelperSample.Web/project.json
View File

@ -11,18 +11,20 @@
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

10
samples/UrlHelperSample.Web/project.json
View File

@ -6,18 +6,20 @@
"dependencies": {
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -9,16 +9,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -14,16 +14,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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 NETSTANDARDAPP1_5
#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 !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
[Fact]
public void InnerStreamIsOpenOnClose()
{
@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
nonDisposableStream.Dispose();
}
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
[Fact]
public void InnerStreamIsNotFlushedOnClose()
{

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

@ -24,16 +24,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -12,21 +12,24 @@
},
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.Extensions.Logging.Testing": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.Extensions.Logging.Testing": "1.0.0-*"
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -16,16 +16,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

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

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

@ -16,16 +16,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

2
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
View File

@ -426,7 +426,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
}
}
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
// DataContractSerializer in CoreCLR does not throw if the declared type is different from the type being
// serialized.
[ConditionalFact]

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

@ -15,16 +15,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
View File

@ -5,7 +5,7 @@ using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
using Microsoft.AspNetCore.Testing.xunit;
#endif
using Xunit;
@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public HttpClient Client { get; }
#if NETSTANDARDAPP1_5
#if NETCOREAPP1_0
[Theory]
#else
[ConditionalTheory]

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs
View File

@ -8,7 +8,11 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public class MvcSampleFixture<TStartup> : MvcTestFixture<TStartup>
{
public MvcSampleFixture()
#if NET451
: base(Path.Combine("..", "..", "..", "..", "..", "..", "samples"))
#else
: base(Path.Combine("..", "..", "..", "..", "..", "samples"))
#endif
{
}
}

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs
View File

@ -23,7 +23,11 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
private readonly TestServer _server;
public MvcTestFixture()
#if NET451
: this(Path.Combine("..", "..", "..", "..", "..", "WebSites"))
#else
: this(Path.Combine("..", "..", "..", "..", "WebSites"))
#endif
{
}

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 !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
typeof(FormUrlEncodedMediaTypeFormatter).FullName,
#endif
};

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

@ -53,12 +53,15 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"Microsoft.Dnx.Compilation.CSharp.Common": "1.0.0-*",
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
},
"imports": [

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

@ -15,16 +15,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -14,16 +14,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -21,16 +21,20 @@
"keyFile": "../../tools/Key.snk"
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -31,16 +31,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -18,16 +18,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -11,16 +11,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -22,16 +22,20 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -149,7 +149,7 @@ namespace System.Net.Http.Formatting
{
get
{
#if !NETSTANDARDAPP1_5
#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 !NETSTANDARDAPP1_5
#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 !NETSTANDARDAPP1_5
#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 !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
[Fact]
public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader()
@ -359,7 +359,7 @@ namespace System.Net.Http.Formatting
Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
}
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
[Fact]
public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders()
@ -458,7 +458,7 @@ namespace System.Net.Http.Formatting
}
}
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
[Fact]
public void MatchMediaTypeMapping_ReturnsMatch()
@ -810,7 +810,7 @@ namespace System.Net.Http.Formatting
}
}
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
private class MyMediaTypeMapping : MediaTypeMapping
{

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

@ -281,7 +281,7 @@ namespace System.Net.Http
Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType);
}
#if !NETSTANDARDAPP1_5
#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 !NETSTANDARDAPP1_5
#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 !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
using System.Net.Http.Headers;

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

@ -15,16 +15,20 @@
"test": "xunit.runner.aspnet"
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {

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

@ -13,13 +13,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -12,13 +12,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -14,13 +14,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -4,14 +4,12 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
}
"dependencies": {}
}
}
}

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

@ -13,13 +13,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -14,13 +14,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -13,13 +13,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -14,13 +14,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -14,13 +14,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -13,13 +13,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -12,13 +12,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -13,13 +13,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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 NETSTANDARDAPP1_5
return "This method is running from NETSTANDARDAPP1_5";
#elif NETCOREAPP1_0
return "This method is running from NETCOREAPP1_0";
#endif
}
@ -21,10 +21,10 @@ namespace RazorWebSite
}
#endif
#if NETSTANDARDAPP1_5_CUSTOM_DEFINE
public string ExecuteNetStandardApp1_5Operation()
#if NETCOREAPP1_0_CUSTOM_DEFINE
public string ExecuteNetCoreApp1_0Operation()
{
return "This method is only defined in NETSTANDARDAPP1_5";
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 NETSTANDARDAPP1_5_CUSTOM_DEFINE
MyHelper.ExecuteNetStandardApp1_5Operation();
#if NETCOREAPP1_0_CUSTOM_DEFINE
MyHelper.ExecuteNetCoreApp1_0Operation();
#endif
}
@value

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

@ -20,10 +20,10 @@
]
}
},
"netstandardapp1.5": {
"netcoreapp1.0": {
"compilationOptions": {
"define": [
"NETSTANDARDAPP1_5_CUSTOM_DEFINE"
"NETCOREAPP1_0_CUSTOM_DEFINE"
]
},
"imports": [
@ -31,7 +31,10 @@
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -12,13 +12,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -10,13 +10,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -15,13 +15,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -12,13 +12,16 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},

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

@ -13,15 +13,18 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*",
"System.Diagnostics.Tracing": "4.1.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"System.Diagnostics.TraceSource": "4.0.0-*",
"System.Diagnostics.Tracing": "4.1.0-*"
}
}
},

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

@ -13,14 +13,17 @@
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*",
"System.Linq.Queryable": "4.0.1-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"System.Linq.Queryable": "4.0.1-*"
}
}
},