Skip to content

Commit de79c61

Browse files
JeremyCaneyJeremyCaney
committed
Merge branch 'Dependency-Updates' into develop
2 parents a16ea48 + 93ef77b commit de79c61

12 files changed

Lines changed: 40 additions & 37 deletions

File tree

‎OnTopic.AspNetCore.Mvc.Tests/OnTopic.AspNetCore.Mvc.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
10-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
11-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
10+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
11+
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎OnTopic.AspNetCore.Mvc/OnTopic.AspNetCore.Mvc.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@
3939

4040
<ItemGroup>
4141
<FrameworkReference Include="Microsoft.AspNetCore.App" />
42-
<PackageReference Include="GitVersionTask" Version="5.0.1">
42+
<PackageReference Include="GitVersionTask" Version="5.2.4">
4343
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4445
</PackageReference>
45-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
46+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
4647
<PrivateAssets>all</PrivateAssets>
4748
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4849
</PackageReference>

‎OnTopic.Data.Caching/OnTopic.Data.Caching.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@
3939
</PropertyGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="GitVersionTask" Version="5.0.1">
42+
<PackageReference Include="GitVersionTask" Version="5.2.4">
4343
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4445
</PackageReference>
45-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
46+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
4647
<PrivateAssets>all</PrivateAssets>
4748
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4849
</PackageReference>

‎OnTopic.Data.Sql/OnTopic.Data.Sql.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="GitVersionTask" Version="5.0.1">
39+
<PackageReference Include="GitVersionTask" Version="5.2.4">
4040
<PrivateAssets>all</PrivateAssets>
41+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4142
</PackageReference>
42-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
43+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
4344
<PrivateAssets>all</PrivateAssets>
4445
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4546
</PackageReference>
46-
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
47+
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.1" />
4748
</ItemGroup>
4849

4950
<ItemGroup>

‎OnTopic.Data.Sql/SqlTopicRepository.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
using System;
77
using System.Collections.Generic;
88
using System.Data;
9-
using System.Data.SqlClient;
109
using System.Diagnostics;
1110
using System.Diagnostics.CodeAnalysis;
1211
using System.Globalization;
1312
using System.Linq;
1413
using System.Net;
1514
using System.Text;
15+
using Microsoft.Data.SqlClient;
1616
using OnTopic.Attributes;
17-
using OnTopic.Repositories;
18-
using OnTopic.Metadata;
1917
using OnTopic.Internal.Diagnostics;
18+
using OnTopic.Metadata;
19+
using OnTopic.Repositories;
2020

2121
namespace OnTopic.Data.Sql {
2222

@@ -1195,7 +1195,7 @@ private static string CreateRelationshipsXml(Topic topic) {
11951195
attributesXml.Append("\">");
11961196

11971197
// Build out string array of related items in this scope
1198-
var targetIds = new string[scope.Count()];
1198+
var targetIds = new string[scope.Count];
11991199
var count = 0;
12001200
foreach (var relTopic in scope) {
12011201
targetIds[count] = relTopic.Id.ToString(CultureInfo.InvariantCulture);

‎OnTopic.Tests/ITopicRepositoryTest.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,14 @@ public void Move_ToNewParent_ConfirmedMove() {
167167
var topic = _topicRepository.Load("Root:Web:Web_0:Web_0_1");
168168

169169
Assert.ReferenceEquals(topic.Parent, source);
170-
Assert.AreEqual<int>(2, destination.Children.Count());
171-
Assert.AreEqual<int>(2, source.Children.Count());
170+
Assert.AreEqual<int>(2, destination.Children.Count);
171+
Assert.AreEqual<int>(2, source.Children.Count);
172172

173173
_topicRepository.Move(topic, destination);
174174

175175
Assert.ReferenceEquals(topic.Parent, destination);
176-
Assert.AreEqual<int>(1, source.Children.Count());
177-
Assert.AreEqual<int>(3, destination.Children.Count());
176+
Assert.AreEqual<int>(1, source.Children.Count);
177+
Assert.AreEqual<int>(3, destination.Children.Count);
178178

179179
}
180180

@@ -193,12 +193,12 @@ public void Move_ToNewSibling_ConirmedMove() {
193193

194194
Assert.ReferenceEquals(topic.Parent, parent);
195195
Assert.AreEqual<string>("Web_0_0", parent.Children.First().Key);
196-
Assert.AreEqual<int>(2, parent.Children.Count());
196+
Assert.AreEqual<int>(2, parent.Children.Count);
197197

198198
_topicRepository.Move(topic, parent, sibling);
199199

200200
Assert.ReferenceEquals(topic.Parent, parent);
201-
Assert.AreEqual<int>(2, parent.Children.Count());
201+
Assert.AreEqual<int>(2, parent.Children.Count);
202202
Assert.AreEqual<string>("Web_0_1", parent.Children.First().Key);
203203
Assert.AreEqual<string>("Web_0_0", parent.Children[1].Key);
204204

@@ -217,11 +217,11 @@ public void Delete_Topic_Removed() {
217217
var topic = _topicRepository.Load("Root:Web:Web_1:Web_1_1");
218218
var child = _topicRepository.Load("Root:Web:Web_1:Web_1_1:Web_1_1_0");
219219

220-
Assert.AreEqual<int>(2, parent.Children.Count());
220+
Assert.AreEqual<int>(2, parent.Children.Count);
221221

222222
_topicRepository.Delete(topic);
223223

224-
Assert.AreEqual<int>(1, parent.Children.Count());
224+
Assert.AreEqual<int>(1, parent.Children.Count);
225225

226226
}
227227

‎OnTopic.Tests/OnTopic.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
30+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3333
</PackageReference>
34-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
35-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
36-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
35+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
36+
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

‎OnTopic.Tests/RelatedTopicCollectionTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void GetAllTopics_ReturnsAllTopics() {
9595

9696
Assert.AreEqual<int>(5, relationships.Count);
9797
Assert.AreEqual<string>("Related3", relationships.GetTopics("Relationship3").First().Key);
98-
Assert.AreEqual<int>(5, relationships.GetAllTopics().Count());
98+
Assert.AreEqual<int>(5, relationships.GetAllTopics().Count);
9999

100100
}
101101

@@ -117,7 +117,7 @@ public void GetAllContentTypes_ReturnsAllContentTypes() {
117117
}
118118

119119
Assert.AreEqual<int>(5, relationships.Count);
120-
Assert.AreEqual<int>(1, relationships.GetAllTopics("ContentType3").Count());
120+
Assert.AreEqual<int>(1, relationships.GetAllTopics("ContentType3").Count);
121121

122122
}
123123

‎OnTopic.Tests/TopicTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public void FindAllByAttribute_ReturnsCorrectTopics() {
204204
grandNieceTopic.Attributes.SetValue("Foo", "Bar");
205205

206206
Assert.ReferenceEquals(parentTopic.FindAllByAttribute("Foo", "Bar").First(), grandNieceTopic);
207-
Assert.AreEqual<int>(2, parentTopic.FindAllByAttribute("Foo", "Bar").Count());
207+
Assert.AreEqual<int>(2, parentTopic.FindAllByAttribute("Foo", "Bar").Count);
208208
Assert.ReferenceEquals(parentTopic.FindAllByAttribute("Foo", "Baz").First(), grandChildTopic);
209209

210210
}

‎OnTopic.ViewModels/OnTopic.ViewModels.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="GitVersionTask" Version="5.0.1">
41+
<PackageReference Include="GitVersionTask" Version="5.2.4">
4242
<PrivateAssets>all</PrivateAssets>
43+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4344
</PackageReference>
44-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
45+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
4546
<PrivateAssets>all</PrivateAssets>
4647
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4748
</PackageReference>

0 commit comments

Comments
 (0)