Skip to content

Commit abe5b32

Browse files
MalcolmnixonMalcolmnixon
committed
Additional cleanups
1 parent 12e053e commit abe5b32

12 files changed

+37
-31
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-sonarscanner": {
6-
"version": "10.1.2",
6+
"version": "10.2.0",
77
"commands": [
88
"dotnet-sonarscanner"
99
]
1010
},
1111
"microsoft.sbom.dotnettool": {
12-
"version": "3.1.0",
12+
"version": "4.0.3",
1313
"commands": [
1414
"sbom-tool"
1515
]
1616
},
1717
"demaconsulting.spdxtool": {
18-
"version": "2.2.0",
18+
"version": "2.3.0",
1919
"commands": [
2020
"spdx-tool"
2121
]

‎DemaConsulting.SpdxModel.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_REDUNDANT/@EntryValue">False</s:Boolean>
23
<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=subject_0020matter/@EntryIndexedValue">True</s:Boolean>
34
<s:Boolean x:Key="/Default/UserDictionary/Words/=acmecorp/@EntryIndexedValue">True</s:Boolean>
45
<s:Boolean x:Key="/Default/UserDictionary/Words/=acmeforge/@EntryIndexedValue">True</s:Boolean>

‎src/DemaConsulting.SpdxModel/SpdxAnnotation.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ public static SpdxAnnotation[] Enhance(SpdxAnnotation[] array, SpdxAnnotation[]
120120
foreach (var other in others)
121121
{
122122
// Check if other item is the same as one we have
123-
var annotation = list.Find(a => Same.Equals(a, other));
124-
if (annotation != null)
123+
var existing = list.Find(a => Same.Equals(a, other));
124+
if (existing != null)
125125
// Enhance our item with the other information
126-
annotation.Enhance(other);
126+
existing.Enhance(other);
127127
else
128128
// Add the new item to our list
129129
list.Add(other.DeepCopy());

‎src/DemaConsulting.SpdxModel/SpdxChecksum.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ public static SpdxChecksum[] Enhance(SpdxChecksum[] array, SpdxChecksum[] others
9999
foreach (var other in others)
100100
{
101101
// Check if other item is the same as one we have
102-
var annotation = list.Find(a => Same.Equals(a, other));
103-
if (annotation != null)
102+
var existing = list.Find(a => Same.Equals(a, other));
103+
if (existing != null)
104104
// Enhance our item with the other information
105-
annotation.Enhance(other);
105+
existing.Enhance(other);
106106
else
107107
// Add the new item to our list
108108
list.Add(other.DeepCopy());

‎src/DemaConsulting.SpdxModel/SpdxExternalDocumentReference.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ public static SpdxExternalDocumentReference[] Enhance(SpdxExternalDocumentRefere
103103
foreach (var other in others)
104104
{
105105
// Check if other item is the same as one we have
106-
var annotation = list.Find(a => Same.Equals(a, other));
107-
if (annotation != null)
106+
var existing = list.Find(a => Same.Equals(a, other));
107+
if (existing != null)
108108
// Enhance our item with the other information
109-
annotation.Enhance(other);
109+
existing.Enhance(other);
110110
else
111111
// Add the new item to our list
112112
list.Add(other.DeepCopy());

‎src/DemaConsulting.SpdxModel/SpdxExternalReference.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ public static SpdxExternalReference[] Enhance(SpdxExternalReference[] array, Spd
122122
foreach (var other in others)
123123
{
124124
// Check if other item is the same as one we have
125-
var annotation = list.Find(a => Same.Equals(a, other));
126-
if (annotation != null)
125+
var existing = list.Find(a => Same.Equals(a, other));
126+
if (existing != null)
127127
// Enhance our item with the other information
128-
annotation.Enhance(other);
128+
existing.Enhance(other);
129129
else
130130
// Add the new item to our list
131131
list.Add(other.DeepCopy());

‎src/DemaConsulting.SpdxModel/SpdxExtractedLicensingInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ public static SpdxExtractedLicensingInfo[] Enhance(SpdxExtractedLicensingInfo[]
126126
foreach (var other in others)
127127
{
128128
// Check if other item is the same as one we have
129-
var annotation = list.Find(a => Same.Equals(a, other));
130-
if (annotation != null)
129+
var existing = list.Find(a => Same.Equals(a, other));
130+
if (existing != null)
131131
// Enhance our item with the other information
132-
annotation.Enhance(other);
132+
existing.Enhance(other);
133133
else
134134
// Add the new item to our list
135135
list.Add(other.DeepCopy());

‎src/DemaConsulting.SpdxModel/SpdxFile.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ public static SpdxFile[] Enhance(SpdxFile[] array, SpdxFile[] others)
166166
foreach (var other in others)
167167
{
168168
// Check if other item is the same as one we have
169-
var annotation = list.Find(a => Same.Equals(a, other));
170-
if (annotation != null)
169+
var existing = list.Find(a => Same.Equals(a, other));
170+
if (existing != null)
171171
// Enhance our item with the other information
172-
annotation.Enhance(other);
172+
existing.Enhance(other);
173173
else
174174
// Add the new item to our list
175175
list.Add(other.DeepCopy());

‎src/DemaConsulting.SpdxModel/SpdxPackage.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,10 @@ public static SpdxPackage[] Enhance(SpdxPackage[] array, SpdxPackage[] others)
360360
foreach (var other in others)
361361
{
362362
// Check if other item is the same as one we have
363-
var annotation = list.Find(a => Same.Equals(a, other));
364-
if (annotation != null)
363+
var existing = list.Find(a => Same.Equals(a, other));
364+
if (existing != null)
365365
// Enhance our item with the other information
366-
annotation.Enhance(other);
366+
existing.Enhance(other);
367367
else
368368
// Add the new item to our list
369369
list.Add(other.DeepCopy());

‎src/DemaConsulting.SpdxModel/SpdxRelationship.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ public static SpdxRelationship[] Enhance(SpdxRelationship[] array, SpdxRelations
119119
foreach (var other in others)
120120
{
121121
// Check if other item is the same as one we have
122-
var annotation = list.Find(a => Same.Equals(a, other));
123-
if (annotation != null)
122+
var existing = list.Find(a => Same.Equals(a, other));
123+
if (existing != null)
124124
// Enhance our item with the other information
125-
annotation.Enhance(other);
125+
existing.Enhance(other);
126126
else
127127
// Add the new item to our list
128128
list.Add(other.DeepCopy());

0 commit comments

Comments
 (0)