From a76558f5605bd34be034b83d5b0c9af891e27856 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 15 Mar 2016 12:51:43 -0700 Subject: [PATCH] Fix runtime graph reader --- .../DependencyContextJsonReader.cs | 4 +--- .../DependencyContextJsonReaderTest.cs | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs b/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs index 12019b06f..80ee0d8bd 100644 --- a/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs +++ b/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs @@ -86,9 +86,7 @@ namespace Microsoft.Extensions.DependencyModel yield break; } - var targets = runtimes.Children(); - var runtime = (JProperty)targets.Single(); - foreach (var pair in (JObject)runtime.Value) + foreach (var pair in runtimes) { yield return new RuntimeFallbacks(pair.Key, pair.Value.Values().ToArray()); } diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs b/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs index 719559d7a..e3cae30e5 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs +++ b/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs @@ -89,11 +89,9 @@ namespace Microsoft.Extensions.DependencyModel.Tests var context = Read( @"{ ""runtimes"": { - "".NETStandardApp,Version=v1.5"": { - ""osx.10.10-x64"": [ ], - ""osx.10.11-x64"": [ ""osx"" ], - ""rhel.7-x64"": [ ""linux-x64"", ""unix"" ] - } + ""osx.10.10-x64"": [ ], + ""osx.10.11-x64"": [ ""osx"" ], + ""rhel.7-x64"": [ ""linux-x64"", ""unix"" ] } }"); context.RuntimeGraph.Should().Contain(p => p.Runtime == "osx.10.10-x64").Which