[automated] Merge branch 'main' => 'prerelease' (#7795)

Author: dibarbet

CHANGELOG.md

@@ -3,6 +3,25 @@
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
+# 2.57.x
+* Update Razor to 9.0.0-preview.24565.1 (PR: [#7793])(https://github.com/dotnet/vscode-csharp/pull/7793)
+* Update Roslyn to 4.13.0-2.24565.3 (PR: [#7792](https://github.com/dotnet/vscode-csharp/pull/7792))
+  * Add support for go to type definition (PR: [#75819](https://github.com/dotnet/roslyn/pull/75819))
+  * Reduce formatting allocations when scrolling (PR: [#75912](https://github.com/dotnet/roslyn/pull/75912))
+  * Improve go-to-impl with error conditions (PR: [#75913](https://github.com/dotnet/roslyn/pull/75913))
+  * Update 'use simple using statement' to support global statements (PR: [#75921](https://github.com/dotnet/roslyn/pull/75921))
+  * Fix case where we were erroneously offering to convert a dictionary to use a collection expression. (PR: [#75897](https://github.com/dotnet/roslyn/pull/75897))
+  * Recover better when a user uses commas in a for-statement instead of semicolons (PR: [#75632](https://github.com/dotnet/roslyn/pull/75632))
+  * Do not run 'remove unnecessary imports' on generated code (PR: [#74762](https://github.com/dotnet/roslyn/pull/74762))
+  * improve goto-def on an invalid override (PR: [#75901](https://github.com/dotnet/roslyn/pull/75901))
+  * Fix formatting of simplify-linq-expression (PR: [#75860](https://github.com/dotnet/roslyn/pull/75860))
+  * Add new line before 'where' constraints in Quick Info (PR: [#60545](https://github.com/dotnet/roslyn/pull/60545))
+* Increase default server start timeout to 2minutes (PR: [#7788](https://github.com/dotnet/vscode-csharp/pull/7788))
+* Update Razor to 9.0.0-preview.24561.3 (PR: [#7748](https://github.com/dotnet/vscode-csharp/pull/7748))
+  * Add feature flag to turn on the new Roslyn tokenizer (PR: [#11185](https://github.com/dotnet/razor/pull/11185))
+* Fix Razor preview panel button colors to have more visible contrast ratio (PR: [#7766](https://github.com/dotnet/vscode-csharp/pull/7766))
+* Bump xamltools to 17.13.35513.19 (PR: [#7777](https://github.com/dotnet/vscode-csharp/pull/7777))
+
 # 2.56.x
 * Update Roslyn to 4.13.0-2.24561.3 (PR: [#7765](https://github.com/dotnet/vscode-csharp/pull/7765))
   * Update Razor to fix serialization issue loading projects (PR: [#75794](https://github.com/dotnet/roslyn/pull/75794))
@@ -26,7 +45,7 @@
   * Reduce memory and CPU costs due to SegmentedList usage (PR: [#75661](https://github.com/dotnet/roslyn/pull/75661))
 * Bump xamltools to 17.13.35506.24 (PR: [#7740](https://github.com/dotnet/vscode-csharp/pull/7740))
 * Bump xamltools to 17.13.35507.225 (PR: [#7755](https://github.com/dotnet/vscode-csharp/pull/7755))
-  * XAML IntelliseSense completions for Image.Source 
+  * XAML IntelliseSense completions for Image.Source
 
 # 2.55.x
 * Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))

azure-pipelines-official.yml

@@ -27,6 +27,9 @@ parameters:
   - auto
   default: auto
 
+variables:
+  defaultDotnetVersion: '8.0.403'
+
 resources:
   repositories:
   - repository: 1ESPipelineTemplates
@@ -63,3 +66,4 @@ extends:
         isOfficial: true
         channel: ${{ parameters.channel }}
         signType: ${{ parameters.signType }}
+        dotnetVersion: $(defaultDotnetVersion)

azure-pipelines.yml

@@ -16,13 +16,32 @@ pr:
     - main
   paths:
     exclude:
-    - ./*.md
+    - ./*.md  
+
+# Run a scheduled build every night on main to run tests against insiders VSCode.
+# The variable testVSCodeVersion is set to insiders based on the build reason.
+schedules:
+  - cron: "0 0 * * *"
+    displayName: Daily Insiders Build
+    branches:
+      include:
+        - main
+
+variables:
+- name: defaultDotnetVersion
+  value: '8.0.403'
+- name: testVSCodeVersion
+  ${{ if eq( variables['Build.Reason'], 'Schedule' ) }}: 
+    value: insiders
+  ${{ else }}: 
+    value: stable
 
 stages:
 - template: azure-pipelines/build-all.yml
   parameters:
     isOfficial: false
     signType: test
+    dotnetVersion: $(defaultDotnetVersion)
 
 - stage:
   displayName: Test Linux (.NET 6)
@@ -31,7 +50,8 @@ stages:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       # Prefer the dotnet from the container.
-      installDotNet: false
+      dotnetVersion: ''
+      testVSCodeVersion: $(testVSCodeVersion)
       installAdditionalLinuxDependencies: true
       pool:
         name: NetCore-Public
@@ -45,7 +65,8 @@ stages:
   - template: azure-pipelines/test-matrix.yml
     parameters:
       # Prefer the dotnet from the container.
-      installDotNet: false
+      dotnetVersion: ''
+      testVSCodeVersion: $(testVSCodeVersion)
       installAdditionalLinuxDependencies: true
       pool:
         name: NetCore-Public
@@ -58,7 +79,8 @@ stages:
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
-      installDotNet: true
+      dotnetVersion: $(defaultDotnetVersion)
+      testVSCodeVersion: $(testVSCodeVersion)
       pool:
         name: NetCore-Public
         demands: ImageOverride -equals 1es-windows-2022-open
@@ -69,7 +91,8 @@ stages:
   jobs:
   - template: azure-pipelines/test-matrix.yml
     parameters:
-      installDotNet: true
+      dotnetVersion: $(defaultDotnetVersion)
+      testVSCodeVersion: $(testVSCodeVersion)
       pool:
         name: Azure Pipelines
         vmImage: macOS-13
@@ -90,3 +113,6 @@ stages:
       demands: ImageOverride -equals $(demandsName)
     steps:
     - template: azure-pipelines/test-omnisharp.yml
+      parameters:
+        dotnetVersion: $(defaultDotnetVersion)
+        testVSCodeVersion: $(testVSCodeVersion)

azure-pipelines/build-all.yml

@@ -4,6 +4,8 @@ parameters:
   default: 'default'
 - name: isOfficial
   type: boolean
+- name: dotnetVersion
+  type: string
 - name: channel
   values:
   - release
@@ -96,6 +98,7 @@ stages:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
       platform: linux
       isOfficial: ${{ parameters.isOfficial }}
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       pool:
         ${{ if eq(parameters.isOfficial, true) }}:
           name: netcore1espool-internal
@@ -109,6 +112,7 @@ stages:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
       platform: windows
       isOfficial: ${{ parameters.isOfficial }}
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       pool:
         ${{ if eq(parameters.isOfficial, true) }}:
           name: netcore1espool-internal
@@ -122,6 +126,7 @@ stages:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
       platform: darwin
       isOfficial: ${{ parameters.isOfficial }}
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       pool:
         name: Azure Pipelines
         ${{ if eq(parameters.isOfficial, true) }}:

azure-pipelines/build.yml

@@ -8,6 +8,8 @@ parameters:
   type: object
 - name: isOfficial
   type: boolean
+- name: dotnetVersion
+  type: string
 
 jobs:
 - job: 'Build_${{ parameters.platform }}_vsixs'
@@ -27,6 +29,7 @@ jobs:
   - template: /azure-pipelines/prereqs.yml@self
     parameters:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
+      dotnetVersion: ${{ parameters.dotnetVersion}}
 
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.11'

azure-pipelines/prereqs.yml

@@ -2,9 +2,8 @@ parameters:
   - name: versionNumberOverride
     type: string
     default: 'default'
-  - name: installDotNet
-    type: boolean
-    default: true
+  - name: dotnetVersion
+    type: string
 
 steps:
 
@@ -15,11 +14,11 @@ steps:
 
 # Some tests use predefined docker images with a specific version of .NET installed.
 # So we avoid installing .NET in those cases.
-- ${{ if eq(parameters.installDotNet, true) }}:
+- ${{ if parameters.dotnetVersion }}:
   - task: UseDotNet@2
     displayName: 'Install .NET SDK'
     inputs:
-      version: '8.0.403'
+      version: ${{ parameters.dotnetVersion }}
 
 - script: dotnet --info
   displayName: Display dotnet info

azure-pipelines/test-matrix.yml

@@ -4,11 +4,13 @@ parameters:
   - name: containerName
     type: string
     default: ''
-  - name: installDotNet
-    type: boolean
+  - name: dotnetVersion
+    type: string
   - name: installAdditionalLinuxDependencies
     type: boolean
     default: false
+  - name: testVSCodeVersion
+    type: string
 
 jobs:
 - job:
@@ -24,6 +26,7 @@ jobs:
   steps:
   - template: /azure-pipelines/test.yml@self
     parameters:
-      installDotNet: true
+      dotnetVersion: ${{ parameters.dotnetVersion }}
       installAdditionalLinuxDependencies: true
-      npmCommand: $(npmCommand)
+      npmCommand: $(npmCommand)
+      testVSCodeVersion: ${{ parameters.testVSCodeVersion }}

azure-pipelines/test-omnisharp.yml

@@ -1,3 +1,9 @@
+parameters:
+  - name: dotnetVersion
+    type: string
+  - name: testVSCodeVersion
+    type: string
+
 steps:
 - checkout: self
   clean: true
@@ -6,13 +12,16 @@ steps:
   fetchDepth: 1
 
 - template: prereqs.yml
+  parameters:
+    dotnetVersion: ${{ parameters.dotnetVersion }}
 
 - template: test-prereqs.yml
 
 - script: npm run omnisharptest
   displayName: 🧪 Run unit and integration tests
   env:
     DISPLAY: :99.0
+    CODE_VERSION: ${{ parameters.testVSCodeVersion }}
 
 - task: PublishTestResults@2
   condition: succeededOrFailed()

azure-pipelines/test.yml

@@ -1,11 +1,13 @@
 parameters:
-  - name: installDotNet
-    type: boolean
+  - name: dotnetVersion
+    type: string
   - name: installAdditionalLinuxDependencies
     type: boolean
     default: false
   - name: npmCommand
     type: string
+  - name: testVSCodeVersion
+    type: string
 
 steps:
 - checkout: self
@@ -16,7 +18,7 @@ steps:
 
 - template: prereqs.yml
   parameters:
-    installDotNet: ${{ parameters.installDotNet }}
+    dotnetVersion: ${{ parameters.dotnetVersion }}
 
 - ${{ if eq(parameters.installAdditionalLinuxDependencies, true) }}:
   - template: test-linux-docker-prereqs.yml
@@ -29,6 +31,7 @@ steps:
   displayName: 🧪 Run $(Agent.JobName)
   env:
     DISPLAY: :99.0
+    CODE_VERSION: ${{ parameters.testVSCodeVersion }}
 
 - task: PublishTestResults@2
   condition: succeededOrFailed()

package.json

@@ -37,11 +37,11 @@
     }
   },
   "defaults": {
-    "roslyn": "4.13.0-2.24561.3",
+    "roslyn": "4.13.0-2.24565.3",
     "omniSharp": "1.39.11",
-    "razor": "9.0.0-preview.24557.11",
+    "razor": "9.0.0-preview.24565.1",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.13.35507.225"
+    "xamlTools": "17.13.35513.19"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -1433,7 +1433,7 @@
           "dotnet.server.startTimeout": {
             "type": "number",
             "scope": "machine-overridable",
-            "default": 30000,
+            "default": 120000,
             "description": "%configuration.dotnet.server.startTimeout%"
           },
           "dotnet.server.waitForDebugger": {
@@ -1528,6 +1528,13 @@
             "description": "%configuration.razor.languageServer.forceRuntimeCodeGeneration%",
             "order": 90
           },
+          "razor.languageServer.useRoslynTokenizer": {
+            "type": "boolean",
+            "scope": "machine-overridable",
+            "default": false,
+            "markdownDescription": "%configuration.razor.languageServer.useRoslynTokenizer%",
+            "order": 90
+          },
           "razor.languageServer.suppressLspErrorToasts": {
             "type": "boolean",
             "default": true,