Stop publishing typespec-vscode/typespec-vs to npm & run build on Linux

eng/tsp-core/pipelines/jobs/build-for-publish.yml → eng/tsp-core/pipelines/jobs/build-packages.yml

@@ -2,8 +2,14 @@ jobs:
   - job: build
     displayName: Build Packages
 
+    pool:
+      name: $(LINUXPOOL)
+      image: $(LINUXVMIMAGE)
+      os: linux
+
     variables:
       TYPESPEC_SKIP_WEBSITE_BUILD: true # Disable docusaurus build
+      TYPESPEC_SKIP_VS_BUILD: true # VS extension is built in the dedicated build-vs (Windows) job
 
     steps:
       - template: /eng/tsp-core/pipelines/templates/install.yml
@@ -32,18 +38,11 @@ jobs:
           Contents: "*.vsix"
           TargetFolder: "$(Build.ArtifactStagingDirectory)/vscode-extension"
 
-      - task: CopyFiles@2
-        displayName: "Copy VS extension .vsix to artifact directory"
-        inputs:
-          SourceFolder: "$(Build.SourcesDirectory)/packages/typespec-vs"
-          Contents: "*.vsix"
-          TargetFolder: "$(Build.ArtifactStagingDirectory)/vs-extension"
-
       - task: AzureCLI@2
         displayName: "Publish bundled packages to package storage"
         inputs:
           azureSubscription: "Azure SDK Engineering System"
-          scriptType: batch
+          scriptType: bash
           scriptLocation: inlineScript
           inlineScript: node ./eng/tsp-core/scripts/upload-bundler-packages.js
 
@@ -74,15 +73,15 @@ jobs:
         displayName: "Publish playground"
         inputs:
           azureSubscription: "Azure SDK Engineering System"
-          scriptType: batch
+          scriptType: bash
           scriptLocation: inlineScript
           inlineScript: |
-            az storage blob upload-batch ^
-              --auth-mode login ^
-              --destination $web ^
-              --account-name "cadlplayground" ^
-              --destination-path / ^
-              --source "./packages/playground-website/dist/web/" ^
+            az storage blob upload-batch \
+              --auth-mode login \
+              --destination '$web' \
+              --account-name "cadlplayground" \
+              --destination-path / \
+              --source "./packages/playground-website/dist/web/" \
               --overwrite
 
     templateContext:
@@ -104,8 +103,3 @@ jobs:
           path: $(Build.ArtifactStagingDirectory)/vscode-extension
           artifact: vscode-extension-unsigned
           displayName: Publish VSCode extension(.vsix) as pipeline artifacts
-
-        - output: pipelineArtifact
-          path: $(Build.ArtifactStagingDirectory)/vs-extension
-          artifact: vs-extension-unsigned
-          displayName: Publish VS extension(.vsix) as pipeline artifacts

eng/tsp-core/pipelines/jobs/build-vs.yml

@@ -0,0 +1,34 @@
+jobs:
+  - job: build_vs
+    displayName: Build VS extension
+
+    pool:
+      name: $(WINDOWSPOOL)
+      image: $(WINDOWSVMIMAGE)
+      os: windows
+
+    variables:
+      TYPESPEC_SKIP_WEBSITE_BUILD: true # Disable docusaurus build
+      TYPESPEC_VS_CI_BUILD: true # Enable official Visual Studio extension build
+
+    steps:
+      - template: /eng/tsp-core/pipelines/templates/install.yml
+        parameters:
+          useDotNet: true
+
+      - script: pnpm -r --filter "typespec-vs..." build
+        displayName: Build
+
+      - task: CopyFiles@2
+        displayName: "Copy VS extension .vsix to artifact directory"
+        inputs:
+          SourceFolder: "$(Build.SourcesDirectory)/packages/typespec-vs"
+          Contents: "*.vsix"
+          TargetFolder: "$(Build.ArtifactStagingDirectory)/vs-extension"
+
+    templateContext:
+      outputs:
+        - output: pipelineArtifact
+          path: $(Build.ArtifactStagingDirectory)/vs-extension
+          artifact: vs-extension-unsigned
+          displayName: Publish VS extension(.vsix) as pipeline artifacts

eng/tsp-core/pipelines/publish.yml

@@ -27,13 +27,9 @@ extends:
         dependsOn: []
         displayName: Build
 
-        pool:
-          name: $(WINDOWSPOOL)
-          image: $(WINDOWSVMIMAGE)
-          os: windows
-
         jobs:
-          - template: /eng/tsp-core/pipelines/jobs/build-for-publish.yml@self
+          - template: /eng/tsp-core/pipelines/jobs/build-packages.yml@self
+          - template: /eng/tsp-core/pipelines/jobs/build-vs.yml@self
           - template: /eng/tsp-core/pipelines/jobs/cli/build-tsp-cli-all.yml@self
           - template: /eng/tsp-core/pipelines/jobs/e2e.yml@self
             parameters:

packages/typespec-vs/package.json

@@ -1,5 +1,6 @@
 {
   "name": "typespec-vs",
+  "private": true,
   "author": "Microsoft Corporation",
   "version": "1.13.0",
   "description": "TypeSpec Language Support for Visual Studio",

packages/typespec-vscode/package.json

@@ -1,5 +1,6 @@
 {
   "name": "typespec-vscode",
+  "private": true,
   "version": "1.13.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec language support for VS Code",