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

Fix runtime graph reader

Browse source
This commit is contained in:
Pavel Krymets 2016-03-15 12:51:43 -07:00
parent 2ce679c57d
commit a76558f560
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
View file

@ -86,9 +86,7 @@ namespace Microsoft.Extensions.DependencyModel
yield break; yield break;
} }
var targets = runtimes.Children(); foreach (var pair in runtimes)
var runtime = (JProperty)targets.Single();
foreach (var pair in (JObject)runtime.Value)
{ {
yield return new RuntimeFallbacks(pair.Key, pair.Value.Values<string>().ToArray()); yield return new RuntimeFallbacks(pair.Key, pair.Value.Values<string>().ToArray());
} }

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

@ -89,11 +89,9 @@ namespace Microsoft.Extensions.DependencyModel.Tests
var context = Read( var context = Read(
@"{ @"{
""runtimes"": { ""runtimes"": {
"".NETStandardApp,Version=v1.5"": { ""osx.10.10-x64"": [ ],
""osx.10.10-x64"": [ ], ""osx.10.11-x64"": [ ""osx"" ],
""osx.10.11-x64"": [ ""osx"" ], ""rhel.7-x64"": [ ""linux-x64"", ""unix"" ]
""rhel.7-x64"": [ ""linux-x64"", ""unix"" ]
}
} }
}"); }");
context.RuntimeGraph.Should().Contain(p => p.Runtime == "osx.10.10-x64").Which context.RuntimeGraph.Should().Contain(p => p.Runtime == "osx.10.10-x64").Which