Update dependencies and apply minor cleanups. (#46)

Malcolmnixon · Malcolm Nixon · web-flow · commit 6f87bb090cf1 · 2024-10-08T22:04:36.000-04:00
Co-authored-by: Malcolm Nixon &lt;malcolm.nixon@elbitsystems-us.com&gt;
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "demaconsulting.spdxtool": {
-      "version": "2.0.0",
+      "version": "2.1.0",
       "commands": [
         "spdx-tool"
       ]
diff --git a/src/DemaConsulting.SpdxModel/DemaConsulting.SpdxModel.csproj b/src/DemaConsulting.SpdxModel/DemaConsulting.SpdxModel.csproj
@@ -8,16 +8,16 @@
     <PackageProjectUrl>https://github.com/demaconsulting/SpdxModel</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-	<PackageTags>spdx;sbom</PackageTags>
-	<Description>SPDX Model Library</Description>
-	<Copyright>Copyright DEMA Consulting</Copyright>
-	<Title>SPDX Model Library</Title>
+    <PackageTags>spdx;sbom</PackageTags>
+    <Description>SPDX Model Library</Description>
+    <Copyright>Copyright DEMA Consulting</Copyright>
+    <Title>SPDX Model Library</Title>
     <Authors>DEMA Consulting</Authors>
-	<Company>DEMA Consulting</Company>
-	<Version>0.0.0</Version>
-	<PackageId>DemaConsulting.SpdxModel</PackageId>
-	<Product>DemaConsulting.SpdxModel</Product>
-	<PackageIcon>Icon.png</PackageIcon>
+    <Company>DEMA Consulting</Company>
+    <Version>0.0.0</Version>
+    <PackageId>DemaConsulting.SpdxModel</PackageId>
+    <Product>DemaConsulting.SpdxModel</Product>
+    <PackageIcon>Icon.png</PackageIcon>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/src/DemaConsulting.SpdxModel/SpdxExternalReference.cs b/src/DemaConsulting.SpdxModel/SpdxExternalReference.cs
@@ -134,7 +134,7 @@ public static SpdxExternalReference[] Enhance(SpdxExternalReference[] array, Spd
         }
 
         // Return as array
-        return list.ToArray();
+        return [..list];
     }
 
     /// <summary>
diff --git a/src/DemaConsulting.SpdxModel/Transform/SpdxRelationships.cs b/src/DemaConsulting.SpdxModel/Transform/SpdxRelationships.cs
@@ -57,7 +57,7 @@ public static void Add(SpdxDocument document, SpdxRelationship relationship)
         {
             // Copy the new relationship
             existing = relationship.DeepCopy();
-            document.Relationships = document.Relationships.Append(existing).ToArray();
+            document.Relationships = [..document.Relationships.Append(existing)];
         }
     }
 }
diff --git a/test/DemaConsulting.SpdxModel.Tests/DemaConsulting.SpdxModel.Tests.csproj b/test/DemaConsulting.SpdxModel.Tests/DemaConsulting.SpdxModel.Tests.csproj
@@ -27,8 +27,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>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`]`
`16`	`16`	`},`
`17`	`17`	`"demaconsulting.spdxtool": {`
`18`		`- "version": "2.0.0",`
	`18`	`+ "version": "2.1.0",`
`19`	`19`	`"commands": [`
`20`	`20`	`"spdx-tool"`
`21`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public static SpdxExternalReference[] Enhance(SpdxExternalReference[] array, Spd`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Return as array`
`137`		`- return list.ToArray();`
	`137`	`+ return [..list];`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static void Add(SpdxDocument document, SpdxRelationship relationship)`
`57`	`57`	`{`
`58`	`58`	`// Copy the new relationship`
`59`	`59`	`existing = relationship.DeepCopy();`
`60`		`- document.Relationships = document.Relationships.Append(existing).ToArray();`
	`60`	`+ document.Relationships = [..document.Relationships.Append(existing)];`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`