@@ -14,20 +14,28 @@ public void TestAssets1()
14
14
// Setup
15
15
var assets = new Assets ( new ProgressMonitor ( new LoggerStub ( ) ) ) ;
16
16
var json = assetsJson1 ;
17
+ var dependencies = new Dependencies ( ) ;
17
18
18
19
// Execute
19
- var success = assets . TryParse ( json , out var dependencies ) ;
20
+ var success = assets . TryParse ( json , dependencies ) ;
20
21
21
22
// Verify
22
23
Assert . True ( success ) ;
23
- Assert . Equal ( 4 , dependencies . Count ( ) ) ;
24
+ Assert . Equal ( 5 , dependencies . Required . Count ( ) ) ;
25
+ Assert . Equal ( 4 , dependencies . UsedPackages . Count ( ) ) ;
24
26
25
- var normalizedPaths = dependencies . Select ( FixExpectedPathOnWindows ) ;
26
- // Packages references
27
+ var normalizedPaths = dependencies . Required . Select ( FixExpectedPathOnWindows ) ;
28
+ // Required references
27
29
Assert . Contains ( "castle.core/4.4.1/lib/netstandard1.5/Castle.Core.dll" , normalizedPaths ) ;
30
+ Assert . Contains ( "castle.core/4.4.1/lib/netstandard1.5/Castle.Core2.dll" , normalizedPaths ) ;
28
31
Assert . Contains ( "json.net/1.0.33/lib/netstandard2.0/Json.Net.dll" , normalizedPaths ) ;
29
32
Assert . Contains ( "microsoft.aspnetcore.cryptography.internal/6.0.8/lib/net6.0/Microsoft.AspNetCore.Cryptography.Internal.dll" , normalizedPaths ) ;
30
33
Assert . Contains ( "humanizer.core/2.8.26/lib/netstandard2.0" , normalizedPaths ) ;
34
+ // Used packages
35
+ Assert . Contains ( "castle.core" , dependencies . UsedPackages ) ;
36
+ Assert . Contains ( "json.net" , dependencies . UsedPackages ) ;
37
+ Assert . Contains ( "microsoft.aspnetcore.cryptography.internal" , dependencies . UsedPackages ) ;
38
+ Assert . Contains ( "humanizer.core" , dependencies . UsedPackages ) ;
31
39
}
32
40
33
41
[ Fact ]
@@ -36,15 +44,20 @@ public void TestAssets2()
36
44
// Setup
37
45
var assets = new Assets ( new ProgressMonitor ( new LoggerStub ( ) ) ) ;
38
46
var json = assetsJson2 ;
47
+ var dependencies = new Dependencies ( ) ;
39
48
40
49
// Execute
41
- var success = assets . TryParse ( json , out var dependencies ) ;
50
+ var success = assets . TryParse ( json , dependencies ) ;
42
51
43
52
// Verify
44
53
Assert . True ( success ) ;
45
- Assert . Equal ( 2 , dependencies . Count ( ) ) ;
46
- Assert . Contains ( "microsoft.netframework.referenceassemblies/1.0.3" , dependencies ) ;
47
- Assert . Contains ( "microsoft.netframework.referenceassemblies.net48/1.0.3" , dependencies ) ;
54
+ Assert . Equal ( 2 , dependencies . Required . Count ( ) ) ;
55
+ // Required references
56
+ Assert . Contains ( "microsoft.netframework.referenceassemblies/1.0.3" , dependencies . Required ) ;
57
+ Assert . Contains ( "microsoft.netframework.referenceassemblies.net48/1.0.3" , dependencies . Required ) ;
58
+ // Used packages
59
+ Assert . Contains ( "microsoft.netframework.referenceassemblies" , dependencies . UsedPackages ) ;
60
+ Assert . Contains ( "microsoft.netframework.referenceassemblies.net48" , dependencies . UsedPackages ) ;
48
61
}
49
62
50
63
[ Fact ]
@@ -53,13 +66,14 @@ public void TestAssets3()
53
66
// Setup
54
67
var assets = new Assets ( new ProgressMonitor ( new LoggerStub ( ) ) ) ;
55
68
var json = "garbage data" ;
69
+ var dependencies = new Dependencies ( ) ;
56
70
57
71
// Execute
58
- var success = assets . TryParse ( json , out var dependencies ) ;
72
+ var success = assets . TryParse ( json , dependencies ) ;
59
73
60
74
// Verify
61
75
Assert . False ( success ) ;
62
- Assert . Empty ( dependencies ) ;
76
+ Assert . Empty ( dependencies . Required ) ;
63
77
}
64
78
65
79
private readonly string assetsJson1 = """
@@ -76,6 +90,9 @@ public void TestAssets3()
76
90
"compile": {
77
91
"lib/netstandard1.5/Castle.Core.dll": {
78
92
"related": ".xml"
93
+ },
94
+ "lib/netstandard1.5/Castle.Core2.dll": {
95
+ "related": ".xml"
79
96
}
80
97
},
81
98
"runtime": {
0 commit comments