[pull] main from microsoft:main

.github/skills/component-fixtures/SKILL.md

@@ -61,6 +61,26 @@ Key points:
 - Always register created widgets with `disposableStore.add(...)` to prevent leaks
 - Pass `colorTheme: theme` to `createEditorServices` so theme colors render correctly
 
+### File icon themes
+
+Fixtures use Seti file icons by default. Select another built-in theme, or disable file icons, on the individual fixture:
+
+```typescript
+defineComponentFixture({ fileIconTheme: 'vs-minimal', render: renderMyComponent });
+defineComponentFixture({ fileIconTheme: 'none', render: renderMyComponent });
+```
+
+When the rendered component reads `IThemeService`, pass the selected theme from `ComponentFixtureContext` to `createEditorServices`:
+
+```typescript
+function renderMyComponent({ disposableStore, theme, fileIconTheme }: ComponentFixtureContext): void {
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: theme,
+		fileIconTheme,
+	});
+}
+```
+
 ## Utilities from fixtureUtils.ts
 
 | Export | Purpose |

build/azure-pipelines/dependencies-check.yml

@@ -22,10 +22,13 @@ jobs:
     variables:
       VSCODE_ARCH: x64
     steps:
-      - task: NodeTool@0
+      - script: |
+          echo "##vso[task.setvariable variable=NODE_VERSION]$(cat .nvmrc)"
+        displayName: Read Node version from .nvmrc
+
+      - task: UseNode@1
         inputs:
-          versionSource: fromFile
-          versionFilePath: .nvmrc
+          version: $(NODE_VERSION)
 
       - task: AzureKeyVault@2
         displayName: "Azure Key Vault: Get GitHub token"
@@ -84,6 +87,30 @@ jobs:
       - script: |
           set -e
 
+          # Check if any build subfolders with package-lock.json were modified
+          git fetch origin main
+          CHANGED_FILES=$(git diff --name-only origin/main...HEAD)
+          MODIFIED_BUILD_FOLDERS=""
+
+          # Check if build/package-lock.json itself was modified
+          if echo "$CHANGED_FILES" | grep -q "^build/package-lock\.json$"; then
+            MODIFIED_BUILD_FOLDERS="build"
+            echo "build/package-lock.json was modified"
+          fi
+
+          # Find all modified package-lock.json files under build subfolders and extract their directories
+          for file in $CHANGED_FILES; do
+            if [[ $file =~ ^(build/.+)/package-lock\.json$ ]]; then
+              dir="${BASH_REMATCH[1]}"
+              if [[ ! " $MODIFIED_BUILD_FOLDERS " =~ " $dir " ]]; then
+                MODIFIED_BUILD_FOLDERS="$MODIFIED_BUILD_FOLDERS $dir"
+                echo "$dir was modified"
+              fi
+            fi
+          done
+
+          echo "##vso[task.setvariable variable=MODIFIED_BUILD_FOLDERS]$MODIFIED_BUILD_FOLDERS"
+
           for attempt in {1..120}; do
             if [ $attempt -gt 1 ]; then
               echo "Attempt $attempt: Waiting for 10 minutes before retrying..."
@@ -92,6 +119,15 @@ jobs:
 
             echo "Attempt $attempt: Running npm ci"
             if npm i --ignore-scripts; then
+              # Rebuild each modified build subfolder separately
+              for folder in $MODIFIED_BUILD_FOLDERS; do
+                echo "Rebuilding modified $folder..."
+                if ! (cd "$folder" && npm i --ignore-scripts); then
+                  echo "npm i failed for $folder on attempt $attempt"
+                  continue 2
+                fi
+              done
+
               if node build/npm/postinstall.ts; then
                 echo "npm i succeeded on attempt $attempt"
                 exit 0

build/azure-pipelines/product-build-ado-ci.yml

@@ -260,57 +260,63 @@ extends:
               - script: |
                   set -euo pipefail
 
-                  if [ "$(Build.Reason)" = "PullRequest" ]; then
-                    # Azure normally checks out a synthetic merge commit for PR validation. Its first
-                    # parent is the target and its second parent is the PR head. Fall back to finding
-                    # the merge base when the provider checks out the PR head directly.
-                    parent_count=$(git rev-list --parents -n 1 HEAD | awk '{ print NF - 1 }')
-                    if [ "$parent_count" = "2" ]; then
-                      base_sha=$(git rev-parse HEAD^1)
-                      head_sha=$(git rev-parse HEAD^2)
-                    else
-                      target_branch="$(System.PullRequest.TargetBranch)"
-                      target_branch="${target_branch#refs/heads/}"
-                      git fetch origin "$target_branch:refs/remotes/origin/$target_branch"
-                      head_sha=$(git rev-parse HEAD)
-                      base_sha=$(git merge-base "origin/$target_branch" "$head_sha")
-                    fi
+                  # Only validate trailers for PR builds
+                  if [ "$(Build.Reason)" != "PullRequest" ]; then
+                    echo "Skipping trailer check for non-PR builds"
+                    exit 0
+                  fi
+
+                  # Azure normally checks out a synthetic merge commit for PR validation. Its first
+                  # parent is the target and its second parent is the PR head. Fall back to finding
+                  # the merge base when the provider checks out the PR head directly.
+                  parent_count=$(git rev-list --parents -n 1 HEAD | awk '{ print NF - 1 }')
+                  if [ "$parent_count" = "2" ]; then
+                    base_sha=$(git rev-parse HEAD^1)
+                    head_sha=$(git rev-parse HEAD^2)
                   else
-                    # Manual builds validate the selected branch's latest commit.
+                    target_branch="$(System.PullRequest.TargetBranch)"
+                    target_branch="${target_branch#refs/heads/}"
+                    git fetch origin "$target_branch:refs/remotes/origin/$target_branch"
                     head_sha=$(git rev-parse HEAD)
-                    base_sha=$(git rev-parse HEAD^1)
+                    base_sha=$(git merge-base "origin/$target_branch" "$head_sha")
                   fi
 
-                  # MSRC pull requests must be squashed to one commit before validation succeeds.
-                  commit_count=$(git rev-list --count "$base_sha..$head_sha")
-                  if [ "$commit_count" != "1" ]; then
-                    echo "##vso[task.logissue type=error]This PR has $commit_count commits. release/msrc/* PRs must contain exactly one commit. Please squash your commits."
-                    exit 1
-                  fi
-                  echo "PR has a single commit."
+                  # Check each commit in the PR for the Msrc-Case-Id trailer
+                  commits=$(git rev-list "$base_sha..$head_sha")
+                  commits_with_trailer=0
+                  total_commits=0
 
-                  # Extract every Msrc-Case-Id trailer value from the PR head commit.
-                  mapfile -t trailer_values < <(
-                    git log -1 --pretty='format:%(trailers:key=Msrc-Case-Id,valueonly=true)' "$head_sha" |
-                      sed '/^[[:space:]]*$/d'
-                  )
+                  for commit in $commits; do
+                    total_commits=$((total_commits + 1))
 
-                  if [ "${#trailer_values[@]}" = "0" ]; then
-                    echo "##vso[task.logissue type=error]Commit $head_sha is missing the required 'Msrc-Case-Id' trailer."
-                    printf "Add a trailer to the commit message, for example:\n\n    Msrc-Case-Id: 12345\n\nIf there is no associated case ID, use N/A:\n\n    Msrc-Case-Id: N/A\n\n"
-                    exit 1
-                  fi
+                    # Extract Msrc-Case-Id trailer values from this commit
+                    mapfile -t trailer_values < <(
+                      git log -1 --pretty='format:%(trailers:key=Msrc-Case-Id,valueonly=true)' "$commit" |
+                        sed '/^[[:space:]]*$/d'
+                    )
+
+                    if [ "${#trailer_values[@]}" -gt 0 ]; then
+                      commits_with_trailer=$((commits_with_trailer + 1))
 
-                  # Every supplied case ID must be numeric or explicitly marked not applicable.
-                  for value in "${trailer_values[@]}"; do
-                    if [[ ! "$value" =~ ^[0-9]+$ && "$value" != "N/A" ]]; then
-                      echo "##vso[task.logissue type=error]Commit $head_sha has an invalid 'Msrc-Case-Id' trailer value. Expected a number or N/A."
-                      printf "Use a numeric case id or N/A, for example:\n\n    Msrc-Case-Id: 12345\n\n"
-                      exit 1
+                      # Validate all trailer values are numeric or N/A
+                      for value in "${trailer_values[@]}"; do
+                        if [[ ! "$value" =~ ^[0-9]+$ && "$value" != "N/A" ]]; then
+                          echo "##vso[task.logissue type=error]Commit $commit has an invalid 'Msrc-Case-Id' trailer value. Expected a number or N/A."
+                          printf "Use a numeric case id or N/A, for example:\n\n    Msrc-Case-Id: 12345\n\n"
+                          exit 1
+                        fi
+                      done
+
+                      echo "Commit $commit has the following 'Msrc-Case-Id' trailers: ${trailer_values[*]}"
                     fi
                   done
 
-                  echo "Commit $head_sha has the required 'Msrc-Case-Id' trailer."
+                  # At least one commit must have the Msrc-Case-Id trailer
+                  if [ "$commits_with_trailer" -lt 1 ]; then
+                    echo "##vso[task.logissue type=error]Expected at least one commit with 'Msrc-Case-Id' trailer, but found $commits_with_trailer out of $total_commits commits with a trailer."
+                    printf "Add a trailer to at least one commit message, for example:\n\n    Msrc-Case-Id: 12345\n\nIf there is no associated case ID, use N/A:\n\n    Msrc-Case-Id: N/A\n\n"
+                    exit 1
+                  fi
                 displayName: Verify Commit and Trailer
 
       - stage: Quality