Merge to vs (1.31.1)

.github/actions/package.json

@@ -10,12 +10,12 @@
   "keywords": [],
   "author": "",
   "dependencies": {
-    "@actions/core": "^1.9.1",
-    "@actions/github": "^6.0.0",
+    "@actions/core": "^2.0.3",
+    "@actions/github": "^8.0.1",
     "@octokit/rest": "^21.1.1",
     "@slack/web-api": "^6.9.1",
     "applicationinsights": "^2.5.1",
-    "axios": "^1.12.1",
+    "axios": "^1.13.5",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

Build/package/cpptools_extension_pack.yml

@@ -44,5 +44,5 @@ extends:
 
       - template: /Build/package/jobs_package_vsix.yml@self
         parameters:
-          vsixName: cpptools-extension-pack.vsix
+          vsixName: cpptools-extension-pack
           srcDir: ExtensionPack

Build/package/cpptools_themes.yml

@@ -44,5 +44,5 @@ extends:
 
       - template: /Build/package/jobs_package_vsix.yml@self
         parameters:
-          vsixName: cpptools-themes.vsix
+          vsixName: cpptools-themes
           srcDir: Themes

Build/package/jobs_package_vsix.yml

@@ -11,7 +11,7 @@ parameters:
 
 jobs:
 - job: package
-  displayName: Build ${{ parameters.vsixName }}
+  displayName: Build ${{ parameters.vsixName }}.vsix
   timeoutInMinutes: 30
   cancelTimeoutInMinutes: 1
   templateContext:
@@ -26,7 +26,7 @@ jobs:
       autoBaseline: false
     outputs:
     - output: pipelineArtifact
-      displayName: '${{ parameters.vsixName }}'
+      displayName: '${{ parameters.vsixName }}.vsix'
       targetPath: $(Build.ArtifactStagingDirectory)\vsix
       artifactName: vsix
 
@@ -38,10 +38,8 @@ jobs:
     inputs:
       version: 22.x
 
-  - task: Npm@0
-    displayName: Install vsce
-    inputs:
-      arguments: --global @vscode/vsce
+  - script: npm install --global @vscode/vsce@3.1.1
+    displayName: install vsce@3.1.1
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     displayName: Use Yarn 1.x
@@ -51,11 +49,27 @@ jobs:
 
   - script: |
       cd $(Build.SourcesDirectory)\${{ parameters.srcDir }}
-      vsce package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}
+      vsce package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix
     displayName: Run VSCE to package vsix
 
-  - task: Npm@0
-    displayName: Uninstall vsce
+# sign the vsix
+  - script: vsce generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest
+    displayName: generate manifest
+    workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
+  - script: copy $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s
+    displayName: prepare manifest for signing
+    workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
+  - task: NuGetToolInstaller@1
+    displayName: Install NuGet
+  - task: NuGetAuthenticate@1
+    displayName: Authenticate NuGet
+  - script: nuget restore $(Build.SourcesDirectory)\Build\signing\SignVsix.proj -PackagesDirectory $(Build.SourcesDirectory)\Build\signing\packages -ConfigFile $(Build.SourcesDirectory)\Build\signing\NuGet.config
+    displayName: Restore MicroBuild Core
+  - task: MSBuild@1
+    displayName: Sign the vsix
     inputs:
-      command: uninstall
-      arguments: --global @vscode/vsce
+      solution: $(Build.SourcesDirectory)\Build\signing\SignVsix.proj
+      msbuildArguments: /p:SignType=${{ parameters.signType }}
+
+  - script: npm uninstall --global @vscode/vsce
+    displayName: uninstall vsce

Build/publish/cpptools_extension_pack.yml

@@ -39,5 +39,5 @@ extends:
       jobs:
       - template: /Build/publish/jobs_publish_vsix.yml@self
         parameters:
-          vsixName: cpptools-extension-pack.vsix
+          vsixName: cpptools-extension-pack
 

Build/publish/cpptools_themes.yml

@@ -39,5 +39,5 @@ extends:
       jobs:
       - template: /Build/publish/jobs_publish_vsix.yml@self
         parameters:
-          vsixName: cpptools-themes.vsix
+          vsixName: cpptools-themes
 

Build/publish/jobs_publish_vsix.yml

@@ -37,7 +37,7 @@ jobs:
         Write-Host "##vso[task.setvariable variable=AAD_TOKEN;issecret=true]$aadToken"
 
   - script: |
-      vsce publish --packagePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}
+      npx @vscode/vsce@latest publish -i $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.vsix --manifestPath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.manifest --signaturePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s
     displayName: Publish to Marketplace
     env:
       VSCE_PAT: $(AAD_TOKEN)

Build/signing/NuGet.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="Engineering" value="https://pkgs.dev.azure.com/devdiv/_packaging/MicroBuildToolset/nuget/v3/index.json" />
+  </packageSources>
+</configuration>

Extension/.scripts/clean.ts

@@ -18,25 +18,28 @@ export async function main() {
 }
 
 export async function all() {
-    await rimraf(...(await getModifiedIgnoredFiles()).filter(each => !each.includes('node_modules')));
+    await rimraf(...(await getModifiedIgnoredFiles()).filter((each): each is string => each !== undefined && !each.includes('node_modules')));
 }
 
 export async function reset() {
     verbose(`Resetting all .gitignored files in extension`);
-    await rimraf(...await getModifiedIgnoredFiles());
+    await rimraf(...(await getModifiedIgnoredFiles()).filter((each): each is string => each !== undefined));
 }
 
 async function details(files: string[]) {
-    let all = await Promise.all(files.filter(each => each).map(async (each) => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const [filename, stats ] = await filepath.stats(each);
+    const results = await Promise.all(files.filter(each => each).map(async (each) => {
+        const [, stats] = await filepath.stats(each);
+        if (!stats) {
+            return null;
+        }
         return {
             filename: stats.isDirectory() ? cyan(`${each}${sep}**`) : brightGreen(`${each}`),
             date: stats.mtime.toLocaleDateString().replace(/\b(\d)\//g, '0$1\/'),
             time: stats.mtime.toLocaleTimeString().replace(/^(\d)\:/g, '0$1:'),
             modified: stats.mtime
         };
     }));
+    let all = results.filter((each): each is NonNullable<typeof each> => each !== null);
     all = all.sort((a, b) => a.modified.getTime() - b.modified.getTime());
     // print a formatted table so the date and time are aligned
     const max = all.reduce((max, each) => Math.max(max, each.filename.length), 0);
@@ -56,7 +59,7 @@ export async function show(opt?: string) {
         case 'ignored':
         case 'untracked':
             console.log(cyan('\n\nUntracked+Ignored files:'));
-            return details(await getModifiedIgnoredFiles());
+            return details((await getModifiedIgnoredFiles()).filter((each): each is string => each !== undefined));
 
         default:
             return error(`Unknown option '${opt}'`);

Extension/.scripts/common.ts

@@ -54,11 +54,12 @@ export async function getModifiedIgnoredFiles() {
     }
 
     // return the full path of files that would be removed.
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     return Promise.all(stdio.filter("Would remove").map((s) => filepath.exists(s.replace(/^Would remove /, ''), $root)).filter(p => p));
 }
 
 export async function rimraf(...paths: string[]) {
-    const all = [];
+    const all: Promise<void>[] = [];
     for (const each of paths) {
         if (!each) {
             continue;
@@ -82,6 +83,9 @@ export async function mkdir(filePath: string) {
         }
         throw new Error(`Cannot create directory '${filePath}' because there is a file there.`);
     }
+    if (!fullPath) {
+        throw new Error(`Cannot create directory '${filePath}' because the path is invalid.`);
+    }
 
     await md(fullPath, { recursive: true });
     return fullPath;
@@ -258,7 +262,7 @@ export function position(text: string) {
     return gray(`${text}`);
 }
 
-export async function assertAnyFolder(oneOrMoreFolders: string | string[], errorMessage?: string): Promise<string> {
+export async function assertAnyFolder(oneOrMoreFolders: string | string[], errorMessage?: string): Promise<string | undefined> {
     oneOrMoreFolders = is.array(oneOrMoreFolders) ? oneOrMoreFolders : [oneOrMoreFolders];
     for (const each of oneOrMoreFolders) {
         const result = await filepath.isFolder(each, $root);
@@ -275,7 +279,7 @@ export async function assertAnyFolder(oneOrMoreFolders: string | string[], error
     }
 }
 
-export async function assertAnyFile(oneOrMoreFiles: string | string[], errorMessage?: string): Promise<string> {
+export async function assertAnyFile(oneOrMoreFiles: string | string[], errorMessage?: string): Promise<string | undefined> {
     oneOrMoreFiles = is.array(oneOrMoreFiles) ? oneOrMoreFiles : [oneOrMoreFiles];
     for (const each of oneOrMoreFiles) {
         const result = await filepath.isFile(each, $root);
@@ -325,7 +329,6 @@ export async function checkDTS() {
     let failing = false;
     failing = !await assertAnyFile('vscode.d.ts') && (quiet || warn(`The VSCode import file '${$root}/dist/src/vscode.d.ts is missing.`)) || failing;
     failing = !await assertAnyFile('vscode.proposed.terminalDataWriteEvent.d.ts') && (quiet || warn(`The VSCode import file '${$root}/dist/src/vscode.proposed.terminalDataWriteEvent.d.ts is missing.`)) || failing;
-    failing = !await assertAnyFile('vscode.proposed.lmTools.d.ts') && (quiet || warn(`The VSCode import file '${$root}/dist/src/vscode.proposed.lmTools.d.ts is missing.`)) || failing;
 
     if (!failing) {
         verbose('VSCode d.ts files appear to be in place.');

Extension/.scripts/copyWalkthruMedia.ts

@@ -19,7 +19,7 @@ export async function watch() {
         verbose(`Watching ${source} folder for changes.`);
         console.log('Press Ctrl+C to exit.');
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        for await (const event of watchFiles(source, {recursive: true })) {
+        for await (const event of watchFiles(source, { recursive: true })) {
             await main();
         }
     }