Skip to content

Commit 9d63bd7

Browse files
committed
Undo sharedfxtests changes
1 parent 1962146 commit 9d63bd7

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

src/Framework/test/SharedFxTests.cs

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -114,33 +114,19 @@ public void ItContainsValidDepsJson()
114114
Assert.NotNull(depsFile["compilationOptions"]);
115115
Assert.Empty(depsFile["compilationOptions"]);
116116
Assert.NotEmpty(depsFile["runtimes"][_expectedRid]);
117-
118-
var targetLibraries = depsFile["targets"][target];
119-
Assert.All(targetLibraries, libEntry =>
117+
Assert.All(depsFile["libraries"], item =>
120118
{
121-
var lib = Assert.IsType<JProperty>(libEntry);
122-
if (lib.Value["runtime"] == null)
123-
{
124-
return;
125-
}
126-
127-
Assert.All(lib.Value["runtime"], item =>
128-
{
129-
var obj = Assert.IsType<JProperty>(item);
130-
var assemblyVersion = obj.Value["assemblyVersion"];
131-
Assert.NotNull(assemblyVersion);
132-
Assert.NotEmpty(assemblyVersion.Value<string>());
133-
134-
var fileVersion = obj.Value["fileVersion"];
135-
Assert.NotNull(fileVersion);
136-
Assert.NotEmpty(fileVersion.Value<string>());
137-
});
119+
var prop = Assert.IsType<JProperty>(item);
120+
var lib = Assert.IsType<JObject>(prop.Value);
121+
Assert.Equal("package", lib["type"].Value<string>());
122+
Assert.Empty(lib["sha512"].Value<string>());
138123
});
139124

140125
Assert.NotNull(depsFile["libraries"][$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]);
141126
Assert.NotNull(depsFile["libraries"][$"runtime.{_expectedRid}.Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]);
142127
Assert.Equal(2, depsFile["libraries"].Values().Count());
143128

129+
var targetLibraries = depsFile["targets"][target];
144130
Assert.Equal(2, targetLibraries.Values().Count());
145131
var metapackage = targetLibraries[$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"];
146132
Assert.Null(metapackage["runtime"]);

0 commit comments

Comments
 (0)