Skip to content

Commit

Permalink
update the dgml
Browse files Browse the repository at this point in the history
  • Loading branch information
@nkolev92
nkolev92 committed Sep 12, 2023
1 parent 9d160a5 commit 960e83a
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/Common/IPackageDependencyNodeDecorator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ public interface IPackageDependencyNodeDecorator
{
Task DecorateAsync(PackageDependencyNode dependencyNode, CancellationToken cancellationToken);
}
}
}
8 changes: 6 additions & 2 deletions src/DependencyVisualizerTool/DGMLDependencyVisualizerTool.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,13 @@ private static string GetCategory(DependencyType type, bool isVulnerable, bool i
type.ToString();
}

public bool Equals(DGMLNode other)
public bool Equals(DGMLNode? other)
{
return Id.Equals(other.Id, StringComparison.OrdinalIgnoreCase);
if (other != null)
{
return Id.Equals(other.Id, StringComparison.OrdinalIgnoreCase);
}
return false;
}
}

Expand Down
5 changes: 4 additions & 1 deletion ...ncyVisualizerTool/DependencyVisualizerTool.Test/compiler/resources/diamonddependency.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...rTool/DependencyVisualizerTool.Test/compiler/resources/diamonddependencywithtoplevel.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...isualizerTool/DependencyVisualizerTool.Test/compiler/resources/missingpackageversion.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...encyVisualizerTool/DependencyVisualizerTool.Test/compiler/resources/multipleversions.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...endencyVisualizerTool/DependencyVisualizerTool.Test/compiler/resources/multitargeted.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...pendencyVisualizerTool/DependencyVisualizerTool.Test/compiler/resources/nuget.common.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...sualizerTool/DependencyVisualizerTool.Test/compiler/resources/singlepackagereference.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...sualizerTool/DependencyVisualizerTool.Test/compiler/resources/singleprojectreference.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...izerTool/DependencyVisualizerTool.Test/compiler/resources/transitivepackagereference.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
5 changes: 4 additions & 1 deletion ...izerTool/DependencyVisualizerTool.Test/compiler/resources/transitiveprojectreference.dgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<Categories>
<Category Id="Project" Background="Lightblue" StrokeThickness="2" />
<Category Id="Package" Background="None" StrokeThickness="1" />
<CategoryId="VulnerablePackage"Background="Red"StrokeThickness="1"/>
<Category Id="VulnerablePackage" Background="None" StrokeThickness="4" Stroke="Red" />
<Category Id="DeprecatedPackage" Background="Yellow" StrokeThickness="1" />
<Category Id="VulnerableAndDeprecatedPackage" Background="Yellow" StrokeThickness="4" Stroke="Red" />
</Categories>

</DirectedGraph>
2 changes: 1 addition & 1 deletion src/DependencyVisualizerTool/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private static void CreateOutputIfNotExists(string outputFolder)
}
}

protected static void myHandler(object sender, ConsoleCancelEventArgs args)
protected static void myHandler(object? sender, ConsoleCancelEventArgs args)
{
args.Cancel = true;
CancellationTokenSource.Cancel();
Expand Down

0 comments on commit 960e83a

Please sign in to comment.