Skip to content

Update dependencies #73

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
Malcolmnixon merged 4 commits into from
Oct 9, 2024
Merged

Update dependencies #73

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
610e491
Add support for wildcards when finding packages.
Oct 3, 2024
256fca1
Merge branch 'main' of https://github.com/demaconsulting/SpdxTool
Oct 9, 2024
ab25b09
Merge branch 'main' of https://github.com/demaconsulting/SpdxTool
Oct 9, 2024
d7d3d3b
Update dependencies and apply minor code cleanups.
Oct 9, 2024
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
10 changes: 5 additions & 5 deletions src/DemaConsulting.SpdxTool/Commands/AddPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public static void Add(SpdxDocument doc, SpdxPackage package)
{
// Copy the new package
p = package.DeepCopy();
doc.Packages = doc.Packages.Append(p).ToArray();
doc.Packages = [..doc.Packages.Append(p)];
}
}

Expand Down Expand Up @@ -232,24 +232,24 @@ public static SpdxPackage ParsePackage(string command, YamlMappingNode packageMa
// Append the PURL if specified
var purl = GetMapString(packageMap, "purl", variables);
if (!string.IsNullOrEmpty(purl))
package.ExternalReferences = package.ExternalReferences.Append(
package.ExternalReferences = [..package.ExternalReferences.Append(
new SpdxExternalReference
{
Category = SpdxReferenceCategory.PackageManager,
Type = "purl",
Locator = purl
}).ToArray();
})];

// Append the CPE23 if specified
var cpe23 = GetMapString(packageMap, "cpe23", variables);
if (!string.IsNullOrEmpty(cpe23))
package.ExternalReferences = package.ExternalReferences.Append(
package.ExternalReferences = [..package.ExternalReferences.Append(
new SpdxExternalReference
{
Category = SpdxReferenceCategory.Security,
Type = "cpe23Type",
Locator = cpe23
}).ToArray();
})];

// Return the package
return package;
Expand Down
6 changes: 3 additions & 3 deletions src/DemaConsulting.SpdxTool/Commands/CopyPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public static void Copy(SpdxDocument fromDoc, SpdxDocument toDoc, string package
toPackage = fromPackage.DeepCopy();
toPackage.FilesAnalyzed = false;
toPackage.HasFiles = [];
toDoc.Packages = toDoc.Packages.Append(toPackage).ToArray();
toDoc.Packages = [..toDoc.Packages.Append(toPackage)];
}

// Skip if we don't need to copy files
Expand Down Expand Up @@ -255,12 +255,12 @@ public static void Copy(SpdxDocument fromDoc, SpdxDocument toDoc, string package
{
// Append copy to the to-document
toFile = fromFile.DeepCopy();
toDoc.Files = toDoc.Files.Append(toFile).ToArray();
toDoc.Files = [..toDoc.Files.Append(toFile)];
}
}

// Add the new files
toPackage.HasFiles = toPackage.HasFiles.Concat(newFiles).ToArray();
toPackage.HasFiles = [..toPackage.HasFiles.Concat(newFiles)];
}

/// <summary>
Expand Down
12 changes: 4 additions & 8 deletions src/DemaConsulting.SpdxTool/Commands/Diagram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,11 @@ public override void Run(string[] args)
var tools = false;
foreach (var option in args.Skip(2))
{
switch (option)
tools = option switch
{
case "tools":
tools = true;
break;

default:
throw new CommandUsageException($"'diagram' command invalid option {option}");
}
"tools" => true,
_ => throw new CommandUsageException($"'diagram' command invalid option {option}")
};
}

// Generate the diagram
Expand Down
4 changes: 2 additions & 2 deletions test/DemaConsulting.SpdxTool.Tests/DemaConsulting.SpdxTool.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
</ItemGroup>

<ItemGroup>
Expand Down