Latest fxcop fixes (#578)

Author: Christy Henriksson

build.ps1

@@ -9,7 +9,7 @@ param (
     [string]$SemanticVersion = '1.0.0-zlocal',
     [string]$Branch = 'zlocal',
     [string]$CommitSHA,
-    [string]$BuildBranch = 'c35bbc228717720bdbc610f3285259391635e90e'
+    [string]$BuildBranch = '28bbd8623e116d388cd6ece107b913296b6c1b20'
 )
 
 $msBuildVersion = 15;

src/Gallery.Maintenance/DeleteExpiredVerificationKeysTask.cs

@@ -61,19 +61,21 @@ public override async Task RunAsync(Job job)
             if (expectedRowCount > 0)
             {
                 using (var connection = await job.OpenSqlConnectionAsync<GalleryDbConfiguration>())
+                using (var transaction = connection.BeginTransaction())
+                using (var command = connection.CreateCommand())
                 {
-                    using (var transaction = connection.BeginTransaction())
-                    {
-                        var numKeys = 0;
-                        var parameters = credentialKeys.Select(c => new SqlParameter("@Key" + numKeys++, SqlDbType.Int) { Value = c }).ToArray();
-
-                        rowCount = await connection.ExecuteAsync(
-                            string.Format(DeleteQuery, string.Join(",", parameters.Select(p => p.ParameterName))),
-                            parameters,
-                            transaction, _commandTimeout);
-
-                        transaction.Commit();
-                    }
+                    var numKeys = 0;
+                    var parameters = credentialKeys.Select(c => new SqlParameter("@Key" + numKeys++, SqlDbType.Int) { Value = c }).ToArray();
+                    command.Parameters.AddRange(parameters);
+
+                    command.CommandText = string.Format(DeleteQuery, string.Join(",", parameters.Select(p => p.ParameterName)));
+                    command.CommandType = CommandType.Text;
+                    command.CommandTimeout = (int)_commandTimeout.TotalSeconds;
+                    command.Transaction = transaction;
+
+                    rowCount = await command.ExecuteNonQueryAsync();
+
+                    transaction.Commit();
                 }
             }
 

src/NuGet.Jobs.Common/Extensions/DapperExtensions.cs

@@ -10,30 +10,6 @@ namespace System.Data.SqlClient
 {
     public static class DapperExtensions
     {
-        public static Task<int> ExecuteAsync(this SqlConnection connection, string sql, SqlParameter[] parameters = null, SqlTransaction transaction = null, TimeSpan? commandTimeout = null)
-        {
-            SqlCommand cmd = connection.CreateCommand();
-            cmd.CommandText = sql;
-            cmd.CommandType = CommandType.Text;
-
-            if (parameters != null)
-            {
-                cmd.Parameters.AddRange(parameters);
-            }
-
-            if (commandTimeout.HasValue)
-            {
-                cmd.CommandTimeout = (int)commandTimeout.Value.TotalSeconds;
-            }
-
-            if (transaction != null)
-            {
-                cmd.Transaction = transaction;
-            }
-
-            return cmd.ExecuteNonQueryAsync();
-        }
-
         public static async Task<IEnumerable<T>> QueryWithRetryAsync<T>(
             this SqlConnection connection,
             string sql,

src/NuGetCDNRedirect/GlobalSuppressions.cs

@@ -0,0 +1,6 @@
+// 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.Diagnostics.CodeAnalysis;
+
+[module: SuppressMessage("Microsoft.Security.Web.Configuration", "CA3103:EnableFormsRequireSSL", Justification = "Forms authentication is not used, and this project is obsolete (Engineering#1737).")]

src/NuGetCDNRedirect/NuGetCDNRedirect.csproj

@@ -183,6 +183,7 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.*.cs" />
   </ItemGroup>

src/Search.GenerateAuxiliaryData/NestedJArrayExporter.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Threading.Tasks;
@@ -34,8 +33,7 @@ public NestedJArrayExporter(
 
         protected override JContainer GetResultOfQuery(SqlConnection connection)
         {
-            var command = new SqlCommand(GetEmbeddedSqlScript(SqlScript), connection);
-            command.CommandType = CommandType.Text;
+            var command = GetEmbeddedSqlCommand(connection, SqlScript);
 
             return SqlDataReaderToNestedJArrays(command.ExecuteReader(), Col0, Col1);
         }

src/Search.GenerateAuxiliaryData/RankingsExporter.cs

@@ -32,8 +32,7 @@ public RankingsExporter(
 
         protected override JContainer GetResultOfQuery(SqlConnection connection)
         {
-            var rankingsTotalCommand = new SqlCommand(GetEmbeddedSqlScript(_rankingsTotalScript), connection);
-            rankingsTotalCommand.CommandType = CommandType.Text;
+            var rankingsTotalCommand = GetEmbeddedSqlCommand(connection, _rankingsTotalScript);
             rankingsTotalCommand.Parameters.AddWithValue(_rankingCountParameterName, _rankingCount);
             rankingsTotalCommand.CommandTimeout = 60;
 

src/Search.GenerateAuxiliaryData/SqlExporter.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -34,10 +35,18 @@ public SqlExporter(
             OpenSqlConnectionAsync = openSqlConnectionAsync;
         }
 
-        protected static string GetEmbeddedSqlScript(string resourceName)
+        [SuppressMessage("Microsoft.Security", "CA2100", Justification = "Query string comes from embedded resource, not user input.")]
+        protected static SqlCommand GetEmbeddedSqlCommand(SqlConnection connection, string resourceName)
         {
-            var stream = _executingAssembly.GetManifestResourceStream(_assemblyName + "." + resourceName);
-            return new StreamReader(stream).ReadToEnd();
+            using (var reader = new StreamReader(_executingAssembly.GetManifestResourceStream(_assemblyName + "." + resourceName)))
+            {
+                var commandText = reader.ReadToEnd();
+
+                return new SqlCommand(commandText, connection)
+                {
+                    CommandType = CommandType.Text
+                };
+            }
         }
 
         public override async Task ExportAsync()

src/Search.GenerateAuxiliaryData/VerifiedPackagesExporter.cs

@@ -29,8 +29,7 @@ public VerifiedPackagesExporter(
 
         protected override JContainer GetResultOfQuery(SqlConnection connection)
         {
-            var verifiedPackagesCommand = new SqlCommand(GetEmbeddedSqlScript(_verifiedPackagesScript), connection);
-            verifiedPackagesCommand.CommandType = CommandType.Text;
+            var verifiedPackagesCommand = GetEmbeddedSqlCommand(connection, _verifiedPackagesScript);
             verifiedPackagesCommand.CommandTimeout = 60;
 
             SqlDataReader reader = null;

src/Stats.AggregateCdnDownloadsInGallery/AggregateCdnDownloadsJob.cs

@@ -148,7 +148,14 @@ private async Task ProcessBatch(List<IPackageIdGroup> batch, SqlConnection desti
         {
             // Create a temporary table
             Logger.LogDebug("Creating temporary table...");
-            await destinationDatabase.ExecuteAsync(_createTempTable);
+
+            using (var cmd = destinationDatabase.CreateCommand())
+            {
+                cmd.CommandText = _createTempTable;
+                cmd.CommandType = CommandType.Text;
+
+                await cmd.ExecuteNonQueryAsync();
+            }
 
             // Load temporary table
             var aggregateCdnDownloadsInGalleryTable = new DataTable();
@@ -206,8 +213,14 @@ private async Task ProcessBatch(List<IPackageIdGroup> batch, SqlConnection desti
             Logger.LogInformation("Updating destination database Download Counts... ({RecordCount} package registrations to process).", batch.Count());
             stopwatch.Restart();
 
-            await destinationDatabase.ExecuteAsync(_updateFromTempTable,
-                commandTimeout: TimeSpan.FromMinutes(30));
+            using (var cmd = destinationDatabase.CreateCommand())
+            {
+                cmd.CommandText = _updateFromTempTable;
+                cmd.CommandType = CommandType.Text;
+                cmd.CommandTimeout = (int)TimeSpan.FromMinutes(30).TotalSeconds;
+
+                await cmd.ExecuteNonQueryAsync();
+            }
 
             Logger.LogInformation(
                 "Updated destination database Download Counts (took {DurationSeconds} seconds).",