Skip to content

Commit b00cfad

Browse files
JeremyCaneyJeremyCaney
committed
Merge branch 'maintenance/Code-Analysis' into Develop
Applied fixes related to code analysis warnings in code. Reordered `using` statements. Suppressed a couple of warnings which were false positives.
2 parents 0072d0a + 3ef2654 commit b00cfad

39 files changed

+79
-76
lines changed

‎OnTopic.AspNetCore.Mvc.Host/Components/MenuViewComponent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6+
using Microsoft.AspNetCore.Mvc;
67
using OnTopic.AspNetCore.Mvc.Components;
78
using OnTopic.AspNetCore.Mvc.Models;
89
using OnTopic.Mapping.Hierarchical;
910
using OnTopic.Repositories;
1011
using OnTopic.ViewModels;
11-
using Microsoft.AspNetCore.Mvc;
1212

1313
namespace OnTopic.AspNetCore.Mvc.Host.Components {
1414

‎OnTopic.AspNetCore.Mvc.Host/Components/PageLevelNavigationViewComponent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6+
using Microsoft.AspNetCore.Mvc;
67
using OnTopic.AspNetCore.Mvc.Components;
78
using OnTopic.AspNetCore.Mvc.Models;
89
using OnTopic.Mapping.Hierarchical;
910
using OnTopic.Repositories;
1011
using OnTopic.ViewModels;
11-
using Microsoft.AspNetCore.Mvc;
1212

1313
namespace OnTopic.AspNetCore.Mvc.Host.Components {
1414

‎OnTopic.AspNetCore.Mvc.Host/SampleActivator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
| Project Sample OnTopic Site
55
\=============================================================================================================================*/
66
using System;
7+
using Microsoft.AspNetCore.Mvc;
8+
using Microsoft.AspNetCore.Mvc.Controllers;
9+
using Microsoft.AspNetCore.Mvc.ViewComponents;
710
using OnTopic.AspNetCore.Mvc.Controllers;
811
using OnTopic.AspNetCore.Mvc.Host.Components;
912
using OnTopic.Data.Caching;
@@ -13,9 +16,6 @@
1316
using OnTopic.Reflection;
1417
using OnTopic.Repositories;
1518
using OnTopic.ViewModels;
16-
using Microsoft.AspNetCore.Mvc;
17-
using Microsoft.AspNetCore.Mvc.Controllers;
18-
using Microsoft.AspNetCore.Mvc.ViewComponents;
1919

2020
namespace OnTopic.AspNetCore.Mvc.Host {
2121

‎OnTopic.AspNetCore.Mvc.Host/Views/_ViewImports.cshtml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
@using OnTopic.AspNetCore.Mvc.Host
2-
@using OnTopic.AspNetCore.Mvc.Host.Components
3-
@using OnTopic;
4-
@using OnTopic.ViewModels
5-
@using OnTopic.AspNetCore.Mvc.Models
1+
@using System.Web
62
@using Microsoft.AspNetCore.Html
73
@using Microsoft.AspNetCore.Mvc.Razor
8-
@using System.Web
4+
@using OnTopic;
95
@using OnTopic.AspNetCore.Mvc.Components
6+
@using OnTopic.AspNetCore.Mvc.Host
7+
@using OnTopic.AspNetCore.Mvc.Host.Components
8+
@using OnTopic.AspNetCore.Mvc.Models
9+
@using OnTopic.ViewModels
1010

1111
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
1212
@addTagHelper *, OnTopic.AspNetCore.Mvc.Host

‎OnTopic.AspNetCore.Mvc.Tests/TopicControllerTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
\=============================================================================================================================*/
66
using System;
77
using System.Threading.Tasks;
8+
using Microsoft.AspNetCore.Http;
9+
using Microsoft.AspNetCore.Mvc;
10+
using Microsoft.AspNetCore.Mvc.Controllers;
11+
using Microsoft.AspNetCore.Routing;
12+
using Microsoft.VisualStudio.TestTools.UnitTesting;
813
using OnTopic.AspNetCore.Mvc;
914
using OnTopic.AspNetCore.Mvc.Controllers;
1015
using OnTopic.Data.Caching;
1116
using OnTopic.Mapping;
1217
using OnTopic.Repositories;
1318
using OnTopic.TestDoubles;
1419
using OnTopic.ViewModels;
15-
using Microsoft.AspNetCore.Http;
16-
using Microsoft.AspNetCore.Mvc;
17-
using Microsoft.AspNetCore.Mvc.Controllers;
18-
using Microsoft.AspNetCore.Routing;
19-
using Microsoft.VisualStudio.TestTools.UnitTesting;
2020

2121
namespace OnTopic.Tests {
2222

‎OnTopic.AspNetCore.Mvc.Tests/TopicRepositoryExtensionsTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6+
using Microsoft.AspNetCore.Routing;
7+
using Microsoft.VisualStudio.TestTools.UnitTesting;
68
using OnTopic.AspNetCore.Mvc;
79
using OnTopic.Data.Caching;
810
using OnTopic.Repositories;
911
using OnTopic.TestDoubles;
10-
using Microsoft.AspNetCore.Routing;
11-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1212

1313
namespace OnTopic.Tests {
1414

‎OnTopic.AspNetCore.Mvc.Tests/TopicViewComponentTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
\=============================================================================================================================*/
66
using System.Linq;
77
using System.Threading.Tasks;
8+
using Microsoft.AspNetCore.Http;
9+
using Microsoft.AspNetCore.Mvc.Rendering;
10+
using Microsoft.AspNetCore.Mvc.ViewComponents;
11+
using Microsoft.AspNetCore.Routing;
12+
using Microsoft.VisualStudio.TestTools.UnitTesting;
813
using OnTopic.AspNetCore.Mvc.Host.Components;
914
using OnTopic.AspNetCore.Mvc.Models;
1015
using OnTopic.Data.Caching;
@@ -13,11 +18,6 @@
1318
using OnTopic.Repositories;
1419
using OnTopic.TestDoubles;
1520
using OnTopic.ViewModels;
16-
using Microsoft.AspNetCore.Http;
17-
using Microsoft.AspNetCore.Mvc.Rendering;
18-
using Microsoft.AspNetCore.Mvc.ViewComponents;
19-
using Microsoft.AspNetCore.Routing;
20-
using Microsoft.VisualStudio.TestTools.UnitTesting;
2121

2222
namespace OnTopic.Tests {
2323

‎OnTopic.AspNetCore.Mvc.Tests/ValidateTopicAttributeTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
\=============================================================================================================================*/
66
using System;
77
using System.Collections.Generic;
8-
using OnTopic.AspNetCore.Mvc;
9-
using OnTopic.AspNetCore.Mvc.Controllers;
10-
using OnTopic.Attributes;
11-
using OnTopic.TestDoubles;
128
using Microsoft.AspNetCore.Http;
139
using Microsoft.AspNetCore.Mvc;
1410
using Microsoft.AspNetCore.Mvc.Controllers;
1511
using Microsoft.AspNetCore.Mvc.Filters;
1612
using Microsoft.AspNetCore.Mvc.ModelBinding;
1713
using Microsoft.AspNetCore.Routing;
1814
using Microsoft.VisualStudio.TestTools.UnitTesting;
15+
using OnTopic.AspNetCore.Mvc;
16+
using OnTopic.AspNetCore.Mvc.Controllers;
17+
using OnTopic.Attributes;
18+
using OnTopic.TestDoubles;
1919

2020
namespace OnTopic.Tests {
2121

‎OnTopic.AspNetCore.Mvc/Components/NavigationTopicViewComponentBase{T}.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6+
using Microsoft.AspNetCore.Mvc;
67
using OnTopic.Mapping.Hierarchical;
78
using OnTopic.Models;
89
using OnTopic.Repositories;
9-
using Microsoft.AspNetCore.Mvc;
1010

1111
namespace OnTopic.AspNetCore.Mvc.Components {
1212

@@ -27,7 +27,7 @@ namespace OnTopic.AspNetCore.Mvc.Components {
2727
/*==========================================================================================================================
2828
| PRIVATE VARIABLES
2929
\-------------------------------------------------------------------------------------------------------------------------*/
30-
private Topic? _currentTopic = null;
30+
private Topic? _currentTopic;
3131

3232
/*==========================================================================================================================
3333
| CONSTRUCTOR

‎OnTopic.AspNetCore.Mvc/Controllers/RedirectController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6-
using OnTopic.Repositories;
76
using Microsoft.AspNetCore.Mvc;
7+
using OnTopic.Repositories;
88

99
namespace OnTopic.AspNetCore.Mvc.Controllers {
1010

0 commit comments

Comments
 (0)