Merge pull request #151 from smasher164/null-exception

smasher164 · web-flow · commit 6d03217efa00 · 2023-01-11T14:13:56.000-08:00
fix ArgumentNullException when accessing SymbolLocations
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/src/PortToTripleSlash/src/libraries/Extensions.cs b/src/PortToTripleSlash/src/libraries/Extensions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ApiDocsSync.PortToTripleSlash
 {
@@ -59,6 +60,8 @@ public static string DocIdEscaped(this string docId) =>
         // Checks if the passed string is considered "empty" according to the Docs repo rules.
         public static bool IsDocsEmpty(this string? s) =>
             string.IsNullOrWhiteSpace(s) || s == Configuration.ToBeAdded;
+        
+        public static bool HasItems<T>(this IEnumerable<T> src) => src?.Any() ?? false;
     }
 
 }
diff --git a/src/PortToTripleSlash/src/libraries/ToTripleSlashPorter.cs b/src/PortToTripleSlash/src/libraries/ToTripleSlashPorter.cs
@@ -191,7 +191,7 @@ private async Task CollectSymbolLocationsFromReferencedProjectsAsync(DocsType do
                 }
             }
 
-            if (!docsType.SymbolLocations.Any())
+            if (!docsType.SymbolLocations.HasItems())
             {
                 Log.Error($"No symbols found for docs type '{docsType.DocId}'.");
             }
diff --git a/src/PortToTripleSlash/src/libraries/libraries.csproj b/src/PortToTripleSlash/src/libraries/libraries.csproj
@@ -11,18 +11,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="17.2.0" ExcludeAssets="Runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="17.2.0" ExcludeAssets="Runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.3.0-2.final" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4-beta1.22310.1">
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.4.0" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.5.5" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.5.0-2.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4-beta1.22559.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-2.final" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0-2.final" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.3.0-2.final" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22324.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0-2.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0-2.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.5.0-2.final" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/PortToTripleSlash/tests/tests.csproj b/src/PortToTripleSlash/tests/tests.csproj
@@ -28,11 +28,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="17.2.0" ExcludeAssets="Runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="17.2.0" ExcludeAssets="Runtime" />
-    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22579.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220707-01" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22324.4" />
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.4.0" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23060.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221221-03" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`using System.Collections.Generic;`
	`5`	`+using System.Linq;`
`5`	`6`
`6`	`7`	`namespace ApiDocsSync.PortToTripleSlash`
`7`	`8`	`{`
`@@ -59,6 +60,8 @@ public static string DocIdEscaped(this string docId) =>`
`59`	`60`	`// Checks if the passed string is considered "empty" according to the Docs repo rules.`
`60`	`61`	`public static bool IsDocsEmpty(this string? s) =>`
`61`	`62`	`string.IsNullOrWhiteSpace(s) \|\| s == Configuration.ToBeAdded;`
	`63`	`+`
	`64`	`+ public static bool HasItems<T>(this IEnumerable<T> src) => src?.Any() ?? false;`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ private async Task CollectSymbolLocationsFromReferencedProjectsAsync(DocsType do`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`- if (!docsType.SymbolLocations.Any())`
	`194`	`+ if (!docsType.SymbolLocations.HasItems())`
`195`	`195`	`{`
`196`	`196`	`Log.Error($"No symbols found for docs type '{docsType.DocId}'.");`
`197`	`197`	`}`