Merge remote-tracking branch 'upstream/main' into merge_main

Author: dibarbet

CHANGELOG.md

@@ -25,6 +25,7 @@
 * Enable loading translated strings from razor TS code (PR: [#5962](https://github.com/dotnet/vscode-csharp/pull/5962))
 * Update typescript and eslint plugin to remove build warning (PR: [6002](https://github.com/dotnet/vscode-csharp/pull/6002))
 * Report how the extension was activated (PR: [#6043](https://github.com/dotnet/vscode-csharp/pull/6043))
+* Update Razor to 7.0.0-preview.23410.1 (PR: [#6105](https://github.com/dotnet/vscode-csharp/pull/6105))
 
 ## 2.0.328
 * Update Roslyn to 4.8.0-1.23403.6 (PR: [#6003](https://github.com/dotnet/vscode-csharp/pull/6003))

CONTRIBUTING.md

@@ -4,8 +4,8 @@
 
 First install:
 
-* Node.js ([v16.16 LTS](https://nodejs.org/en/blog/release/v16.16.0) is recommended).
-* Npm (The version shipped with node is fine, for example for v16.16.0 it would be 8.19.2)
+* Node.js ([v18.17.0 LTS](https://nodejs.org/de/blog/release/v18.17.0) is recommended).
+* Npm (The version shipped with node is fine)
 * .NET 7.0 SDK (dotnet should be on your path)
 
 ### Build and run the extension

azure-pipelines-official.yml

@@ -2,7 +2,6 @@ trigger:
   branches:
     include:
     - main
-    - prerelease
     - release
 pr: none
 
@@ -23,6 +22,6 @@ stages:
         prereleaseFlag: $(prereleaseFlag)
     pool:
       name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+      demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
 
 # TODO: add compliance, signing.

azure-pipelines.yml

@@ -3,13 +3,11 @@ trigger:
   branches:
     include:
     - feature/*
-    - prerelease
     - release
     - main
 
 pr:
 - feature/*
-- prerelease
 - release
 - main
 
@@ -30,7 +28,7 @@ stages:
         prereleaseFlag: $(prereleaseFlag)
     pool:
       name: NetCore-Public
-      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+      demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
 
 - stage: Test
   displayName: Test
@@ -40,7 +38,7 @@ stages:
     strategy:
       matrix:
         linux:
-          demandsName: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+          demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
     pool:
       name: NetCore-Public
       demands: $(demandsName)

azure-pipelines/prereqs.yml

@@ -4,14 +4,14 @@ steps:
 - task: NuGetAuthenticate@1
 
 - task: NodeTool@0
-  displayName: 'Install Node.js 16.x'
+  displayName: 'Install Node.js 18.x'
   inputs:
-    versionSpec: '16.x'
+    versionSpec: '18.x'
 
 - task: UseDotNet@2
   displayName: 'Install .NET Core SDKs'
   inputs:
-    version: '7.0.100'
+    version: '7.x'
 
 # Set the CI build number to the VSIX version we're creating from this build.
 - script: |

azure-pipelines/release.yml

@@ -1,16 +1,16 @@
 trigger: none
 pr: none
 
+resources:
+  pipelines:
+  - pipeline: officialBuildCI
+    source: dotnet-vscode-csharp
+    branch: main
+
 parameters:
   - name: test
     type: boolean
     default: true
-  - name: branch
-    type: string
-    default: prerelease
-    values:
-    - prerelease
-    - release
 
 variables:
 # This is expected to provide VisualStudioMarketplacePAT to the release (https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token)
@@ -27,8 +27,9 @@ jobs:
       buildType: 'specific'
       project: 'internal'
       definition: 1264
-      buildVersionToDownload: 'latestFromBranch'
-      branchName: 'refs/heads/${{ parameters.branch }}'
+      buildVersionToDownload: 'specific'
+      buildId: '$(resources.pipeline.officialBuildCI.runID)'
+      branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)'
   - pwsh: |
       npm install --global vsce
     displayName: 'Install vsce'
@@ -44,13 +45,13 @@ jobs:
 
       $additionalPublishArgs = , "publish"
       # Artifacts are published to either pre-release or release based on the build branch, https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
-      If ("${{ parameters.branch }}" -eq "prerelease") {
+      If ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/main") {
         $additionalPublishArgs += "--pre-release"
         Write-Host "Publish to pre-release channel."
-      } ElseIf ("${{ parameters.branch }}" -eq "release") {
+      } ElseIf ("$(resources.pipeline.officialBuildCI.sourceBranch)" -eq "refs/heads/release") {
         Write-Host "Publish to release channel."
       } Else {
-        throw "Unexpected branch name: ${{ parameters.branch }}."
+        throw "Unexpected branch name: $(resources.pipeline.officialBuildCI.sourceBranch)."
       }
       $additionalPublishArgs += '--packagePath'