Skip to content

Add null checks back in Verify* types #7717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 4 commits into from
Aug 5, 2021
Merged

Add null checks back in Verify* types #7717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59d147a
Add null checks back in Verify* types
ViktorHofer Aug 5, 2021
0350723
Update VerifyTypes.cs
ViktorHofer Aug 5, 2021
50d923e
Update VerifyClosure.cs
ViktorHofer Aug 5, 2021
a35a713
Update VerifyClosure.cs
ViktorHofer Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Microsoft.DotNet.PackageTesting/VerifyClosure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ private void AddSourceFile(string file)

private void LoadIgnoredReferences()
{
foreach (var ignoredReference in IgnoredReferences.DefaultIfEmpty())
if (IgnoredReferences == null || IgnoredReferences.Length == 0) return;

foreach (var ignoredReference in IgnoredReferences)
{
var name = ignoredReference.ItemSpec;
var versionString = ignoredReference.GetMetadata("Version");
Expand Down Expand Up @@ -174,9 +176,9 @@ void CheckDependencies(Stack<AssemblyInfo> depStack)
AssemblyInfo assm = depStack.Peek();

// check module references
if (assm.State == CheckState.Unchecked && CheckModuleReferences)
if (assm.State == CheckState.Unchecked && CheckModuleReferences && assm.ModuleReferences != null)
{
foreach(var moduleReference in assm.ModuleReferences.DefaultIfEmpty())
foreach(var moduleReference in assm.ModuleReferences)
{
if (ShouldIgnore(moduleReference))
{
Expand Down
5 changes: 3 additions & 2 deletions src/Microsoft.DotNet.PackageTesting/VerifyTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
Expand Down Expand Up @@ -125,7 +124,9 @@ private void AddSourceFile(string file)

private void LoadIgnoredTypes()
{
foreach(var ignoredType in IgnoredTypes.DefaultIfEmpty())
if (IgnoredTypes == null || IgnoredTypes.Length == 0) return;

foreach(var ignoredType in IgnoredTypes)
{
ignoredTypes.Add(ignoredType.ItemSpec);
}
Expand Down