Skip to content

Commit df88321

Browse files
ATrefzerATrefzer
committed
Updated nuget packages
1 parent 5275fea commit df88321

33 files changed

+291
-282
lines changed

‎ApprovalTestTool/ApprovalTestTool.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="LibGit2Sharp" Version="0.31.0"/>
11+
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎CSharpCodeAnalyst/CSharpCodeAnalyst.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@
144144
<PackageReference Include="gong-wpf-dragdrop" Version="4.0.0"/>
145145
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25451.107"/>
146146
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-rc.1.25451.107"/>
147-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
148-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122"/>
147+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.10" />
148+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
149149
</ItemGroup>
150150

151151
<ItemGroup>

‎CodeParser/CodeParser.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Build.Locator" Version="1.9.1"/>
10+
<PackageReference Include="Microsoft.Build.Locator" Version="1.10.2" />
1111
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎Tests/ApprovalTests/BasicLanguageFeaturesApprovalTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class BasicLanguageFeaturesApprovalTests : ApprovalTestBase
99
[Test]
1010
public void Core_BasicLanguageFeatures_Classes_ShouldBeDetected()
1111
{
12-
var classes = GetAllClasses(GetTestAssemblyGraph()).ToList();
12+
var actual = GetAllClasses(GetTestAssemblyGraph()).ToList();
1313

1414
var expected = new[]
1515
{
@@ -22,7 +22,7 @@ public void Core_BasicLanguageFeatures_Classes_ShouldBeDetected()
2222
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.TypeOf"
2323
};
2424

25-
CollectionAssert.AreEquivalent(expected, classes);
25+
Assert.That(actual, Is.EquivalentTo(expected));
2626
}
2727

2828
private CodeGraph.Graph.CodeGraph GetTestAssemblyGraph()
@@ -34,15 +34,15 @@ private CodeGraph.Graph.CodeGraph GetTestAssemblyGraph()
3434
[Test]
3535
public void Core_BasicLanguageFeatures_Structs_ShouldBeDetected()
3636
{
37-
var structs = GetAllStructs(GetTestAssemblyGraph()).ToList();
37+
var actual = GetAllStructs(GetTestAssemblyGraph()).ToList();
3838

3939
var expected = new[]
4040
{
4141
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.Point",
4242
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.Rectangle"
4343
};
4444

45-
CollectionAssert.AreEquivalent(expected, structs.OrderBy(x => x).ToArray());
45+
Assert.That(actual, Is.EquivalentTo(expected));
4646
}
4747

4848
[Test]
@@ -62,13 +62,13 @@ public void Core_BasicLanguageFeatures_Creates_ShouldBeDetected()
6262
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.BaseClass.HasLocalFunction -> Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.CreatableClass"
6363
};
6464

65-
CollectionAssert.AreEquivalent(expected, methodCalls.ToArray());
65+
Assert.That(methodCalls.ToArray(), Is.EquivalentTo(expected));
6666
}
6767

6868
[Test]
6969
public void Core_BasicLanguageFeatures_Uses_ShouldBeDetected()
7070
{
71-
var uses = GetRelationshipsOfType(GetTestAssemblyGraph(), RelationshipType.Uses)
71+
var actual = GetRelationshipsOfType(GetTestAssemblyGraph(), RelationshipType.Uses)
7272
.Select(r => r.ToString())
7373
.OrderBy(x => x)
7474
.ToArray();
@@ -98,27 +98,27 @@ public void Core_BasicLanguageFeatures_Uses_ShouldBeDetected()
9898
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.Lambdas.Start -> Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.Lambdas.Method"
9999
};
100100

101-
CollectionAssert.AreEquivalent(expected, uses);
101+
Assert.That(actual, Is.EquivalentTo(expected));
102102
}
103103

104104
[Test]
105105
public void Core_BasicLanguageFeatures_Enums_ShouldBeDetected()
106106
{
107-
var enums = GetAllEnums(GetTestAssemblyGraph()).ToList();
107+
var actual = GetAllEnums(GetTestAssemblyGraph()).ToList();
108108

109109
var expected = new[]
110110
{
111111
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.Color",
112112
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.Priority"
113113
};
114114

115-
CollectionAssert.AreEquivalent(expected, enums);
115+
Assert.That(actual, Is.EquivalentTo(expected));
116116
}
117117

118118
[Test]
119119
public void Core_BasicLanguageFeatures_MethodCalls_ShouldBeDetected()
120120
{
121-
var methodCalls = GetRelationshipsOfType(GetTestAssemblyGraph(), RelationshipType.Calls)
121+
var actual = GetRelationshipsOfType(GetTestAssemblyGraph(), RelationshipType.Calls)
122122
.Select(r => r.ToString())
123123
.OrderBy(x => x)
124124
.ToList();
@@ -135,20 +135,20 @@ public void Core_BasicLanguageFeatures_MethodCalls_ShouldBeDetected()
135135
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.DerivedClass.TestBaseAccess -> Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.BaseClass.BaseMethod"
136136
};
137137

138-
CollectionAssert.AreEquivalent(expected, methodCalls.ToArray());
138+
Assert.That(actual, Is.EquivalentTo(expected));
139139
}
140140

141141

142142
[Test]
143143
public void Core_BasicLanguageFeatures_Properties_ShouldBeDetected()
144144
{
145-
var properties = GetAllProperties(GetTestAssemblyGraph());
145+
var actual = GetAllProperties(GetTestAssemblyGraph());
146146

147147
var expected = new[]
148148
{
149149
"Core.BasicLanguageFeatures.global.Core.BasicLanguageFeatures.BasicCalls.PublicProperty"
150150
};
151151

152-
CollectionAssert.AreEquivalent(expected, properties.ToArray());
152+
Assert.That(actual, Is.EquivalentTo(expected));
153153
}
154154
}

‎Tests/ApprovalTests/CodeExplorerApprovalTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public void CodeExplorer_FollowIncomingCalls_1()
1717
e.FullName.Contains("Regression_FollowIncomingCalls1.ViewModelAdapter1.AddToSlave"));
1818
var result = explorer.FollowIncomingCallsHeuristically(origin.Id);
1919

20-
var actualRelationships = result.Relationships.Select(d =>
20+
var actual = result.Relationships.Select(d =>
2121
$"{Graph.Nodes[d.SourceId].FullName} -({d.Type})-> {Graph.Nodes[d.TargetId].FullName}")
2222
.OrderBy(x => x);
2323

24-
var expectedRelationships = new List<string>
24+
var expected = new List<string>
2525
{
2626
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls1.ViewModelAdapter1.AddToSlave -(Overrides)-> Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls1.Base.AddToSlave",
2727
/* ----- */
@@ -33,7 +33,7 @@ public void CodeExplorer_FollowIncomingCalls_1()
3333
/* ----- */ /* ----- */
3434
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls1.Driver..ctor -(Calls)-> Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls1.Base.Build"
3535
};
36-
CollectionAssert.AreEquivalent(expectedRelationships, actualRelationships);
36+
Assert.That(actual, Is.EquivalentTo(expected));
3737

3838

3939
var actualElements = result.Elements.Select(m => m.FullName).ToList();
@@ -45,7 +45,7 @@ public void CodeExplorer_FollowIncomingCalls_1()
4545
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls1.Base.Build",
4646
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls1.Driver..ctor"
4747
};
48-
CollectionAssert.AreEquivalent(expectedElements, actualElements);
48+
Assert.That(actualElements, Is.EquivalentTo(expectedElements));
4949
}
5050

5151
[Test]
@@ -69,7 +69,8 @@ public void CodeExplorer_FollowIncomingCalls_2()
6969
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls2.Base.Build -(Calls)-> Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls2.Base.AddToSlave",
7070
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls2.Driver..ctor -(Calls)-> Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls2.Base.Build"
7171
};
72-
CollectionAssert.AreEquivalent(expectedRelationships, actualRelationships);
72+
73+
Assert.That(actualRelationships, Is.EquivalentTo(expectedRelationships));
7374

7475

7576
var actualElements = result.Elements.Select(m => m.FullName).ToList();
@@ -81,6 +82,6 @@ public void CodeExplorer_FollowIncomingCalls_2()
8182
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls2.Base.Build",
8283
"Old.CSharpLanguage.global.CSharpLanguage.Regression_FollowIncomingCalls2.Driver..ctor"
8384
};
84-
CollectionAssert.AreEquivalent(expectedElements, actualElements);
85+
Assert.That(actualElements, Is.EquivalentTo(expectedElements));
8586
}
8687
}

‎Tests/ApprovalTests/CyclesApprovalTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public void Cycles_ShouldBeDetected()
202202
{
203203
var groups = CycleFinder.FindCycleGroups(GetTestAssemblyGraph());
204204

205-
Assert.AreEqual(8, groups.Count);
205+
Assert.That(groups.Count, Is.EqualTo(8));
206206

207207
// We expect to find all cycles
208208
foreach (var group in groups)
@@ -231,7 +231,7 @@ public void Cycles_ShouldBeDetected()
231231
Trace.WriteLine(formattedRelationships);
232232
}
233233

234-
Assert.IsTrue(found);
234+
Assert.That(found);
235235
}
236236
}
237237
}

‎Tests/ApprovalTests/EventsApprovalTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private CodeGraph.Graph.CodeGraph GetTestGraph()
1313
[Test]
1414
public void Classes_ShouldBeDetected()
1515
{
16-
var classes = GetAllClasses(GetTestGraph()).ToList();
16+
var actual = GetAllClasses(GetTestGraph()).ToList();
1717

1818
var expected = new[]
1919
{
@@ -40,13 +40,13 @@ public void Classes_ShouldBeDetected()
4040
"Core.Events.global.Core.Events.SmsNotificationService"
4141
};
4242

43-
CollectionAssert.AreEquivalent(expected, classes);
43+
Assert.That(actual, Is.EquivalentTo(expected));
4444
}
4545

4646
[Test]
4747
public void EventSubscriptions_ShouldBeDetected()
4848
{
49-
var eventSubscriptions = GetRelationshipsOfType(GetTestGraph(), RelationshipType.Handles);
49+
var actual = GetRelationshipsOfType(GetTestGraph(), RelationshipType.Handles);
5050

5151
var expected = new[]
5252
{
@@ -72,15 +72,15 @@ public void EventSubscriptions_ShouldBeDetected()
7272
"Core.Events.global.Core.Events.NotificationMonitor.HandleNotificationSent -> Core.Events.global.Core.Events.INotificationService.NotificationSent"
7373
};
7474

75-
CollectionAssert.AreEquivalent(expected, eventSubscriptions);
75+
Assert.That(actual, Is.EquivalentTo(expected));
7676
}
7777

7878

7979

8080
[Test]
8181
public void MethodCalls_ShouldBeDetected()
8282
{
83-
var callRelationships = GetRelationshipsOfType(GetTestGraph(), RelationshipType.Calls);
83+
var actual = GetRelationshipsOfType(GetTestGraph(), RelationshipType.Calls);
8484

8585

8686
var expected = new[]
@@ -122,6 +122,6 @@ public void MethodCalls_ShouldBeDetected()
122122
"Core.Events.global.Core.Events.EventSubscriber.HandleDataChanged -> Core.Events.global.Core.Events.DataChangedEventArgs.OldValue"
123123
};
124124

125-
CollectionAssert.AreEquivalent(expected, callRelationships);
125+
Assert.That(actual, Is.EquivalentTo(expected));
126126
}
127127
}

‎Tests/ApprovalTests/GenericsApprovalTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void Classes_ShouldBeDetected()
4141
"Core.Generics.global.Core.Generics.StringValidator"
4242
};
4343

44-
CollectionAssert.AreEquivalent(expected, classes);
44+
Assert.That(classes, Is.EquivalentTo(expected));
4545
}
4646

4747
[Test]
@@ -57,7 +57,7 @@ public void GenericConstraints_ShouldBeDetected()
5757
"Core.Generics.global.Core.Generics.ComparableItem"
5858
};
5959

60-
CollectionAssert.AreEquivalent(expected, classes);
60+
Assert.That(classes, Is.EquivalentTo(expected));
6161
}
6262

6363
[Test]
@@ -96,6 +96,6 @@ public void MethodCalls_ShouldBeDetected()
9696
// "Core.Generics.global.Core.Generics.GenericSorter.Sort -> Core.Generics.global.Core.Generics.IComparable.CompareTo",
9797
};
9898

99-
CollectionAssert.AreEquivalent(expected, callRelationships.ToArray());
99+
Assert.That(callRelationships.ToArray(), Is.EquivalentTo(expected));
100100
}
101101
}

‎Tests/ApprovalTests/MethodGroupApprovalTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Classes_ShouldBeDetected()
2929
"Core.MethodGroups.global.Core.MethodGroups.LinqMethodGroups"
3030
};
3131

32-
CollectionAssert.AreEquivalent(expected, actual);
32+
Assert.That(actual, Is.EquivalentTo(expected));
3333
}
3434

3535
[Test]
@@ -66,7 +66,7 @@ public void Methods_ShouldBeDetected()
6666
"Core.MethodGroups.global.Core.MethodGroups.LinqMethodGroups.TransformString"
6767
};
6868

69-
CollectionAssert.AreEquivalent(expected, actual);
69+
Assert.That(actual, Is.EquivalentTo(expected));
7070
}
7171

7272
[Test]
@@ -87,7 +87,7 @@ public void MethodGroupUsages_ShouldBeDetected()
8787
"Core.MethodGroups.global.Core.MethodGroups.LinqMethodGroups.TestLinqWithMethodGroups -> Core.MethodGroups.global.Core.MethodGroups.LinqMethodGroups.IsPositive"
8888
};
8989

90-
CollectionAssert.AreEquivalent(expected, actual);
90+
Assert.That(actual, Is.EquivalentTo(expected));
9191
}
9292

9393

@@ -103,7 +103,7 @@ public void MethodCalls_ShouldBeDetected()
103103
"Core.MethodGroups.global.Core.MethodGroups.DelegateCommands.SetupCommands -> Core.MethodGroups.global.Core.MethodGroups.DelegateCommands.ExecutePredicate"
104104
};
105105

106-
CollectionAssert.AreEquivalent(expected, callsRelationships);
106+
Assert.That(callsRelationships, Is.EquivalentTo(expected));
107107

108108
// Note: This test verifies that method groups are NOT creating Calls relationships
109109
// They should create Uses relationships with IsMethodGroup attribute instead
@@ -113,8 +113,7 @@ public void MethodCalls_ShouldBeDetected()
113113
call.Contains("IsEven") ||
114114
call.Contains("TransformString")).ToList();
115115

116-
Assert.IsEmpty(methodGroupCalls,
117-
$"Method groups should not create Calls relationships. Found: {string.Join("", methodGroupCalls)}");
116+
Assert.That(methodGroupCalls.Count == 0);
118117
}
119118

120119
[Test]
@@ -133,6 +132,6 @@ public void EventSubscriptions_ShouldBeDetected()
133132

134133
// Note: Event handlers use existing += syntax which already works
135134
// This test verifies the existing functionality still works
136-
CollectionAssert.AreEquivalent(expected, actual);
135+
Assert.That(actual, Is.EquivalentTo(expected));
137136
}
138137
}

0 commit comments

Comments
 (0)