Merge branch 'main' into pytest-version-min

Author: eleanorjboyd

.pipelines/azure-pipelines.main.yml

@@ -0,0 +1,50 @@
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+    - .config
+    - .devcontainer
+    - .pipelines
+    - .vscode
+pr: none
+
+resources:
+  repositories:
+    - repository: 1esPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+  pipelines:
+    - pipeline: vscode-website-prod
+      source: vscode-website (official)
+      branch: release/prod
+      trigger: true
+
+variables:
+  Codeql.Enabled: true
+  Codeql.SourceRoot: $(Pipeline.Workspace)/vscode-website
+  Codeql.TSAEnabled: true
+  Codeql.TSAOptionsPath: $(Build.SourcesDirectory)/.config/tsaoptions.json
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      credscan:
+        suppressionsFile: $(Build.SourcesDirectory)/.config/CredScanSuppressions.json
+      git:
+        fetchDepth: 1
+        lfs: true
+        retryCount: 3
+      policheck:
+        break: true
+      sourceAnalysisPool: 1es-windows-2022-x64
+      tsa:
+        enabled: true
+
+    stages:
+    - template: templates/stages/build-main.yml@self

.pipelines/azure-pipelines.vnext.yml

@@ -0,0 +1,44 @@
+trigger:
+  batch: true
+  branches:
+    include:
+      - vnext
+  paths:
+    exclude:
+    - .config
+    - .devcontainer
+    - .pipelines
+    - .vscode
+pr: none
+
+resources:
+  repositories:
+    - repository: 1esPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+  pipelines:
+    - pipeline: vscode-website-main
+      source: vscode-website (buddy)
+      branch: main
+      trigger: true
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      credscan:
+        suppressionsFile: $(Build.SourcesDirectory)/.config/CredScanSuppressions.json
+      git:
+        fetchDepth: 1
+        lfs: true
+        retryCount: 3
+      policheck:
+        break: true
+      sourceAnalysisPool: 1es-windows-2022-x64
+      tsa:
+        enabled: true
+
+    stages:
+    - template: templates/stages/build-vnext.yml@self

.pipelines/onebranch.buddy.yml

@@ -8,15 +8,18 @@ jobs:
 - job:
   displayName: ${{ parameters.jobDisplayName }}
   pool:
-    type: windows
-
-  variables:
-    ob_outputDirectory: $(Build.ArtifactStagingDirectory)/out
-    ob_artifactSuffix: ${{ parameters.jobDisplayName }}
-    ob_git_path: vscode-website/vscode-docs
-    ob_sdl_codeSignValidation_excludes: -|**\*.js;-|**\*.ps1
+    name: 1es-windows-2022-x64
+    os: Windows
+  templateContext:
+    outputs:
+      - output: pipelineArtifact
+        targetPath: $(Build.ArtifactStagingDirectory)/out
+        artifactName: drop_Build_${{ parameters.jobDisplayName }}
 
   steps:
+  - checkout: self
+    path: vscode-docs
+
   - download: ${{ parameters.artifactName }}
     artifact: drop_Build_Linux
     displayName: Download ${{ parameters.artifactName }}
@@ -26,11 +29,14 @@ jobs:
       contents: '**'
       sourceFolder: $(Pipeline.Workspace)/${{ parameters.artifactName }}/drop_Build_Linux
       targetFolder: $(Pipeline.Workspace)/vscode-website
-    displayName: Copy ${{ parameters.artifactName }}
+    displayName: Copy ${{ parameters.artifactName }} to vscode-website
 
-  - task: CodeQL3000Init@0
-    displayName: CodeQL Initialize
-    condition: eq(variables['Codeql.enabled'], 'True')
+  - task: CopyFiles@2
+    inputs:
+      contents: '**'
+      sourceFolder: $(Pipeline.Workspace)/vscode-docs
+      targetFolder: $(Pipeline.Workspace)/vscode-website/vscode-docs
+    displayName: Copy vscode-docs into vscode-website
 
   - task: NodeTool@0
     displayName: Install Node via .nvmrc
@@ -69,27 +75,10 @@ jobs:
     displayName: Rebuild Dist From Website
     workingDirectory: $(Pipeline.Workspace)/vscode-website
 
-  - script: npm install
-    displayName: Install Dist dependencies
-    workingDirectory: $(Pipeline.Workspace)/vscode-website/dist
-
-  - task: CodeQL3000Finalize@0
-    displayName: CodeQL Finalize
-    condition: eq(variables['Codeql.enabled'], 'True')
-
   - task: ArchiveFiles@2
     inputs:
       rootFolderOrFile: $(Pipeline.Workspace)/vscode-website/dist
       archiveType: 'zip'
       includeRootFolder: false
       archiveFile: $(Build.ArtifactStagingDirectory)/out/website.zip
     displayName: Archive complete website
-
-  - task: ArchiveFiles@2
-    inputs:
-      rootFolderOrFile: $(Pipeline.Workspace)/vscode-website/dist/client/assets
-      archiveType: 'zip'
-      includeRootFolder: false
-      archiveFile: $(Build.ArtifactStagingDirectory)/out/website-assets.zip
-    displayName: Archive website assets
-    condition: ${{ eq(parameters.jobDisplayName, 'vscode-site-vnext') }}

.pipelines/onebranch.official.yml

@@ -1,7 +1,7 @@
 stages:
 - stage: Build
   jobs:
-  - template: ..\jobs\build.yml
+  - template: ../jobs/build.yml@self
     parameters:
       jobDisplayName: vscode-site-prod
       artifactName: vscode-website-prod

.pipelines/templates/jobs/build.yml

@@ -1,7 +1,7 @@
 stages:
 - stage: Build
   jobs:
-  - template: ..\jobs\build.yml
+  - template: ../jobs/build.yml@self
     parameters:
       jobDisplayName: vscode-site-vnext
       artifactName: vscode-website-main

.pipelines/templates/stages/build-official.yml renamed to .pipelines/templates/stages/build-main.yml

@@ -82,6 +82,4 @@ The history of this repo before we adopted LFS can be found at [microsoft/vscode
 
 ## Publishing
 
-Steps for how to publish documentation changes can be found [here](https://github.com/microsoft/vscode-website#publishing-a-documentation-change) in the (private) repository of the VS Code website.
-
 Publishing merged pull requests is not automatic and is initiated manually after changes have been reviewed on an internal staging server. There is no specific time guarantee for when PR updates will be available on https://code.visualstudio.com but the intent is that they will usually be live within 24 hours.

.pipelines/templates/stages/build-buddy.yml renamed to .pipelines/templates/stages/build-vnext.yml

@@ -1,7 +1,7 @@
 ---
 # DO NOT TOUCH — Managed by doc writer
 ContentId: 106AA11C-DB26-493A-9E3C-16F513B2AEC8
-DateApproved: 10/03/2024
+DateApproved: 12/11/2024
 
 # Summarize the whole topic in less than 300 characters for SEO purpose
 MetaDescription: The Visual Studio Code Extension Host is responsible for managing extensions and ensuring the stability and performance of Visual Studio Code.

README.md

@@ -1,6 +1,6 @@
 ---
 ContentId: 5c708951-e566-42db-9d97-e9715d95cdd1
-DateApproved: 10/03/2024
+DateApproved: 12/11/2024
 
 # Summarize the whole topic in less than 300 characters for SEO purpose
 MetaDescription: A guide to adding Visual Studio Code Remote Development and GitHub Codespaces support to extensions