Undo sharedfxtests changes

This commit is contained in:
Justin Kotalik 2019-01-16 16:38:41 -08:00
parent 1962146730
commit 9d63bd7676
1 changed files with 6 additions and 20 deletions

View File

@ -114,33 +114,19 @@ namespace Microsoft.AspNetCore
Assert.NotNull(depsFile["compilationOptions"]); Assert.NotNull(depsFile["compilationOptions"]);
Assert.Empty(depsFile["compilationOptions"]); Assert.Empty(depsFile["compilationOptions"]);
Assert.NotEmpty(depsFile["runtimes"][_expectedRid]); Assert.NotEmpty(depsFile["runtimes"][_expectedRid]);
Assert.All(depsFile["libraries"], item =>
var targetLibraries = depsFile["targets"][target];
Assert.All(targetLibraries, libEntry =>
{ {
var lib = Assert.IsType<JProperty>(libEntry); var prop = Assert.IsType<JProperty>(item);
if (lib.Value["runtime"] == null) var lib = Assert.IsType<JObject>(prop.Value);
{ Assert.Equal("package", lib["type"].Value<string>());
return; Assert.Empty(lib["sha512"].Value<string>());
}
Assert.All(lib.Value["runtime"], item =>
{
var obj = Assert.IsType<JProperty>(item);
var assemblyVersion = obj.Value["assemblyVersion"];
Assert.NotNull(assemblyVersion);
Assert.NotEmpty(assemblyVersion.Value<string>());
var fileVersion = obj.Value["fileVersion"];
Assert.NotNull(fileVersion);
Assert.NotEmpty(fileVersion.Value<string>());
});
}); });
Assert.NotNull(depsFile["libraries"][$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]); Assert.NotNull(depsFile["libraries"][$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]);
Assert.NotNull(depsFile["libraries"][$"runtime.{_expectedRid}.Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]); Assert.NotNull(depsFile["libraries"][$"runtime.{_expectedRid}.Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]);
Assert.Equal(2, depsFile["libraries"].Values().Count()); Assert.Equal(2, depsFile["libraries"].Values().Count());
var targetLibraries = depsFile["targets"][target];
Assert.Equal(2, targetLibraries.Values().Count()); Assert.Equal(2, targetLibraries.Values().Count());
var metapackage = targetLibraries[$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"]; var metapackage = targetLibraries[$"Microsoft.AspNetCore.App/{TestData.GetPackageVersion()}"];
Assert.Null(metapackage["runtime"]); Assert.Null(metapackage["runtime"]);