mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1645 from eerhardt/NewCorefx

Browse source 
Move to CoreFX build rc2-23901
This commit is contained in:
Eric Erhardt 2016-03-03 23:21:52 -06:00
commit a709f772f1
105 changed files with 460 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/dotnet-projectmodel-server.Tests/DthTests.cs
View file

@ -66,7 +66,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
.AssertJArrayCount(2)
.Select(f => f["ShortName"].Value<string>());
Assert.Contains("dnxcore50", frameworkShortNames);
Assert.Contains("netstandardapp1.5", frameworkShortNames);
Assert.Contains("dnx451", frameworkShortNames);
}
}

11
test/dotnet-projectmodel-server.Tests/project.json
View file

@ -4,11 +4,16 @@
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-dev-79755-47"
"dotnet-test-xunit": "1.0.0-dev-79755-47",
"System.Net.NameResolution": "4.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
"testRunner": "xunit"