Latest fxcop fixes (#6544)

Author: Christy Henriksson

build.ps1

@@ -10,7 +10,7 @@ param (
     [string]$PackageSuffix,
     [string]$Branch,
     [string]$CommitSHA,
-    [string]$BuildBranch = 'c35bbc228717720bdbc610f3285259391635e90e'
+    [string]$BuildBranch = '80b8f1b4a1cfe57367881e59fca063866dcaaa42'
 )
 
 Set-StrictMode -Version 1.0

src/GalleryTools/Commands/BackfillRepositoryMetadataCommand.cs

@@ -252,6 +252,7 @@ private static XDocument LoadXml(Stream stream)
                     IgnoreComments = true,
                     IgnoreProcessingInstructions = true,
                 };
+                settings.XmlResolver = null;
 
                 using (var streamReader = new StreamReader(stream))
                 using (var xmlReader = XmlReader.Create(streamReader, settings))

src/NuGetGallery.Core/Certificates/CertificateFile.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Security.Cryptography;
 
@@ -62,6 +63,7 @@ private static MemoryStream CopyAsReadOnly(Stream source)
             }
         }
 
+        [SuppressMessage("Microsoft.Security.Cryptography", "CA5354:SHA1CannotBeUsed", Justification = @"SHA1 thumbprint is only used to distinguish certificates in the Gallery view.")]
         private static string GetSha1Thumbprint(MemoryStream stream)
         {
             using (var hashAlgorithm = SHA1.Create())

src/NuGetGallery.Core/Diagnostics/NullDiagnosticsSource.cs

@@ -3,14 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 
 namespace NuGetGallery.Diagnostics
 {
     public class NullDiagnosticsSource : IDiagnosticsSource
     {
-        [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "Type is immutable")]
         public static readonly NullDiagnosticsSource Instance = new NullDiagnosticsSource();
 
         private NullDiagnosticsSource() { }

src/NuGetGallery.Core/DisposableAction.cs

@@ -3,14 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace NuGetGallery
 {
     public sealed class DisposableAction : IDisposable
     {
-        [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "This is immutable. Multiple calls to dispose will be complete no-op and there is no state stored.")]
         public static readonly DisposableAction NoOp = new DisposableAction(() => { });
 
         private readonly Action _action;

src/NuGetGallery.Core/Entities/IEntitiesContext.cs

@@ -21,7 +21,6 @@ public interface IEntitiesContext
         IDbSet<SymbolPackage> SymbolPackages { get; set; }
 
         Task<int> SaveChangesAsync();
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Set", Justification="This is to match the EF terminology.")]
         IDbSet<T> Set<T>() where T : class;
         void DeleteOnCommit<T>(T entity) where T : class;
         void SetCommandTimeout(int? seconds);

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -37,7 +37,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\Frontend.ruleset</CodeAnalysisRuleSet>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

src/NuGetGallery.Core/Services/TestableStorageClientException.cs

@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using Microsoft.WindowsAzure.Storage;
 
 namespace NuGetGallery
 {
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable", Justification = "This is for unit tests only.")]
     public class TestableStorageClientException : Exception
     {
         public TestableStorageClientException()

src/NuGetGallery/App_Start/DefaultDependenciesModule.cs

@@ -50,7 +50,6 @@ public static class BindingKeys
             public const string SymbolsPackageValidationEnqueuer = "SymbolsPackageValidationEnqueuerBindingKey";
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:CyclomaticComplexity", Justification = "This code is more maintainable in the same function.")]
         protected override void Load(ContainerBuilder builder)
         {
             var telemetryClient = TelemetryClientWrapper.Instance;

src/NuGetGallery/Areas/Admin/Controllers/HomeController.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Web.Mvc;
 using NuGetGallery.Areas.Admin.ViewModels;
 using NuGetGallery.Configuration;
@@ -30,8 +29,6 @@ public virtual ActionResult Index()
         }
 
         [HttpGet]
-        [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Throw", Justification="This is an admin action")]
-        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes", Justification = "This is an admin action")]
         public virtual ActionResult Throw()
         {
             throw new Exception("KA BOOM!");