Minor code clean-up based on info messages in VS

joelverhagen · joelverhagen · commit 92141221cf80 · 2023-09-17T15:54:45.000-04:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,8 @@
     <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
+    <StartDevelopmentStorage>False</StartDevelopmentStorage>
   </PropertyGroup>
   <PropertyGroup>
     <EnableNPE Condition="'$(EnableNPE)' == '' and $([MSBuild]::IsOSPlatform('Windows'))">true</EnableNPE>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -19,8 +19,8 @@
     <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
     <PackageVersion Include="MessagePack" Version="2.5.108" />
     <PackageVersion Include="MessagePackAnalyzer" Version="2.5.108" />
-    <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+    <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.15" />
     <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
diff --git a/NuGet.Insights.sln b/NuGet.Insights.sln
@@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
+		global.json = global.json
 		LICENSE = LICENSE
 		NuGet.config = NuGet.config
 		README.md = README.md
diff --git a/src/Forks/Forks.csproj b/src/Forks/Forks.csproj
@@ -4,7 +4,6 @@
     <AssemblyName>NuGet.Insights.Forks</AssemblyName>
     <RootNamespace>NuGet.Insights</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NuGet.Commands" />
diff --git a/src/Logic/Network/HttpSourceExtensions.cs b/src/Logic/Network/HttpSourceExtensions.cs
@@ -20,7 +20,7 @@ public static class HttpSourceExtensions
     {
         private const int DefaultMaxTries = 3;
 
-        internal static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions
+        internal static readonly JsonSerializerOptions JsonSerializerOptions = new()
         {
             Converters =
             {
@@ -193,7 +193,7 @@ public static async Task<T> ProcessStreamWithRetryAsync<T>(
                         nuGetLogger,
                         token);
                 }
-                catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, token, ex))
+                catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, ex, token))
                 {
                     logger.LogTransientWarning(ex, "On attempt {Attempt}, processing the stream response body failed. Trying again.", attempt);
                 }
@@ -227,14 +227,14 @@ public static async Task<T> ProcessResponseWithRetryAsync<T>(
                         nuGetLogger,
                         token);
                 }
-                catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, token, ex))
+                catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, ex, token))
                 {
                     logger.LogTransientWarning(ex, "On attempt {Attempt}, processing the response body for {Url} failed. Trying again.", attempt, url);
                 }
             }
         }
 
-        private static bool ShouldRetryStreamException(int attempt, bool fetchedHeaders, CancellationToken token, Exception ex)
+        private static bool ShouldRetryStreamException(int attempt, bool fetchedHeaders, Exception ex, CancellationToken token)
         {
             return attempt < 3
                 && fetchedHeaders
@@ -294,24 +294,22 @@ public static async Task<BlobMetadata> GetBlobMetadataAsync(
                 async stream =>
                 {
                     var buffer = new byte[16 * 1024];
-                    using (var md5 = MD5.Create())
+                    using var md5 = MD5.Create();
+                    int read;
+                    do
                     {
-                        int read;
-                        do
-                        {
-                            read = await stream.ReadAsync(buffer, 0, buffer.Length);
-                            md5.TransformBlock(buffer, 0, read, buffer, 0);
-                        }
-                        while (read > 0);
+                        read = await stream.ReadAsync(buffer);
+                        md5.TransformBlock(buffer, 0, read, buffer, 0);
+                    }
+                    while (read > 0);
 
-                        md5.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
-                        var contentMD5 = md5.Hash!.ToLowerHex();
+                    md5.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
+                    var contentMD5 = md5.Hash!.ToLowerHex();
 
-                        return new BlobMetadata(
-                            exists: true,
-                            hasContentMD5Header: false,
-                            contentMD5: contentMD5);
-                    }
+                    return new BlobMetadata(
+                        exists: true,
+                        hasContentMD5Header: false,
+                        contentMD5: contentMD5);
                 },
                 logger,
                 token);
diff --git a/src/Logic/Support/ByteArrayExtensions.cs b/src/Logic/Support/ByteArrayExtensions.cs
@@ -11,12 +11,12 @@ public static class ByteArrayExtensions
     {
         public static string ToUpperHex(this byte[] bytes)
         {
-            return BitConverter.ToString(bytes).Replace("-", string.Empty).ToUpperInvariant();
+            return Convert.ToHexString(bytes);
         }
 
         public static string ToLowerHex(this byte[] bytes)
         {
-            return BitConverter.ToString(bytes).Replace("-", string.Empty).ToLowerInvariant();
+            return Convert.ToHexString(bytes).ToLowerInvariant();
         }
 
         public static string ToBase64(this byte[] bytes)
diff --git a/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoDataValidator.cs b/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoDataValidator.cs
@@ -199,7 +199,7 @@ private async Task<IReadOnlyList<Validation>> GetSetValidationsAsync(string colu
             return validations;
         }
 
-        private Validation GetLeftRightValidation(string leftTable, string rightTable, string column, string comparisonType, string joinQuery)
+        private static Validation GetLeftRightValidation(string leftTable, string rightTable, string column, string comparisonType, string joinQuery)
         {
             var query = $@"{joinQuery} on {column}
 | where isempty({column}) or isempty({column}1)
diff --git a/test/Worker.Logic.Test/CatalogScan/Drivers/PackageCertificateToCsv/PackageCertificateToCsvDriverTest.cs b/test/Worker.Logic.Test/CatalogScan/Drivers/PackageCertificateToCsv/PackageCertificateToCsvDriverTest.cs
@@ -89,7 +89,7 @@ public async Task HandlesEVCodeSigning()
             var genericPolicies = JsonConvert.DeserializeObject<List<X509PolicyInfo>>(certificate.Policies);
             Assert.Equal(2, genericPolicies.Count);
             Assert.Equal("2.16.840.1.114412.3.2", genericPolicies[0].PolicyIdentifier);
-            Assert.Equal(1, genericPolicies[0].PolicyQualifiers.Count);
+            Assert.Single(genericPolicies[0].PolicyQualifiers);
             Assert.Equal(Oids.IdQtCps.Value, genericPolicies[0].PolicyQualifiers[0].PolicyQualifierId);
             Assert.Equal("2.23.140.1.3", genericPolicies[1].PolicyIdentifier);
             Assert.Empty(genericPolicies[1].PolicyQualifiers);
diff --git a/test/Worker.Logic.Test/CatalogScan/Drivers/PackageContentToCsv/PackageContentToCsvDriverTest.cs b/test/Worker.Logic.Test/CatalogScan/Drivers/PackageContentToCsv/PackageContentToCsvDriverTest.cs
@@ -546,7 +546,7 @@ public async Task TreatsExtensionAsCaseInsensitive()
 
             Assert.Equal(DriverResultType.Success, output.Type);
             var records = output.Value.Records;
-            Assert.Equal(1, records.Count);
+            Assert.Single(records);
             Assert.All(records, r => Assert.Equal(PackageContentResultType.AllLoaded, r.ResultType));
             Assert.All(records, r => Assert.Equal(".txt", r.FileExtension));
 
@@ -578,7 +578,7 @@ public async Task HandlesSuffixWithoutDots()
 
             Assert.Equal(DriverResultType.Success, output.Type);
             var records = output.Value.Records;
-            Assert.Equal(1, records.Count);
+            Assert.Single(records);
             Assert.All(records, r => Assert.Equal(PackageContentResultType.AllLoaded, r.ResultType));
             Assert.All(records, r => Assert.Equal("cense", r.FileExtension));
 
@@ -608,7 +608,7 @@ public async Task HandlesHyphenInFrameworkProfile()
 
             Assert.Equal(DriverResultType.Success, output.Type);
             var records = output.Value.Records;
-            Assert.Equal(1, records.Count);
+            Assert.Single(records);
             Assert.All(records, r => Assert.Equal(PackageContentResultType.AllLoaded, r.ResultType));
             Assert.All(records, r => Assert.Equal(".txt", r.FileExtension));
 
diff --git a/test/Worker.Logic.Test/TestSupport/BaseWorkerLogicIntegrationTest.cs b/test/Worker.Logic.Test/TestSupport/BaseWorkerLogicIntegrationTest.cs
@@ -530,8 +530,7 @@ await AssertWideEntityOutputAsync(
 
                     if (entity.V1.Available)
                     {
-                        using var algorithm = SHA256.Create();
-                        mzipHash = algorithm.ComputeHash(entity.V1.MZipBytes.ToArray()).ToLowerHex();
+                        mzipHash = SHA256.HashData(entity.V1.MZipBytes.Span).ToLowerHex();
                         httpHeaders = NormalizeHeaders(entity.V1.HttpHeaders, ignore: Enumerable.Empty<string>());
                     }
 
@@ -618,7 +617,7 @@ protected void MakeDeletedPackageAvailable(string id = "BehaviorSample", string
             }
         }
 
-        private void SetBlobResponseHeaders(HttpResponseMessage response, string sourcePath)
+        private static void SetBlobResponseHeaders(HttpResponseMessage response, string sourcePath)
         {
             using (var fileStream = File.OpenRead(sourcePath))
             {
@@ -707,7 +706,7 @@ await AssertEntityOutputAsync<TableEntity>(
                 fileName: fileName ?? "subject-to-owner.json");
         }
 
-        private ICslAdminProvider GetKustoAdminClient()
+        private static ICslAdminProvider GetKustoAdminClient()
         {
             var connectionStringBuilder = ServiceCollectionExtensions.GetKustoConnectionStringBuilder(new NuGetInsightsWorkerSettings
             {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static class HttpSourceExtensions`
`20`	`20`	`{`
`21`	`21`	`private const int DefaultMaxTries = 3;`
`22`	`22`
`23`		`- internal static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions`
	`23`	`+ internal static readonly JsonSerializerOptions JsonSerializerOptions = new()`
`24`	`24`	`{`
`25`	`25`	`Converters =`
`26`	`26`	`{`
`@@ -193,7 +193,7 @@ public static async Task<T> ProcessStreamWithRetryAsync<T>(`
`193`	`193`	`nuGetLogger,`
`194`	`194`	`token);`
`195`	`195`	`}`
`196`		`- catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, token, ex))`
	`196`	`+ catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, ex, token))`
`197`	`197`	`{`
`198`	`198`	`logger.LogTransientWarning(ex, "On attempt {Attempt}, processing the stream response body failed. Trying again.", attempt);`
`199`	`199`	`}`
`@@ -227,14 +227,14 @@ public static async Task<T> ProcessResponseWithRetryAsync<T>(`
`227`	`227`	`nuGetLogger,`
`228`	`228`	`token);`
`229`	`229`	`}`
`230`		`- catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, token, ex))`
	`230`	`+ catch (Exception ex) when (ShouldRetryStreamException(attempt, fetchedHeaders, ex, token))`
`231`	`231`	`{`
`232`	`232`	`logger.LogTransientWarning(ex, "On attempt {Attempt}, processing the response body for {Url} failed. Trying again.", attempt, url);`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`237`		`- private static bool ShouldRetryStreamException(int attempt, bool fetchedHeaders, CancellationToken token, Exception ex)`
	`237`	`+ private static bool ShouldRetryStreamException(int attempt, bool fetchedHeaders, Exception ex, CancellationToken token)`
`238`	`238`	`{`
`239`	`239`	`return attempt < 3`
`240`	`240`	`&& fetchedHeaders`
`@@ -294,24 +294,22 @@ public static async Task<BlobMetadata> GetBlobMetadataAsync(`
`294`	`294`	`async stream =>`
`295`	`295`	`{`
`296`	`296`	`var buffer = new byte[16 * 1024];`
`297`		`- using (var md5 = MD5.Create())`
	`297`	`+ using var md5 = MD5.Create();`
	`298`	`+ int read;`
	`299`	`+ do`
`298`	`300`	`{`
`299`		`- int read;`
`300`		`- do`
`301`		`- {`
`302`		`- read = await stream.ReadAsync(buffer, 0, buffer.Length);`
`303`		`- md5.TransformBlock(buffer, 0, read, buffer, 0);`
`304`		`- }`
`305`		`- while (read > 0);`
	`301`	`+ read = await stream.ReadAsync(buffer);`
	`302`	`+ md5.TransformBlock(buffer, 0, read, buffer, 0);`
	`303`	`+ }`
	`304`	`+ while (read > 0);`
`306`	`305`
`307`		`- md5.TransformFinalBlock(Array.Empty<byte>(), 0, 0);`
`308`		`- var contentMD5 = md5.Hash!.ToLowerHex();`
	`306`	`+ md5.TransformFinalBlock(Array.Empty<byte>(), 0, 0);`
	`307`	`+ var contentMD5 = md5.Hash!.ToLowerHex();`
`309`	`308`
`310`		`- return new BlobMetadata(`
`311`		`- exists: true,`
`312`		`- hasContentMD5Header: false,`
`313`		`- contentMD5: contentMD5);`
`314`		`- }`
	`309`	`+ return new BlobMetadata(`
	`310`	`+ exists: true,`
	`311`	`+ hasContentMD5Header: false,`
	`312`	`+ contentMD5: contentMD5);`
`315`	`313`	`},`
`316`	`314`	`logger,`
`317`	`315`	`token);`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ public static class ByteArrayExtensions`
`11`	`11`	`{`
`12`	`12`	`public static string ToUpperHex(this byte[] bytes)`
`13`	`13`	`{`
`14`		`- return BitConverter.ToString(bytes).Replace("-", string.Empty).ToUpperInvariant();`
	`14`	`+ return Convert.ToHexString(bytes);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public static string ToLowerHex(this byte[] bytes)`
`18`	`18`	`{`
`19`		`- return BitConverter.ToString(bytes).Replace("-", string.Empty).ToLowerInvariant();`
	`19`	`+ return Convert.ToHexString(bytes).ToLowerInvariant();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static string ToBase64(this byte[] bytes)`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ private async Task<IReadOnlyList<Validation>> GetSetValidationsAsync(string colu`
`199`	`199`	`return validations;`
`200`	`200`	`}`
`201`	`201`
`202`		`- private Validation GetLeftRightValidation(string leftTable, string rightTable, string column, string comparisonType, string joinQuery)`
	`202`	`+ private static Validation GetLeftRightValidation(string leftTable, string rightTable, string column, string comparisonType, string joinQuery)`
`203`	`203`	`{`
`204`	`204`	`var query = $@"{joinQuery} on {column}`
`205`	`205`	`\| where isempty({column}) or isempty({column}1)`
Original file line number	Diff line number	Diff line change
`@@ -530,8 +530,7 @@ await AssertWideEntityOutputAsync(`
`530`	`530`
`531`	`531`	`if (entity.V1.Available)`
`532`	`532`	`{`
`533`		`- using var algorithm = SHA256.Create();`
`534`		`- mzipHash = algorithm.ComputeHash(entity.V1.MZipBytes.ToArray()).ToLowerHex();`
	`533`	`+ mzipHash = SHA256.HashData(entity.V1.MZipBytes.Span).ToLowerHex();`
`535`	`534`	`httpHeaders = NormalizeHeaders(entity.V1.HttpHeaders, ignore: Enumerable.Empty<string>());`
`536`	`535`	`}`
`537`	`536`
`@@ -618,7 +617,7 @@ protected void MakeDeletedPackageAvailable(string id = "BehaviorSample", string`
`618`	`617`	`}`
`619`	`618`	`}`
`620`	`619`
`621`		`- private void SetBlobResponseHeaders(HttpResponseMessage response, string sourcePath)`
	`620`	`+ private static void SetBlobResponseHeaders(HttpResponseMessage response, string sourcePath)`
`622`	`621`	`{`
`623`	`622`	`using (var fileStream = File.OpenRead(sourcePath))`
`624`	`623`	`{`
`@@ -707,7 +706,7 @@ await AssertEntityOutputAsync<TableEntity>(`
`707`	`706`	`fileName: fileName ?? "subject-to-owner.json");`
`708`	`707`	`}`
`709`	`708`
`710`		`- private ICslAdminProvider GetKustoAdminClient()`
	`709`	`+ private static ICslAdminProvider GetKustoAdminClient()`
`711`	`710`	`{`
`712`	`711`	`var connectionStringBuilder = ServiceCollectionExtensions.GetKustoConnectionStringBuilder(new NuGetInsightsWorkerSettings`
`713`	`712`	`{`