Skip to content

Commit 20374cd

Browse files
committed
Merge branch 'maintenance/dependency-updates' into develop
Updated NuGet dependencies. All updates were to private dependencies and thus don't affect downstream providers. This included GitVersion, Code Analysis, and the Test SDK. While I was at it, I also fixed a few outstanding code analysis warnings that had crept in.
2 parents 718aea5 + 4f2bf50 commit 20374cd

12 files changed

Lines changed: 24 additions & 17 deletions

File tree

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

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

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
1010
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
1111
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
1212
</ItemGroup>

OnTopic.AspNetCore.Mvc/Models/NavigationViewModel{T}.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class NavigationViewModel<T> where T : class, INavigationTopicViewModel<T
5050
/// </summary>
5151
/// <remarks>
5252
/// <para>
53-
/// In order to determine whether any given <see cref="INavigationTopicViewModel{T}.IsSelected(string)"/>, the views
53+
/// In order to determine whether any given <see cref="INavigationTopicViewModel{T}.IsSelected(String)"/>, the views
5454
/// will need to know where in the hierarchy the user currently is. By storing this on the <see
5555
/// cref="NavigationViewModel{T}"/> used as the root view model for every navigation component, we ensure that the views
5656
/// always have access to this information.

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

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

4040
<ItemGroup>
4141
<FrameworkReference Include="Microsoft.AspNetCore.App" />
42-
<PackageReference Include="GitVersionTask" Version="5.2.4">
42+
<PackageReference Include="GitVersionTask" Version="5.3.2">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>
46-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
46+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
4747
<PrivateAssets>all</PrivateAssets>
4848
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4949
</PackageReference>

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

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

4141
<ItemGroup>
42-
<PackageReference Include="GitVersionTask" Version="5.2.4">
42+
<PackageReference Include="GitVersionTask" Version="5.3.2">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>
46-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
46+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
4747
<PrivateAssets>all</PrivateAssets>
4848
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4949
</PackageReference>

OnTopic.Data.Sql.Database/Utilities/Stored Procedures/ConsolidateVersions.sql

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

1010
CREATE PROCEDURE [Utilities].[ConsolidateVersions]
11-
@StartDate datetime = 20000101,
11+
@StartDate datetime = '2000-01-01',
1212
@EndDate datetime = null
1313
AS
1414

OnTopic.Data.Sql.Database/Utilities/Stored Procedures/GenerateNestedSet.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ BEGIN
9797

9898
-- remove this row from hierarchy
9999
DELETE
100-
FROM hierarchy
100+
FROM Hierarchy
101101
WHERE TopicID = (
102102
SELECT TopicID
103103
FROM Topics

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="GitVersionTask" Version="5.2.4">
39+
<PackageReference Include="GitVersionTask" Version="5.3.2">
4040
<PrivateAssets>all</PrivateAssets>
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4242
</PackageReference>
43-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
43+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
4444
<PrivateAssets>all</PrivateAssets>
4545
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4646
</PackageReference>

OnTopic.TestDoubles/OnTopic.TestDoubles.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2323
</PropertyGroup>
2424

25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
</PackageReference>
30+
</ItemGroup>
31+
2532
<ItemGroup>
2633
<ProjectReference Include="..\OnTopic.Data.Caching\OnTopic.Data.Caching.csproj" />
2734
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />

OnTopic.Tests/OnTopic.Tests.csproj

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

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
30+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3333
</PackageReference>
34-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
3535
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
3636
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
3737
</ItemGroup>

OnTopic.ViewModels/OnTopic.ViewModels.csproj

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

4040
<ItemGroup>
41-
<PackageReference Include="GitVersionTask" Version="5.2.4">
41+
<PackageReference Include="GitVersionTask" Version="5.3.2">
4242
<PrivateAssets>all</PrivateAssets>
4343
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4444
</PackageReference>
45-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
45+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
4646
<PrivateAssets>all</PrivateAssets>
4747
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4848
</PackageReference>

0 commit comments

Comments
 (0)