Update SourceBrowser and fix build command to not fail (#74)

alexperovich · web-flow · commit 2be8e14d6bed · 2021-01-04T23:25:53.000-08:00
diff --git a/src/SourceBrowser.hash b/src/SourceBrowser.hash
@@ -1 +1 @@
-f17e41ea339189d6cf3355bd0edc0a6da59e64e0
+308ba8f368eff530cba7587a2a46364f7d80cc1f
diff --git a/src/SourceBrowser/src/Common/Common.csproj b/src/SourceBrowser/src/Common/Common.csproj
@@ -9,7 +9,7 @@
     <DefineConstants>$(DefineConstants);NET472</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="16.6.0" />
-    <PackageReference Include="System.Reactive" Version="4.1.5" />
+    <PackageReference Include="Microsoft.Build" Version="16.8.0" />
+    <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
@@ -14,8 +14,8 @@
   <PropertyGroup>
     <NuGetPackageId>SourceBrowser</NuGetPackageId>
     <NuSpecFile>$(MSBuildProjectDirectory)\$(NuGetPackageId).nuspec</NuSpecFile>
-    <NuGetVersion>1.0.33</NuGetVersion>
-    <NuGetVersionRoslyn>3.8.0-3.final</NuGetVersionRoslyn>
+    <NuGetVersion>1.0.34</NuGetVersion>
+    <NuGetVersionRoslyn>3.9.0-2.final</NuGetVersionRoslyn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="..\..\lib\Microsoft.CodeAnalysis.Workspaces.Desktop.dll" />
@@ -38,13 +38,13 @@
   <ItemGroup>
     <PackageReference Include="ExceptionAnalysis.Diagnostics" Version="1.0.0.39796" />
     <PackageReference Include="ManagedEsent" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Build" Version="16.6.0" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="16.6.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build" Version="16.8.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.6.0" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.6.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.8.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="$(NuGetVersionRoslyn)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -56,9 +56,9 @@
     <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.133" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.215" />
     <PackageReference Include="GuiLabs.Language.Xml" Version="1.2.46" />
-    <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="16.4.280" />
+    <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="16.8.239" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" PrivateAssets="All" />
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/ProjectGenerator.MetadataToSourceRedirect.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/ProjectGenerator.MetadataToSourceRedirect.cs
@@ -9,7 +9,7 @@ namespace Microsoft.SourceBrowser.HtmlGenerator
     public partial class ProjectGenerator
     {
         /// <summary>
-        /// Since the only requirement on the ID strings we use in the a.html file
+        /// Since the only requirement on the ID strings we use in the A.html file
         /// is that there are no collisions (and even if there are, the failure
         /// would be rare and impact would be limited), we don't really need 16
         /// bytes per ID. Let's just store the first 8 bytes (I've actually calculated
diff --git a/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/ProjectGenerator.cs b/src/SourceBrowser/src/HtmlGenerator/Pass1-Generation/ProjectGenerator.cs
@@ -213,7 +213,7 @@ private Task GenerateDocument(Document document)
 
         private void GenerateIndex()
         {
-            Log.Write("Index.html...");
+            Log.Write("index.html...");
             var index = Path.Combine(ProjectDestinationFolder, "index.html");
             var sb = new StringBuilder();
             Markup.WriteProjectIndex(sb, Project.AssemblyName);
diff --git a/src/SourceBrowser/src/HtmlGenerator/Program.cs b/src/SourceBrowser/src/HtmlGenerator/Program.cs
@@ -189,7 +189,7 @@ private static void Main(string[] args)
 
             if (Paths.SolutionDestinationFolder == null)
             {
-                Paths.SolutionDestinationFolder = Path.Combine(Microsoft.SourceBrowser.Common.Paths.BaseAppFolder, "Index");
+                Paths.SolutionDestinationFolder = Path.Combine(Microsoft.SourceBrowser.Common.Paths.BaseAppFolder, "index");
             }
 
             var websiteDestination = Paths.SolutionDestinationFolder;
diff --git a/src/SourceBrowser/src/HtmlGenerator/Utilities/DeclaredSymbolInfo.cs b/src/SourceBrowser/src/HtmlGenerator/Utilities/DeclaredSymbolInfo.cs
@@ -87,7 +87,7 @@ public bool Equals(DeclaredSymbolInfo other)
                 Description == other.Description;
         }
 
-        public string GetUrl() => "/" + AssemblyName + "/a.html#" + Serialization.ULongToHexString(ID);
+        public string GetUrl() => "/" + AssemblyName + "/A.html#" + Serialization.ULongToHexString(ID);
 
         public override bool Equals(object obj)
         {
diff --git a/src/SourceBrowser/src/HtmlGenerator/Utilities/Markup.cs b/src/SourceBrowser/src/HtmlGenerator/Utilities/Markup.cs
@@ -342,7 +342,7 @@ public static string GetResultsHtmlPrefix()
         public static string GetResultsHtmlSuffix(bool emitSolutionBrowserLink)
         {
             var solutionExplorerLink = emitSolutionBrowserLink
-                ? @"<div class=""note"">Try also browsing the <a href=""solutionexplorer.html"" class=""blueLink"">solution explorer</a>.</div>"
+                ? @"<div class=""note"">Try also browsing the <a href=""SolutionExplorer.html"" class=""blueLink"">solution explorer</a>.</div>"
                 : null;
 
             return "</div></div>" + solutionExplorerLink + "</body></html>";
@@ -444,19 +444,19 @@ private static string GetGlyph(DeclaredSymbolInfo symbol)
             var result = symbol.Glyph;
             if (result == 196)
             {
-                return "CSharp";
+                return "csharp";
             }
             else if (result == 195)
             {
-                return "VB";
+                return "vb";
             }
             else if (result == 227)
             {
                 return "xaml";
             }
             else if (result == 228)
             {
-                return "TypeScript";
+                return "typescript";
             }
 
             return result.ToString();
diff --git a/src/SourceBrowser/src/SourceIndexServer/Models/DeclaredSymbolInfo.cs b/src/SourceBrowser/src/SourceIndexServer/Models/DeclaredSymbolInfo.cs
@@ -70,7 +70,7 @@ public bool Equals(DeclaredSymbolInfo other)
 
         public string GetUrl()
         {
-            return "/" + AssemblyName + "/a.html#" + Serialization.ULongToHexString(ID);
+            return "/" + AssemblyName + "/A.html#" + Serialization.ULongToHexString(ID);
         }
 
         public override bool Equals(object obj)
diff --git a/src/SourceBrowser/src/SourceIndexServer/Startup.cs b/src/SourceBrowser/src/SourceIndexServer/Startup.cs
@@ -21,9 +21,9 @@ public Startup(IWebHostEnvironment env)
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            RootPath = Path.Combine(Environment.ContentRootPath, "Index");
+            RootPath = Path.Combine(Environment.ContentRootPath, "index");
 
-            var subfolder = Path.Combine(RootPath, "Index");
+            var subfolder = Path.Combine(RootPath, "index");
             if (File.Exists(Path.Combine(subfolder, "Projects.txt")))
             {
                 RootPath = subfolder;
diff --git a/src/SourceBrowser/src/SourceIndexServer/wwwroot/overview.html b/src/SourceBrowser/src/SourceIndexServer/wwwroot/overview.html
@@ -95,7 +95,7 @@ <h3>Easy hyperlinks to files, types, members, projects/assemblies</h3>
         </tr>
         <tr>
             <td class="ex">Link to a type/member</td>
-            <td class="ex"><a class="blueLink" href="/mscorlib/a.html#1f55292c3174123d" target="_top">/mscorlib/a.html#1f55292c3174123d</a> (right-click the definition and choose Copy Shortcut)</td>
+            <td class="ex"><a class="blueLink" href="/mscorlib/A.html#1f55292c3174123d" target="_top">/mscorlib/A.html#1f55292c3174123d</a> (right-click the definition and choose Copy Shortcut)</td>
         </tr>
         <tr>
             <td class="ex">Link to search results</td>
diff --git a/src/SourceBrowser/src/SourceIndexServer/wwwroot/scripts.js b/src/SourceBrowser/src/SourceIndexServer/wwwroot/scripts.js
@@ -158,7 +158,7 @@ function processHash() {
             redirectLocation(n, "/" + potentialFile + "/namespaces.html");
         }
     } else if (useSolutionExplorer) {
-        redirectLocation(n, "solutionexplorer.html");
+        redirectLocation(n, "SolutionExplorer.html");
     }
 }
 
@@ -686,7 +686,7 @@ function redirect(map, prefixLength) {
     }
 }
 
-// multi-staged redirect a.html -> a0.html -> filePath.html (to reduce size of a.html)
+// multi-staged redirect A.html -> A0.html -> filePath.html (to reduce size of a.html)
 function redirectToNextLevelRedirectFile() {
     var anchor = document.location.hash;
     if (anchor) {
@@ -1055,7 +1055,7 @@ function redirectToIndex() {
 // this is called when the references file (/R/id.html) is loaded in the top frame
 function redirectToSymbolReferences() {
     var referencesFilePath = this.document.location.href;
-    var destination = referencesFilePath.replace("/R/", "/a.html" + "#");
+    var destination = referencesFilePath.replace("/R/", "/A.html" + "#");
 
     // strip off the ".html" suffix
     destination = destination.slice(0, destination.length - 5);
diff --git a/src/index/repositories.props b/src/index/repositories.props
@@ -2,14 +2,14 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ArcadeBuildCmd>
-      powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
+      powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -nodeReuse:$false"
     </ArcadeBuildCmd>
   </PropertyGroup>
   <ItemGroup>
     <Repository Include="runtime">
       <Url>https://github.com/dotnet/runtime</Url>
       <PrepareCommand>
-        build.cmd -subset libs.ref+libs.src -binarylog -os Linux -ci /p:ILLinkTrimAssembly=false
+        build.cmd -subset libs.ref+libs.src -binarylog -os Linux -nodeReuse:0 /p:ILLinkTrimAssembly=false
       </PrepareCommand>
     </Repository>
     <Repository Include="winforms">

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f17e41ea339189d6cf3355bd0edc0a6da59e64e0`
	`1`	`+308ba8f368eff530cba7587a2a46364f7d80cc1f`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Microsoft.SourceBrowser.HtmlGenerator`
`9`	`9`	`public partial class ProjectGenerator`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`		`- /// Since the only requirement on the ID strings we use in the a.html file`
	`12`	`+ /// Since the only requirement on the ID strings we use in the A.html file`
`13`	`13`	`/// is that there are no collisions (and even if there are, the failure`
`14`	`14`	`/// would be rare and impact would be limited), we don't really need 16`
`15`	`15`	`/// bytes per ID. Let's just store the first 8 bytes (I've actually calculated`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ private Task GenerateDocument(Document document)`
`213`	`213`
`214`	`214`	`private void GenerateIndex()`
`215`	`215`	`{`
`216`		`- Log.Write("Index.html...");`
	`216`	`+ Log.Write("index.html...");`
`217`	`217`	`var index = Path.Combine(ProjectDestinationFolder, "index.html");`
`218`	`218`	`var sb = new StringBuilder();`
`219`	`219`	`Markup.WriteProjectIndex(sb, Project.AssemblyName);`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private static void Main(string[] args)`
`189`	`189`
`190`	`190`	`if (Paths.SolutionDestinationFolder == null)`
`191`	`191`	`{`
`192`		`- Paths.SolutionDestinationFolder = Path.Combine(Microsoft.SourceBrowser.Common.Paths.BaseAppFolder, "Index");`
	`192`	`+ Paths.SolutionDestinationFolder = Path.Combine(Microsoft.SourceBrowser.Common.Paths.BaseAppFolder, "index");`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`var websiteDestination = Paths.SolutionDestinationFolder;`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public bool Equals(DeclaredSymbolInfo other)`
`87`	`87`	`Description == other.Description;`
`88`	`88`	`}`
`89`	`89`
`90`		`- public string GetUrl() => "/" + AssemblyName + "/a.html#" + Serialization.ULongToHexString(ID);`
	`90`	`+ public string GetUrl() => "/" + AssemblyName + "/A.html#" + Serialization.ULongToHexString(ID);`
`91`	`91`
`92`	`92`	`public override bool Equals(object obj)`
`93`	`93`	`{`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public static string GetResultsHtmlPrefix()`
`342`	`342`	`public static string GetResultsHtmlSuffix(bool emitSolutionBrowserLink)`
`343`	`343`	`{`
`344`	`344`	`var solutionExplorerLink = emitSolutionBrowserLink`
`345`		`- ? @"<div class=""note"">Try also browsing the <a href=""solutionexplorer.html"" class=""blueLink"">solution explorer</a>.</div>"`
	`345`	`+ ? @"<div class=""note"">Try also browsing the <a href=""SolutionExplorer.html"" class=""blueLink"">solution explorer</a>.</div>"`
`346`	`346`	`: null;`
`347`	`347`
`348`	`348`	`return "</div></div>" + solutionExplorerLink + "</body></html>";`
`@@ -444,19 +444,19 @@ private static string GetGlyph(DeclaredSymbolInfo symbol)`
`444`	`444`	`var result = symbol.Glyph;`
`445`	`445`	`if (result == 196)`
`446`	`446`	`{`
`447`		`- return "CSharp";`
	`447`	`+ return "csharp";`
`448`	`448`	`}`
`449`	`449`	`else if (result == 195)`
`450`	`450`	`{`
`451`		`- return "VB";`
	`451`	`+ return "vb";`
`452`	`452`	`}`
`453`	`453`	`else if (result == 227)`
`454`	`454`	`{`
`455`	`455`	`return "xaml";`
`456`	`456`	`}`
`457`	`457`	`else if (result == 228)`
`458`	`458`	`{`
`459`		`- return "TypeScript";`
	`459`	`+ return "typescript";`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`return result.ToString();`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public bool Equals(DeclaredSymbolInfo other)`
`70`	`70`
`71`	`71`	`public string GetUrl()`
`72`	`72`	`{`
`73`		`- return "/" + AssemblyName + "/a.html#" + Serialization.ULongToHexString(ID);`
	`73`	`+ return "/" + AssemblyName + "/A.html#" + Serialization.ULongToHexString(ID);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ public Startup(IWebHostEnvironment env)`
`21`	`21`	`// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940`
`22`	`22`	`public void ConfigureServices(IServiceCollection services)`
`23`	`23`	`{`
`24`		`- RootPath = Path.Combine(Environment.ContentRootPath, "Index");`
	`24`	`+ RootPath = Path.Combine(Environment.ContentRootPath, "index");`
`25`	`25`
`26`		`- var subfolder = Path.Combine(RootPath, "Index");`
	`26`	`+ var subfolder = Path.Combine(RootPath, "index");`
`27`	`27`	`if (File.Exists(Path.Combine(subfolder, "Projects.txt")))`
`28`	`28`	`{`
`29`	`29`	`RootPath = subfolder;`