chore: Remove SA1124 override (#604)

microsoft · Jul 2, 2024 · 494fa75 · 494fa75
1 parent 9556747
commit 494fa75
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 51 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -521,10 +521,6 @@ dotnet_diagnostic.SA1024.severity = suggestion
 # SA1101: Prefix local calls with this
 dotnet_diagnostic.SA1101.severity = suggestion
 
-# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1124.md
-# SA1124: Do not use regions
-dotnet_diagnostic.SA1124.severity = suggestion
-
 # https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md
 # SA1200: Using directive should appear within a namespace declaration
 dotnet_diagnostic.SA1200.severity = suggestion

diff --git a/src/Microsoft.Sbom.Api/Manifest/Configuration/SBOMConfig.cs b/src/Microsoft.Sbom.Api/Manifest/Configuration/SBOMConfig.cs
@@ -87,8 +87,6 @@ public void StartJsonSerialization()
         JsonSerializer = new ManifestToolJsonSerializer(fileStream);
     }
 
-    #region Disposable implementation
-
     public void Dispose()
     {
         Dispose(disposing: true);
@@ -138,6 +136,4 @@ protected virtual async ValueTask DisposeAsyncCore()
         fileStream = null;
         JsonSerializer = null;
     }
-
-    #endregion
 }
diff --git a/src/Microsoft.Sbom.Api/Manifest/Configuration/SbomConfigProvider.cs b/src/Microsoft.Sbom.Api/Manifest/Configuration/SbomConfigProvider.cs
@@ -136,8 +136,6 @@ public void ApplyToEachConfig(Action<ISbomConfig> action)
         }
     }
 
-    #region IInternalMetadataProvider implementation
-
     public object GetMetadata(MetadataKey key)
     {
         if (MetadataDictionary.TryGetValue(key, out var value))
@@ -207,10 +205,6 @@ public string GetSBOMNamespaceUri()
         throw new Exception($"Unable to find any provider to generate the namespace.");
     }
 
-    #endregion
-
-    #region Disposable implementation
-
     public void Dispose()
     {
         Dispose(disposing: true);
@@ -240,6 +234,4 @@ protected virtual async ValueTask DisposeAsyncCore()
             await config.Value.DisposeAsync().ConfigureAwait(false);
         }
     }
-
-    #endregion
 }
diff --git a/src/Microsoft.Sbom.Api/Utils/Constants.cs b/src/Microsoft.Sbom.Api/Utils/Constants.cs
@@ -46,9 +46,5 @@ public static class Constants
     public const string CatalogFileName = "manifest.cat";
     public const string BsiFileName = "bsi.json";
 
-    #region Configuration switches
-
     public const string DeleteManifestDirBoolVariableName = "DeleteManifestDirIfPresent";
-
-    #endregion
 }
diff --git a/src/Microsoft.Sbom.Api/Utils/Events.cs b/src/Microsoft.Sbom.Api/Utils/Events.cs
@@ -5,7 +5,6 @@ namespace Microsoft.Sbom.Api.Utils;
 
 internal static class Events
 {
-    #region Generation
     internal const string SBOMGenerationWorkflow = "Total generation time";
     internal const string SBOMParseMetadata = "Total metadata parsing time";
     internal const string FilesGeneration = "Files generation time";
@@ -14,6 +13,5 @@ internal static class Events
     internal const string MetadataBuilder = "Metadata build time for {0} format";
     internal const string ExternalDocumentReferenceGeneration = "External document reference generation time";
 
-    #endregion
     internal const string SBOMValidationWorkflow = "Total validation time";
 }
diff --git a/src/Microsoft.Sbom.Extensions/MetadataKey.cs b/src/Microsoft.Sbom.Extensions/MetadataKey.cs
@@ -50,8 +50,6 @@ public enum MetadataKey
     /// these variables, go to
     /// https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables-devops-services
     /// </summary>
-    #region Azure DevOps Pipelines metadata
-
     Build_BuildId,
     Build_DefinitionName,
     Build_Repository_Uri,
@@ -62,6 +60,4 @@ public enum MetadataKey
     ImageVersion,
     OrganizationId,
     ProjectId
-
-    #endregion
 }
diff --git a/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Constants.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Constants.cs
@@ -14,7 +14,6 @@ internal static class Constants
     internal const string SPDXDocumentIdValue = "SPDXRef-DOCUMENT";
     internal const string RootPackageIdValue = "SPDXRef-RootPackage";
     internal const string SPDXRefFile = "SPDXRef-File";
-    #region Headers
 
     internal const string SPDXVersionHeaderName = "spdxVersion";
     internal const string DataLicenseHeaderName = "dataLicense";
@@ -29,17 +28,11 @@ internal static class Constants
     internal const string RelationshipsArrayHeaderName = "relationships";
     internal const string ExternalDocumentRefArrayHeaderName = "externalDocumentRefs";
 
-    #endregion
-
     internal const int ReadBufferSize = 4096;
 
-    #region Value format strings
-
     internal const string SPDXDocumentNameFormatString = "{0} {1}";
     internal const string PackageSupplierFormatString = "Organization: {0}";
 
-    #endregion
-
     /// <summary>
     /// Use if there is no available information for a field.
     /// </summary>

diff --git a/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ExternalRepositoryType.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ExternalRepositoryType.cs
@@ -17,31 +17,13 @@ namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums;
     Justification = "These are enum types that are case sensitive and defined by external code.")]
 public enum ExternalRepositoryType
 {
-    #region Security
     cpe22,
     cpe23,
-
-    #endregion
-
-    #region Persistent-Id
-
     swh,
-
-    #endregion
-
-    #region Package-Manager
-
     maven_central,
     npm,
     nuget,
     bower,
     purl,
-
-    #endregion
-
-    #region Other
-
     idstring
-
-    #endregion
 }