Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: fix SA1208 #218

Merged
merged 3 commits into from
Aug 24, 2022
Merged

refactor: fix SA1208 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d55102d
refactor: fix SA1208
JamieMagee Aug 20, 2022
fa7ec44
Merge branch 'main' into users/jamagee/SA1208
JamieMagee Aug 23, 2022
1c099c2
Merge branch 'main' into users/jamagee/SA1208
JamieMagee Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,6 @@ dotnet_diagnostic.SA1202.severity = suggestion
# 'public' members should come before 'private' members
dotnet_diagnostic.SA1203.severity = suggestion

# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1208.md
# Using directive for '...' should appear before directive for '...'
dotnet_diagnostic.SA1208.severity = suggestion

# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1210.md
# Using directives should be ordered alphabetically by the namespaces
dotnet_diagnostic.SA1210.severity = suggestion
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.ComponentDetection.Common/DockerReference/DockerReferenceUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.ComponentDetection.Contracts;
using System.Text.RegularExpressions;

// transcribed from https://github.com/containers/image/blob/c1a5f92d0ebbf9e0bf187b3353dd400472b388eb/docker/reference/reference.go

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ComponentDetection.Contracts/TypedComponent/PodComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using PackageUrl;
using System.Collections.Generic;
using System.Collections.Generic;
using PackageUrl;

namespace Microsoft.ComponentDetection.Contracts.TypedComponent
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ComponentDetection.Detectors/maven/IMavenCommandService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.ComponentDetection.Contracts.Internal;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Contracts.Internal;

namespace Microsoft.ComponentDetection.Detectors.Maven
{
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ComponentDetection.Detectors/maven/MavenCommandService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.Internal;
using System;
using System;
using System.Composition;
using System.IO;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.Internal;

namespace Microsoft.ComponentDetection.Detectors.Maven
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ComponentDetection.Detectors/maven/MavenStyleDependencyGraphParserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.ComponentDetection.Contracts;
using System.Composition;
using System.Composition;
using Microsoft.ComponentDetection.Contracts;

namespace Microsoft.ComponentDetection.Detectors.Maven
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ComponentDetection.Detectors/npm/NpmComponentDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
using System.Collections.Generic;
using System.Composition;
using System.IO;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.Internal;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Newtonsoft.Json.Linq;
using NuGet.Versioning;
using System.Text.RegularExpressions;

namespace Microsoft.ComponentDetection.Detectors.Npm
{
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.ComponentDetection.Detectors/pip/PythonCommandService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.ComponentDetection.Contracts;
using System;
using System;
using System.Collections.Generic;
using System.Composition;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.IO;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.TypedComponent;

namespace Microsoft.ComponentDetection.Detectors.Pip
{
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ComponentDetection.Detectors/pip/PythonResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using System;
using System;
using System.Collections.Generic;
using System.Composition;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.TypedComponent;

namespace Microsoft.ComponentDetection.Detectors.Pip
{
Expand Down
17 changes: 8 additions & 9 deletions src/Microsoft.ComponentDetection.Orchestrator/Services/DetectorProcessingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
using DotNet.Globbing;
using Microsoft.ComponentDetection.Common;
using Microsoft.ComponentDetection.Common.DependencyGraph;
using Microsoft.ComponentDetection.Common.Telemetry.Records;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.BcdeModels;
using Microsoft.ComponentDetection.Orchestrator.ArgumentSets;
using Newtonsoft.Json;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
Expand All @@ -15,7 +7,14 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;

using DotNet.Globbing;
using Microsoft.ComponentDetection.Common;
using Microsoft.ComponentDetection.Common.DependencyGraph;
using Microsoft.ComponentDetection.Common.Telemetry.Records;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.BcdeModels;
using Microsoft.ComponentDetection.Orchestrator.ArgumentSets;
using Newtonsoft.Json;
using static System.Environment;

namespace Microsoft.ComponentDetection.Orchestrator.Services
Expand Down
2 changes: 1 addition & 1 deletion ...mponentDetection.Orchestrator/Services/GraphTranslation/DefaultGraphTranslationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
using System.Composition;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Common;
using Microsoft.ComponentDetection.Common.DependencyGraph;
using Microsoft.ComponentDetection.Common.Telemetry.Records;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.BcdeModels;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.ComponentDetection.Orchestrator.ArgumentSets;
using System.Threading.Tasks;

namespace Microsoft.ComponentDetection.Orchestrator.Services.GraphTranslation
{
Expand Down
5 changes: 2 additions & 3 deletions test/Microsoft.ComponentDetection.Common.Tests/EnvironmentVariableServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

using System;
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace Microsoft.ComponentDetection.Common.Tests
{
Expand Down
12 changes: 6 additions & 6 deletions test/Microsoft.ComponentDetection.Detectors.Tests/MavenCommandServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using FluentAssertions;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading.Tasks;
using FluentAssertions;
using Microsoft.ComponentDetection.Common;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.Internal;
using Microsoft.ComponentDetection.Detectors.Maven;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading.Tasks;

namespace Microsoft.ComponentDetection.Detectors.Tests
{
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.ComponentDetection.Detectors.Tests/MavenParsingUtilitiesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using static Microsoft.ComponentDetection.Detectors.Maven.MavenParsingUtilities;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using System;
using Microsoft.ComponentDetection.Contracts.BcdeModels;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using static Microsoft.ComponentDetection.Detectors.Maven.MavenParsingUtilities;

namespace Microsoft.ComponentDetection.Detectors.Tests
{
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.ComponentDetection.Detectors.Tests/SPDX22ComponentDetectorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
using Microsoft.ComponentDetection.Common.DependencyGraph;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.TestsUtilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Common.DependencyGraph;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.ComponentDetection.Detectors.Spdx;
using Microsoft.ComponentDetection.TestsUtilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace Microsoft.ComponentDetection.Detectors.Tests
{
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.ComponentDetection.Detectors.Tests/VcpkgComponentDetectorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Common.DependencyGraph;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.ComponentDetection.Detectors.Vcpkg;
using Microsoft.ComponentDetection.TestsUtilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;

namespace Microsoft.ComponentDetection.Detectors.Tests
{
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ComponentDetection.TestsUtilities/DetectorTestUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Moq;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand All @@ -8,6 +7,7 @@
using Microsoft.ComponentDetection.Common.DependencyGraph;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Contracts.Internal;
using Moq;

namespace Microsoft.ComponentDetection.TestsUtilities
{
Expand Down