Fix assembly load problem, fix some warnings, and cleanup build

alexperovich · alexperovich · commit d1faeb264549 · 2022-08-29T16:39:50.000-07:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -78,67 +78,24 @@ jobs:
     displayName: Clone All Repositories
     inputs:
       solution: build.proj
-      msbuildArgs: /t:Clone /v:q /bl:$(Build.ArtifactStagingDirectory)/logs/clone.binlog
+      msbuildArgs: /t:Clone /v:n /bl:$(Build.ArtifactStagingDirectory)/logs/clone.binlog
       msbuildArchitecture: x64
     env:
       source-dot-net-stage1-blob-container-url: $(source-dot-net-stage1-blob-container-url)
 
-  - powershell: |
-      Stop-Process -Name "dotnet"
-      $installScript = Join-Path $env:TEMP dotnet-install.ps1
-      [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-      Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -UseBasicParsing -OutFile $installScript
-
-      $installDir = "$(Agent.ToolsDirectory)/dotnet"
-
-      ls -Recurse -Include global.json | %{
-        try {
-          Write-Host "Processing $_"
-          $v = $_ | Get-Content -Raw | ConvertFrom-Json | %{ if ($_.tools.dotnet) {$_.tools.dotnet} else {$_.sdk.version} }
-          if (-not $v)
-          {
-            Write-Host "No version found in $_"
-            return
-          }
-          $isSensibleVersion = $v.Split('.')[0] -as [int] -le 30
-          if (-not $isSensibleVersion)
-          {
-            Write-Host "Skipping bogus version $v"
-            return
-          }
-
-          Write-Host "Installing .NET CLI version $v"
-          try
-          {
-            & $installScript -Version $v -InstallDir $installDir -NoPath
-          }
-          catch
-          {
-            try
-            {
-              & $installScript -Version $v -InstallDir $installDir -NoPath -AzureFeed https://dotnetbuilds.azureedge.net/public
-            }
-            catch
-            {
-              throw "Unable to install Version $v"
-            }
-          }
-        }
-        catch
-        {
-          Write-Host "Skipping bad json file."
-        }
-       }
-    displayName: 'Install Required Versions of .NET Core'
+  - task: VSBuild@1
+    displayName: Prepare All Repositories
+    inputs:
+      solution: build.proj
+      msbuildArgs: /t:Prepare /v:n /bl:$(Build.ArtifactStagingDirectory)/logs/prepare.binlog
+      msbuildArchitecture: x64
 
   - task: VSBuild@1
     displayName: Build source index
     inputs:
       solution: build.proj
-      msbuildArgs: /t:Build /v:q /bl:$(Build.ArtifactStagingDirectory)/logs/build.binlog
+      msbuildArgs: /t:BuildIndex /v:n /bl:$(Build.ArtifactStagingDirectory)/logs/build.binlog
       msbuildArchitecture: x64
-    env:
-      source-dot-net-stage1-blob-container-url: $(source-dot-net-stage1-blob-container-url)
 
   - powershell: |
       deployment/install-tool.ps1 -Name 'azure-cli' -Version 2.8.0 -TestPath '/wbin/az.cmd' -BinPath '/wbin/'
@@ -209,11 +166,18 @@ jobs:
       inlineScript: >
         az webapp restart --name netsourceindex --slot staging --resource-group source.dot.net
 
-  - powershell: |
+  - pwsh: |
       Start-Sleep 60
-      $statusCode = Invoke-WebRequest https://netsourceindex-staging.azurewebsites.net -UseBasicParsing | select -ExpandProperty StatusCode
-      if ($statusCode -ne 200) {
-        Write-Host "##vso[task.logissue type=error;]Deployed website returned undexpected status code $statusCode"
+      $urls = @(
+        "https://netsourceindex-staging.azurewebsites.net",
+        "https://netsourceindex-staging.azurewebsites.net/System.Private.CoreLib/src/libraries/System.Private.CoreLib/src/System/String.cs.html"
+      )
+      foreach ($url in $urls) {
+        $statusCode = Invoke-WebRequest $url -UseBasicParsing -SkipHttpErrorCheck | select -ExpandProperty StatusCode
+        if ($statusCode -ne 200) {
+          Write-Host "##vso[task.logissue type=error;]Deployed website returned undexpected status code $statusCode from url $url"
+          Write-Host "##vso[task.complete result=Failed;]Deployed website returned undexpected status code $statusCode from url $url"
+        }
       }
     displayName: Test Deployed WebApp
 
diff --git a/build.proj b/build.proj
@@ -13,12 +13,18 @@
   <Target Name="Clean" DependsOnTargets="BuildTasks">
     <MSBuild Projects="src/index/index.proj" Targets="Clean" Properties="SourceIndexerTasksAssembly=$(SourceIndexerTasksAssembly)"/>
   </Target>
-  <Target Name="Build" DependsOnTargets="BuildTasks">
-    <MSBuild Projects="src/index/index.proj" Targets="Build" Properties="SourceIndexerTasksAssembly=$(SourceIndexerTasksAssembly)"/>
-  </Target>
   <Target Name="Clone" DependsOnTargets="BuildTasks">
     <MSBuild Projects="src/index/index.proj" Targets="Clone" Properties="SourceIndexerTasksAssembly=$(SourceIndexerTasksAssembly)"/>
   </Target>
+  <Target Name="Prepare" DependsOnTargets="BuildTasks">
+    <MSBuild Projects="src/index/index.proj" Targets="Prepare" Properties="SourceIndexerTasksAssembly=$(SourceIndexerTasksAssembly)"/>
+  </Target>
+  <Target Name="BuildIndex" DependsOnTargets="BuildTasks">
+    <MSBuild Projects="src/index/index.proj" Targets="BuildIndex" Properties="SourceIndexerTasksAssembly=$(SourceIndexerTasksAssembly)"/>
+  </Target>
+  <Target Name="Build" DependsOnTargets="BuildTasks">
+    <MSBuild Projects="src/index/index.proj" Targets="Build" Properties="SourceIndexerTasksAssembly=$(SourceIndexerTasksAssembly)"/>
+  </Target>
   <Target Name="SelectProjects" DependsOnTargets="BuildTasks">
     <MSBuild Projects="src/index/index.proj" Targets="SelectProjects" Properties="SourceIndexerTasksAssembly=$(SourceIndexerTasksAssembly)"/>
   </Target>
diff --git a/src/SourceBrowser/src/BinLogParser/BinLogParser.csproj b/src/SourceBrowser/src/BinLogParser/BinLogParser.csproj
@@ -12,6 +12,8 @@
 
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Build" Version="17.2.0" NoWarn="NU1701" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.0" NoWarn="NU1701" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(NuGetVersionRoslyn)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(NuGetVersionRoslyn)" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(NuGetVersionRoslyn)" />
diff --git a/src/SourceBrowser/src/BinLogParser/BinLogReader.cs b/src/SourceBrowser/src/BinLogParser/BinLogReader.cs
@@ -160,7 +160,7 @@ public static string TrimCompilerExeFromCommandLine(string commandLine, Compiler
 
             foreach (var trim in stringsToTrim)
             {
-                if (commandLine.StartsWith(trim))
+                if (commandLine.StartsWith(trim, StringComparison.Ordinal))
                 {
                     return commandLine.Substring(trim.Length);
                 }
diff --git a/src/SourceBrowser/src/BinLogToSln/Program.cs b/src/SourceBrowser/src/BinLogToSln/Program.cs
@@ -153,7 +153,7 @@ static void Main(string[] args)
                     string projectRelativePath;
                     string outputFile;
                     string link = null;
-                    if (repoRelativePath.StartsWith("..\\") || repoRelativePath.StartsWith("../") || Path.IsPathRooted(repoRelativePath))
+                    if (repoRelativePath.StartsWith("..\\", StringComparison.Ordinal) || repoRelativePath.StartsWith("../", StringComparison.Ordinal) || Path.IsPathRooted(repoRelativePath))
                     {
                         string externalPath = Path.Join("_external", idx++.ToString(), Path.GetFileName(filePath));
                         // not in the repo dir, treat as external
@@ -163,7 +163,7 @@ static void Main(string[] args)
                     else
                     {
                         projectRelativePath = Path.GetRelativePath(invocation.ProjectDirectory, filePath);
-                        if (projectRelativePath.StartsWith(".."))
+                        if (projectRelativePath.StartsWith("..", StringComparison.Ordinal))
                         {
                             link = repoRelativePath;
                         }
diff --git a/src/SourceBrowser/src/Common/Common.csproj b/src/SourceBrowser/src/Common/Common.csproj
@@ -9,7 +9,8 @@
     <DefineConstants>$(DefineConstants);NET472</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="16.8.0" />
+    <PackageReference Include="Microsoft.Build" Version="17.2.0" NoWarn="NU1701" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.0" NoWarn="NU1701" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj b/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj
@@ -10,12 +10,13 @@
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <NoWarn>$(NoWarn);VSTHRD200</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <NuGetPackageId>SourceBrowser</NuGetPackageId>
     <NuSpecFile>$(MSBuildProjectDirectory)\$(NuGetPackageId).nuspec</NuSpecFile>
     <NuGetVersion>1.0.38</NuGetVersion>
-    <NuGetVersionRoslyn>4.0.0-1.final</NuGetVersionRoslyn>
+    <NuGetVersionRoslyn>4.2.0</NuGetVersionRoslyn>
   </PropertyGroup>
   <ItemGroup>
     <NuGetInput Include="$(MSBuildThisFile)" />
@@ -33,15 +34,32 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ExceptionAnalysis.Diagnostics" Version="1.0.0.39796" />
-    <PackageReference Include="ManagedEsent" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Build" Version="16.10.0" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="16.10.0" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.5.3" />
+
+    <!-- All Dlls provided in the msbuild install, they need to have ExcludeAssets="runtime" on them -->
+    <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.Tasks.Core" Version="16.10.0" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.NET.StringTools" Version="1.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Memory" Version="4.5.5" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Reflection.Metadata" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Text.Json" Version="6.0.5" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" ExcludeAssets="runtime" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" ExcludeAssets="runtime" />
+
+    <PackageReference Include="ExceptionAnalysis.Diagnostics" Version="1.0.0.39796" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="$(NuGetVersionRoslyn)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -53,11 +71,10 @@
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(NuGetVersionRoslyn)" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(NuGetVersionRoslyn)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(NuGetVersionRoslyn)" />
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.507" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.669" />
     <PackageReference Include="GuiLabs.Language.Xml" Version="1.2.46" />
     <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="16.10.230" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.HighlightReferences.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.HighlightReferences.cs
@@ -5,7 +5,7 @@ namespace Microsoft.SourceBrowser.HtmlGenerator
 {
     public partial class DocumentGenerator
     {
-        private readonly Dictionary<ISymbol, int> localIds = new Dictionary<ISymbol, int>();
+        private readonly Dictionary<ISymbol, int> localIds = new Dictionary<ISymbol, int>(SymbolEqualityComparer.Default);
 
         private HtmlElementInfo HighlightDefinition(ISymbol declaredSymbol)
         {
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.Links.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.Links.cs
@@ -358,7 +358,7 @@ private void AddReferencesToImplementedMembers(
             {
                 foreach (var member in implementedInterface.GetMembers())
                 {
-                    if (declaringType.FindImplementationForInterfaceMember(member) == declaredSymbol)
+                    if (declaredSymbol.Equals(declaringType.FindImplementationForInterfaceMember(member), SymbolEqualityComparer.Default))
                     {
                         ProcessReference(
                             range,
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.References.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.References.cs
@@ -255,7 +255,7 @@ private ReferenceKind DetermineReferenceKind(SyntaxToken token, SyntaxNode node,
                     SemanticModel.GetDeclaredSymbol(typeDeclaration) is INamedTypeSymbol derivedType &&
                     referencedSymbol is INamedTypeSymbol baseSymbol)
                 {
-                    if (baseSymbol.TypeKind == TypeKind.Class && baseSymbol.Equals(derivedType.BaseType))
+                    if (baseSymbol.TypeKind == TypeKind.Class && baseSymbol.Equals(derivedType.BaseType, SymbolEqualityComparer.Default))
                     {
                         kind = ReferenceKind.DerivedType;
                     }
@@ -551,10 +551,10 @@ private string GetAssemblyFromSymbol(ISymbol symbol)
             type = (ITypeSymbol)GetTypeFromSymbol(symbol);
             string containingAssembly = type.ContainingAssembly.Name;
             string typeDocId = (type?.OriginalDefinition ?? type).GetDocumentationCommentId();
-            var seenAssemblies = new HashSet<string>();
+            var seenAssemblies = new HashSet<string>();
             while (projectGenerator.SolutionGenerator.TypeForwards.TryGetValue((containingAssembly, typeDocId), out var newAssembly))
             {
-                bool loop = !seenAssemblies.Add(newAssembly);
+                bool loop = !seenAssemblies.Add(newAssembly);
                 lock (projectGenerator.ForwardedReferenceAssemblies)
                 {
                     projectGenerator.ForwardedReferenceAssemblies.Add(
@@ -564,12 +564,12 @@ private string GetAssemblyFromSymbol(ISymbol symbol)
                 if (loop)
                 {
                     break;
-                }
+                }
 
                 containingAssembly = newAssembly;
             }
 
-            return containingAssembly;
+            return containingAssembly;
         }
 
         private static ISymbol GetTypeFromSymbol(ISymbol symbol)
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/DocumentGenerator.cs
@@ -58,7 +58,7 @@ public async Task Generate()
                 this.getBindableParentDelegate = (Func<SyntaxToken, SyntaxNode>)
                     Delegate.CreateDelegate(typeof(Func<SyntaxToken, SyntaxNode>), SyntaxFactsService, getBindableParent);
 
-                this.DeclaredSymbols = new HashSet<ISymbol>();
+                this.DeclaredSymbols = new HashSet<ISymbol>(SymbolEqualityComparer.Default);
 
                 Interlocked.Increment(ref projectGenerator.DocumentCount);
                 Interlocked.Add(ref projectGenerator.LinesOfCode, Text.Lines.Count);
@@ -148,7 +148,7 @@ private async Task GenerateHtml(StreamWriter writer)
 
             // pass a value larger than 0 to generate line numbers in JavaScript (to reduce HTML size)
             var prefix = Markup.GetDocumentPrefix(title, relativePathToRoot, pregenerateLineNumbers ? 0 : lineCount);
-            writer.Write(prefix);
+            await writer.WriteAsync(prefix);
             GenerateHeader(writer.WriteLine);
 
             var ranges = (await classifier.Classify(Document, Text))?.ToArray();
@@ -158,11 +158,11 @@ private async Task GenerateHtml(StreamWriter writer)
                 DocumentUrl,
                 pregenerateLineNumbers ? lineCount : 0,
                 GenerateGlyphs(ranges));
-            writer.WriteLine(table);
+            await writer.WriteLineAsync(table);
 
             GeneratePre(ranges, writer, lineCount);
             var suffix = Markup.GetDocumentSuffix();
-            writer.WriteLine(suffix);
+            await writer.WriteLineAsync(suffix);
         }
 
         private ISymbol GetSymbolForRange(Classification.Range r)
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/MetadataAsSource.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/MetadataAsSource.cs
@@ -90,7 +90,7 @@ public static Solution LoadMetadataAsSourceSolution(string assemblyFilePath)
                         addSourceToAsync = ReflectAddSourceToAsync(metadataAsSourceService);
                     }
 
-                    var texts = new Dictionary<INamedTypeSymbol, string>();
+                    var texts = new Dictionary<INamedTypeSymbol, string>(SymbolEqualityComparer.Default);
 
                     Parallel.ForEach(
                         types,
@@ -106,11 +106,14 @@ public static Solution LoadMetadataAsSourceSolution(string assemblyFilePath)
 
                                 if (Configuration.GenerateMetadataAsSourceBodies)
                                 {
+// inside Parallel.ForEach so synchronous block is acceptable
+#pragma warning disable VSTHRD002
                                     var document = addSourceToAsync(
                                                             tempDocument,
                                                             type,
                                                             CancellationToken.None).Result;
                                     text = document.GetTextAsync().Result.ToString();
+#pragma warning restore VSTHRD002
                                 }
 
                                 lock (texts)
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/ProjectGenerator.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/ProjectGenerator.cs
@@ -35,8 +35,8 @@ public ProjectGenerator(SolutionGenerator solutionGenerator, Project project) :
             this.SolutionGenerator = solutionGenerator;
             this.Project = project;
             this.ProjectFilePath = project.FilePath ?? solutionGenerator.ProjectFilePath;
-            this.DeclaredSymbols = new Dictionary<ISymbol, string>();
-            this.BaseMembers = new Dictionary<ISymbol, ISymbol>();
+            this.DeclaredSymbols = new Dictionary<ISymbol, string>(SymbolEqualityComparer.Default);
+            this.BaseMembers = new Dictionary<ISymbol, ISymbol>(SymbolEqualityComparer.Default);
             this.ImplementedInterfaceMembers = new MultiDictionary<ISymbol, ISymbol>();
             this.assemblyAttributesFileName = MetadataAsSource.GeneratedAssemblyAttributesFileName + (project.Language == LanguageNames.CSharp ? ".cs" : ".vb");
             PluginSymbolVisitors = SolutionGenerator.PluginAggregator?.ManufactureSymbolVisitors(project).ToArray();
@@ -167,7 +167,7 @@ public async Task Generate()
                     GenerateIndex();
                 }
 
-                var compilation = Project.GetCompilationAsync().Result;
+                var compilation = await Project.GetCompilationAsync();
                 var diagnostics = compilation.GetDiagnostics().Select(d => d.ToString()).ToArray();
                 if (diagnostics.Length > 0)
                 {
diff --git a/src/SourceBrowser/src/HtmlGenerator/Program.cs b/src/SourceBrowser/src/HtmlGenerator/Program.cs
diff --git a/src/SourceBrowser/src/HtmlGenerator/TypeForwardReader.cs b/src/SourceBrowser/src/HtmlGenerator/TypeForwardReader.cs
diff --git a/src/SourceBrowser/src/SourceIndexServer/Helpers.cs b/src/SourceBrowser/src/SourceIndexServer/Helpers.cs
diff --git a/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs b/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs
diff --git a/src/index/index.proj b/src/index/index.proj

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public static string TrimCompilerExeFromCommandLine(string commandLine, Compiler`
`160`	`160`
`161`	`161`	`foreach (var trim in stringsToTrim)`
`162`	`162`	`{`
`163`		`- if (commandLine.StartsWith(trim))`
	`163`	`+ if (commandLine.StartsWith(trim, StringComparison.Ordinal))`
`164`	`164`	`{`
`165`	`165`	`return commandLine.Substring(trim.Length);`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ static void Main(string[] args)`
`153`	`153`	`string projectRelativePath;`
`154`	`154`	`string outputFile;`
`155`	`155`	`string link = null;`
`156`		`- if (repoRelativePath.StartsWith("..\\") \|\| repoRelativePath.StartsWith("../") \|\| Path.IsPathRooted(repoRelativePath))`
	`156`	`+ if (repoRelativePath.StartsWith("..\\", StringComparison.Ordinal) \|\| repoRelativePath.StartsWith("../", StringComparison.Ordinal) \|\| Path.IsPathRooted(repoRelativePath))`
`157`	`157`	`{`
`158`	`158`	`string externalPath = Path.Join("_external", idx++.ToString(), Path.GetFileName(filePath));`
`159`	`159`	`// not in the repo dir, treat as external`
`@@ -163,7 +163,7 @@ static void Main(string[] args)`
`163`	`163`	`else`
`164`	`164`	`{`
`165`	`165`	`projectRelativePath = Path.GetRelativePath(invocation.ProjectDirectory, filePath);`
`166`		`- if (projectRelativePath.StartsWith(".."))`
	`166`	`+ if (projectRelativePath.StartsWith("..", StringComparison.Ordinal))`
`167`	`167`	`{`
`168`	`168`	`link = repoRelativePath;`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Microsoft.SourceBrowser.HtmlGenerator`
`5`	`5`	`{`
`6`	`6`	`public partial class DocumentGenerator`
`7`	`7`	`{`
`8`		`- private readonly Dictionary<ISymbol, int> localIds = new Dictionary<ISymbol, int>();`
	`8`	`+ private readonly Dictionary<ISymbol, int> localIds = new Dictionary<ISymbol, int>(SymbolEqualityComparer.Default);`
`9`	`9`
`10`	`10`	`private HtmlElementInfo HighlightDefinition(ISymbol declaredSymbol)`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ private void AddReferencesToImplementedMembers(`
`358`	`358`	`{`
`359`	`359`	`foreach (var member in implementedInterface.GetMembers())`
`360`	`360`	`{`
`361`		`- if (declaringType.FindImplementationForInterfaceMember(member) == declaredSymbol)`
	`361`	`+ if (declaredSymbol.Equals(declaringType.FindImplementationForInterfaceMember(member), SymbolEqualityComparer.Default))`
`362`	`362`	`{`
`363`	`363`	`ProcessReference(`
`364`	`364`	`range,`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ private ReferenceKind DetermineReferenceKind(SyntaxToken token, SyntaxNode node,`
`255`	`255`	`SemanticModel.GetDeclaredSymbol(typeDeclaration) is INamedTypeSymbol derivedType &&`
`256`	`256`	`referencedSymbol is INamedTypeSymbol baseSymbol)`
`257`	`257`	`{`
`258`		`- if (baseSymbol.TypeKind == TypeKind.Class && baseSymbol.Equals(derivedType.BaseType))`
	`258`	`+ if (baseSymbol.TypeKind == TypeKind.Class && baseSymbol.Equals(derivedType.BaseType, SymbolEqualityComparer.Default))`
`259`	`259`	`{`
`260`	`260`	`kind = ReferenceKind.DerivedType;`
`261`	`261`	`}`
`@@ -551,10 +551,10 @@ private string GetAssemblyFromSymbol(ISymbol symbol)`
`551`	`551`	`type = (ITypeSymbol)GetTypeFromSymbol(symbol);`
`552`	`552`	`string containingAssembly = type.ContainingAssembly.Name;`
`553`	`553`	`string typeDocId = (type?.OriginalDefinition ?? type).GetDocumentationCommentId();`
`554`		`- var seenAssemblies = new HashSet<string>();`
	`554`	`+ var seenAssemblies = new HashSet<string>();`
`555`	`555`	`while (projectGenerator.SolutionGenerator.TypeForwards.TryGetValue((containingAssembly, typeDocId), out var newAssembly))`
`556`	`556`	`{`
`557`		`- bool loop = !seenAssemblies.Add(newAssembly);`
	`557`	`+ bool loop = !seenAssemblies.Add(newAssembly);`
`558`	`558`	`lock (projectGenerator.ForwardedReferenceAssemblies)`
`559`	`559`	`{`
`560`	`560`	`projectGenerator.ForwardedReferenceAssemblies.Add(`
`@@ -564,12 +564,12 @@ private string GetAssemblyFromSymbol(ISymbol symbol)`
`564`	`564`	`if (loop)`
`565`	`565`	`{`
`566`	`566`	`break;`
`567`		`- }`
	`567`	`+ }`
`568`	`568`
`569`	`569`	`containingAssembly = newAssembly;`
`570`	`570`	`}`
`571`	`571`
`572`		`- return containingAssembly;`
	`572`	`+ return containingAssembly;`
`573`	`573`	`}`
`574`	`574`
`575`	`575`	`private static ISymbol GetTypeFromSymbol(ISymbol symbol)`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static Solution LoadMetadataAsSourceSolution(string assemblyFilePath)`
`90`	`90`	`addSourceToAsync = ReflectAddSourceToAsync(metadataAsSourceService);`
`91`	`91`	`}`
`92`	`92`
`93`		`- var texts = new Dictionary<INamedTypeSymbol, string>();`
	`93`	`+ var texts = new Dictionary<INamedTypeSymbol, string>(SymbolEqualityComparer.Default);`
`94`	`94`
`95`	`95`	`Parallel.ForEach(`
`96`	`96`	`types,`
`@@ -106,11 +106,14 @@ public static Solution LoadMetadataAsSourceSolution(string assemblyFilePath)`
`106`	`106`
`107`	`107`	`if (Configuration.GenerateMetadataAsSourceBodies)`
`108`	`108`	`{`
	`109`	`+// inside Parallel.ForEach so synchronous block is acceptable`
	`110`	`+#pragma warning disable VSTHRD002`
`109`	`111`	`var document = addSourceToAsync(`
`110`	`112`	`tempDocument,`
`111`	`113`	`type,`
`112`	`114`	`CancellationToken.None).Result;`
`113`	`115`	`text = document.GetTextAsync().Result.ToString();`
	`116`	`+#pragma warning restore VSTHRD002`
`114`	`117`	`}`
`115`	`118`
`116`	`119`	`lock (texts)`