Merge remote-tracking branch 'upstream/main' into fix-issue-10385

Author: filzrev

Directory.Packages.props

@@ -41,7 +41,7 @@
     <!-- Test only -->
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="FluentAssertions" Version="6.12.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
     <PackageVersion Include="Verify.Xunit" Version="28.3.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />

Dockerfile

@@ -1,32 +1,26 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-noble
 
 # Add dotnet tools to path.
 ENV PATH="${PATH}:/root/.dotnet/tools"
 
+# Set Node.js path
+ENV PLAYWRIGHT_NODEJS_PATH="/usr/bin/node"
+
 # Set target docfx version.
-ARG DOCFX_VERSION=2.77.0
+ARG DOCFX_VERSION=2.78.1
 
 # Install DocFX as a dotnet tool.
 RUN dotnet tool install docfx -g --version ${DOCFX_VERSION} && \
     docfx --version && \
     rm  -f /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/docfx.nupkg                         && \
     rm  -f /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/docfx.${DOCFX_VERSION}.nupkg        && \
-    rm -rf /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/tools/net6.0
-
-# Install Node.js and dependences for chromium PDF.
-RUN apt-get update -qq && \
-    apt-get install -y -qq --no-install-recommends \
-    nodejs \
-    libglib2.0-0 libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 \
-    libdbus-1-3 libxcb1 libxkbcommon0 libatspi2.0-0 libx11-6 libxcomposite1 libxdamage1 \
-    libxext6 libxfixes3 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 && \
-    rm -rf /var/lib/apt/lists/* /tmp/*
+    rm -rf /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/tools/net9.0
 
-# Install Chromium.
-RUN PLAYWRIGHT_NODEJS_PATH="/usr/bin/node" && \
-    ln -s /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/tools/.playwright /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/tools/net8.0/any/.playwright && \
-    pwsh -File /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/tools/net8.0/any/playwright.ps1 install chromium && \
-    unlink /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/tools/net8.0/any/.playwright
+# Install Node.js and browser(chromium) with dependencies
+RUN apt-get install -y -qq --update --no-install-recommends nodejs && \
+    pwsh -File /root/.dotnet/tools/.store/docfx/${DOCFX_VERSION}/docfx/${DOCFX_VERSION}/tools/net8.0/any/playwright.ps1 install --with-deps chromium && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/*
 
 WORKDIR /opt/prj
 VOLUME [ "/opt/prj" ]

src/Docfx.App/PdfBuilder.cs

@@ -357,6 +357,8 @@ async Task MergePdf()
                 if (!pageBytes.TryGetValue(node, out var bytes))
                     continue;
 
+                var isCoverPage = url.AbsolutePath.TrimStart('/').Equals(outline.pdfCoverPage, GetStringComparison());
+
                 var isTocPage = IsTocPage(url);
                 if (isTocPage)
                 {
@@ -375,6 +377,9 @@ async Task MergePdf()
 
                     var pageBuilder = builder.AddPage(document, i, x => CopyLink(node, x));
 
+                    if (isCoverPage)
+                        continue;
+
                     if (isTocPage)
                         continue;
 
@@ -615,4 +620,12 @@ static string getMillimeter(double pt)
             return $"{Math.Round(pt * MillimeterPerInch / Dpi)}mm";
         }
     }
+
+    // Gets StringComparison instance for path string.
+    private static StringComparison GetStringComparison()
+    {
+        return PathUtility.IsPathCaseInsensitive()
+            ? StringComparison.OrdinalIgnoreCase
+            : StringComparison.Ordinal;
+    }
 }

src/Docfx.Dotnet/SymbolUrlResolver.SourceLink.cs

@@ -89,8 +89,15 @@ public SourceLinkProvider(PEReader peReader, MetadataReaderProvider pdbReaderPro
         private string? TryGetSourceLinkUrl(DocumentHandle handle)
         {
             var document = _pdbReader.GetDocument(handle);
-            if (document.Name.IsNil)
+            try
+            {
+                if (document.Name.IsNil)
+                    return null;
+            }
+            catch (BadImageFormatException)
+            {
                 return null;
+            }
 
             var documentName = _pdbReader.GetString(document.Name);
             if (documentName is null)

templates/modern/src/docfx.scss

@@ -3,13 +3,12 @@
  * The .NET Foundation licenses this file to you under the MIT license.
  */
 
-$enable-important-utilities: false;
-$container-max-widths: (
-  xxl: 1768px
-) !default;
-
 @use "mixins";
-@use "bootstrap/scss/bootstrap";
+@use "bootstrap/scss/bootstrap" with (
+  $container-max-widths: (
+    xxl: 1768px
+  )
+);
 @use "highlight";
 @use "layout";
 @use "nav";

templates/package-lock.json

@@ -41,16 +41,16 @@
   },
   "devDependencies": {
     "@types/lunr": "^2.3.7",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.16.0",
+    "@typescript-eslint/parser": "^8.16.0",
     "browser-sync": "^3.0.3",
     "esbuild": "~0.24.0",
     "esbuild-sass-plugin": "~3.3.1",
     "eslint": "^8.57.1",
     "eslint-config-standard": "^17.1.0",
     "stylelint": "^16.10.0",
     "stylelint-config-standard-scss": "^13.1.0",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
     "yargs": "^17.7.2"
   }
 }