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

t Convert Test Assets to Microsoft.NETCore.App

Browse source 
fix dotnet-compile-fsc failures

fix test failures
This commit is contained in:
Bryan Thornbury 2016-04-12 17:29:07 -07:00
parent b682ab1d4f
commit 83d78129db
125 changed files with 483 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
View file

@ -26,14 +26,14 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read(
@"{
""runtimeTarget"": {
""name"":"".NETStandardApp,Version=v1.5/osx.10.10-x64""
""name"":"".NETCoreApp,Version=v1.0/osx.10.10-x64""
},
""targets"": {
"".NETStandardApp,Version=v1.5/osx.10.10-x64"": {},
"".NETCoreApp,Version=v1.0/osx.10.10-x64"": {},
}
}");
context.Target.IsPortable.Should().BeFalse();
context.Target.Framework.Should().Be(".NETStandardApp,Version=v1.5");
context.Target.Framework.Should().Be(".NETCoreApp,Version=v1.0");
context.Target.Runtime.Should().Be("osx.10.10-x64");
}
@ -78,7 +78,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read(
@"{
""targets"": {
"".NETStandardApp,Version=v1.5"": {}
"".NETCoreApp,Version=v1.0"": {}
}
}");
context.Target.IsPortable.Should().BeTrue();
@ -90,10 +90,10 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read(
@"{
""runtimeTarget"": {
""name"": "".NETStandardApp,Version=v1.5/osx.10.10-x64""
""name"": "".NETCoreApp,Version=v1.0/osx.10.10-x64""
},
""targets"": {
"".NETStandardApp,Version=v1.5/osx.10.10-x64"": {}
"".NETCoreApp,Version=v1.0/osx.10.10-x64"": {}
}
}");
context.Target.IsPortable.Should().BeFalse();
@ -105,10 +105,10 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read(
@"{
""targets"": {
"".NETStandardApp,Version=v1.5"": {}
"".NETCoreApp,Version=v1.0"": {}
}
}");
context.Target.Framework.Should().Be(".NETStandardApp,Version=v1.5");
context.Target.Framework.Should().Be(".NETCoreApp,Version=v1.0");
}
[Fact]
@ -117,7 +117,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read(
@"{
""targets"": {
"".NETStandardApp,Version=v1.5/osx.10.10-x64"": {},
"".NETCoreApp,Version=v1.0/osx.10.10-x64"": {},
},
""runtimes"": {
""osx.10.10-x64"": [ ],
@ -141,7 +141,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read(
@"{
""targets"": {
"".NETStandardApp,Version=v1.5"": {
"".NETCoreApp,Version=v1.0"": {
""MyApp/1.0.1"": {
""dependencies"": {
""AspNet.Mvc"": ""1.0.0""
@ -192,10 +192,10 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read(
@"{
""runtimeTarget"": {
""name"": "".NETStandardApp,Version=v1.5""
""name"": "".NETCoreApp,Version=v1.0""
},
""targets"": {
"".NETStandardApp,Version=v1.5"": {
"".NETCoreApp,Version=v1.0"": {
""MyApp/1.0.1"": {
""dependencies"": {
""AspNet.Mvc"": ""1.0.0""
@ -257,9 +257,9 @@ namespace Microsoft.Extensions.DependencyModel.Tests
{
var context = Read(
@"{
""runtimeTarget"": "".NETStandardApp,Version=v1.5"",
""runtimeTarget"": "".NETCoreApp,Version=v1.0"",
""targets"": {
"".NETStandardApp,Version=v1.5"": {
"".NETCoreApp,Version=v1.0"": {
""System.Banana/1.0.0"": {
""runtimeTargets"": {
""runtime/win7-x64/lib/_._"": { ""assetType"": ""runtime"", ""rid"": ""win7-x64""},
@ -305,7 +305,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
""optimize"": true
},
""targets"": {
"".NETStandardApp,Version=v1.5/osx.10.10-x64"": {},
"".NETCoreApp,Version=v1.0/osx.10.10-x64"": {},
}
}");
context.CompilationOptions.AllowUnsafe.Should().Be(true);