From 9d63bd7676ab984f658e2e6e98e68907d05bf120 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 16 Jan 2019 16:38:41 -0800 Subject: [PATCH] Undo sharedfxtests changes --- src/Framework/test/SharedFxTests.cs | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs index 2f0b32ba47..e8217d4546 100644 --- a/src/Framework/test/SharedFxTests.cs +++ b/src/Framework/test/SharedFxTests.cs @@ -114,33 +114,19 @@ namespace Microsoft.AspNetCore Assert.NotNull(depsFile["compilationOptions"]); Assert.Empty(depsFile["compilationOptions"]); Assert.NotEmpty(depsFile["runtimes"][_expectedRid]); - - var targetLibraries = depsFile["targets"][target]; - Assert.All(targetLibraries, libEntry => + Assert.All(depsFile["libraries"], item => { - var lib = Assert.IsType(libEntry); - if (lib.Value["runtime"] == null) - { - return; - } - - Assert.All(lib.Value["runtime"], item => - { - var obj = Assert.IsType(item); - var assemblyVersion = obj.Value["assemblyVersion"]; - Assert.NotNull(assemblyVersion); - Assert.NotEmpty(assemblyVersion.Value()); - - var fileVersion = obj.Value["fileVersion"]; - Assert.NotNull(fileVersion); - Assert.NotEmpty(fileVersion.Value()); - }); + var prop = Assert.IsType(item); + var lib = Assert.IsType(prop.Value); + Assert.Equal("package", lib["type"].Value()); + Assert.Empty(lib["sha512"].Value()); }); Assert.NotNull(depsFile["libraries"][$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]); Assert.NotNull(depsFile["libraries"][$"runtime.{_expectedRid}.Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]); Assert.Equal(2, depsFile["libraries"].Values().Count()); + var targetLibraries = depsFile["targets"][target]; Assert.Equal(2, targetLibraries.Values().Count()); var metapackage = targetLibraries[$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]; Assert.Null(metapackage["runtime"]);