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

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -50,3 +50,21 @@ pipelines:
           lastModifiedDate: 2024-03-27
         armory:
           lastModifiedDate: 2024-03-27
+  1424:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2025-02-05
+        eslint:
+          lastModifiedDate: 2025-02-05
+        psscriptanalyzer:
+          lastModifiedDate: 2025-02-05
+        armory:
+          lastModifiedDate: 2025-02-05
+      binary:
+        credscan:
+          lastModifiedDate: 2025-02-05
+        binskim:
+          lastModifiedDate: 2025-02-05
+        spotbugs:
+          lastModifiedDate: 2025-02-05

.config/guardian/.gdnbaselines

@@ -14,10 +14,16 @@
     "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
       "signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
       "alternativeSignatures": [],
+      "target": "test/omnisharp/omnisharpUnitTests/testAssets/private.pem",
+      "line": 1,
       "memberOf": [
         "default"
       ],
-      "createdDate": "2024-09-09 19:35:36Z"
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "createdDate": "2025-02-05 00:31:10Z",
+      "expirationDate": "2025-07-25 00:50:30Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-05 00:50:30Z"
     }
   }
-}
+}

CHANGELOG.md

@@ -3,6 +3,22 @@
 - 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.65.x
+* Update Roslyn LSP to run on .NET 9 (PR: [#7946](/~https://github.com/dotnet/vscode-csharp/pull/7946))
+* Update Roslyn to 4.14.0-2.25106.12 (PR: [#7969](/~https://github.com/dotnet/vscode-csharp/pull/7969))
+  * Maintain whitespace when converting to switch expression (PR: [#77083](/~https://github.com/dotnet/roslyn/pull/77083))
+  * Fix extra whitespace insertion for completion text edits (PR: [#77071](/~https://github.com/dotnet/roslyn/pull/77071))
+  * Realize less of the syntax tree during AbstractSemanticModelReuseLanguageService.GetPreviousBodyNode (PR: [#77032](/~https://github.com/dotnet/roslyn/pull/77032))
+  * Fix issue loading project with relative path globs (PR: [#76961](/~https://github.com/dotnet/roslyn/pull/76961))
+  * Fix: Ensure DOTNET_ROOT is reset user defined value during test execution (PR: [#76819](/~https://github.com/dotnet/roslyn/pull/76819))
+  * Update Roslyn LSP server to target .NET 9 (PR: [#76938](/~https://github.com/dotnet/roslyn/pull/76938))
+  * Update ICSharpCode.Decompiler to 8.2.0.7535 (PR: [#71837](/~https://github.com/dotnet/roslyn/pull/71837))
+  * Reduce CPU costs under AnalyzerExecutor.ExecuteSyntaxNodeActions (PR: [#76894](/~https://github.com/dotnet/roslyn/pull/76894))
+* Add code snippets for C# expression-bodied properties (PR: [#5683](/~https://github.com/dotnet/vscode-csharp/pull/5683))
+* Sync whitespace options even when detectIndentation is on (PR: [#7965](/~https://github.com/dotnet/vscode-csharp/pull/7965))
+* Bump Razor (PR: [#7940](/~https://github.com/dotnet/vscode-csharp/pull/7940))
+Bump xamltools to 17.14.35807.11(PR: [#7976]( /~https://github.com/dotnet/vscode-csharp/pull/7976))
+
 # 2.64.x
 * Bump xamlTools to 17.14.35730.156 (PR: [#7932](/~https://github.com/dotnet/vscode-csharp/pull/7941))
 
@@ -60,12 +76,19 @@
   * Update 'use nameof instead of typeof' to support generic types (PR: [#76780](/~https://github.com/dotnet/roslyn/pull/76780))
   * Add feature to convert from an explicitly typed lambda to an implicitly typed one. (PR: [#76770](/~https://github.com/dotnet/roslyn/pull/76770))
   * Support modifiers with simple lambda parameters. (PR: [#75400](/~https://github.com/dotnet/roslyn/pull/75400))
-* Update Razor to 9.0.0-preview.25064.4 (PR: [#7927](/~https://github.com/dotnet/vscode-csharp/pull/7927))
+* Update Razor to 9.0.0-preview.25073.1 (PR: [#7940](/~https://github.com/dotnet/vscode-csharp/pull/7940))
   * Wire up the UseRoslynTokenizer feature properly (#11386) (PR: [#11386](/~https://github.com/dotnet/razor/pull/11386))
   * New Razor document formatting engine (#11364) (PR: [#11364](/~https://github.com/dotnet/razor/pull/11364))
   * Fix a couple of exceptions encountered when formatting documents with preprocessor directives (#11373) (PR: [#11373](/~https://github.com/dotnet/razor/pull/11373))
   * Allow RazorProjectEngine.Process to be cancelled (#11334) (PR: [#11334](/~https://github.com/dotnet/razor/pull/11334))
   * Further refactoring of Razor tooling project system (#11320) (PR: [#11320](/~https://github.com/dotnet/razor/pull/11320))
+  * Don't create overlapping changes when doing additional formatting (#11413) (PR: [#11413](/~https://github.com/dotnet/razor/pull/11413))
+  * Synchronize razor compiler assembly loading (#11394) (PR: [#11394](/~https://github.com/dotnet/razor/pull/11394))
+  * Allow generate method to handle delegates (#11402) (PR: [#11402](/~https://github.com/dotnet/razor/pull/11402))
+  * Fix bad completion commit in vs code (#11398) (PR: [#11398](/~https://github.com/dotnet/razor/pull/11398))
+  * SourceTexts for Everyone! (#11404) (PR: [#11404](/~https://github.com/dotnet/razor/pull/11404))
+  * Handful of performance fixes (#11399) (PR: [#11399](/~https://github.com/dotnet/razor/pull/11399))
+  * Use the overload that takes an immutable array in serailization (#11393) (PR: [#11393](/~https://github.com/dotnet/razor/pull/11393))
 
 # 2.62.x
 * Update Roslyn to 4.14.0-1.25060.2 (PR: [#7916](/~https://github.com/dotnet/vscode-csharp/pull/7916))

CONTRIBUTING.md

@@ -73,7 +73,7 @@ This section shows how to set up local Razor or Roslyn language servers for debu
 1. Clone the [Roslyn repository](/~https://github.com/dotnet/roslyn). This repository contains the Roslyn server implementation.
 2. Follow the build instructions provided in the repository.
 
-The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
+The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net9.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
 
 #### Razor
 
@@ -116,7 +116,7 @@ In your workspace `settings.json` file, add the following lines:
 
 ```json
 "dotnet.server.waitForDebugger": true,
-"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll"
+"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net9.0/Microsoft.CodeAnalysis.LanguageServer.dll"
 ```
 
 Replace <roslynRepoRoot> with the actual path to your Roslyn repository.

azure-pipelines-official.yml

@@ -28,7 +28,7 @@ parameters:
   default: auto
 
 variables:
-  defaultDotnetVersion: '8.0.403'
+- template: /azure-pipelines/dotnet-variables.yml@self
 
 resources:
   repositories:

azure-pipelines.yml

@@ -29,8 +29,7 @@ schedules:
         - main
 
 variables:
-- name: defaultDotnetVersion
-  value: '8.0.403'
+- template: /azure-pipelines/dotnet-variables.yml@self
 - name: testVSCodeVersion
   ${{ if eq( variables['Build.Reason'], 'Schedule' ) }}: 
     value: insiders
@@ -45,7 +44,7 @@ stages:
     dotnetVersion: $(defaultDotnetVersion)
 
 - stage:
-  displayName: Test Linux (.NET 6)
+  displayName: Test Linux (.NET 8)
   dependsOn: []
   jobs:
   - template: azure-pipelines/test-matrix.yml
@@ -57,10 +56,10 @@ stages:
       pool:
         name: NetCore-Public
         demands: ImageOverride -equals 1es-ubuntu-2004-open
-      containerName: mcr.microsoft.com/dotnet/sdk:6.0
+      containerName: mcr.microsoft.com/dotnet/sdk:8.0
 
 - stage:
-  displayName: Test Linux (.NET 8)
+  displayName: Test Linux (.NET 9)
   dependsOn: []
   jobs:
   - template: azure-pipelines/test-matrix.yml
@@ -72,7 +71,7 @@ stages:
       pool:
         name: NetCore-Public
         demands: ImageOverride -equals 1es-ubuntu-2004-open
-      containerName: mcr.microsoft.com/dotnet/sdk:8.0
+      containerName: mcr.microsoft.com/dotnet/sdk:9.0
 
 - stage: Test_Windows_Stage
   displayName: Test Windows

azure-pipelines/dotnet-variables.yml

@@ -0,0 +1,3 @@
+variables:
+- name: defaultDotnetVersion
+  value: '8.0.403'

azure-pipelines/green-insertion.yml

@@ -1,12 +1,12 @@
 trigger: none # We only want to trigger manually or based on resources
 pr: none
 
-schedules:
-- cron: "0 6 * * *" # Daily @ 10 PM PST
-  displayName: Daily vs-green insertion
-  branches:
-    include:
-    - feature/lsp_tools_host
+#schedules:
+#- cron: "0 6 * * *" # Daily @ 10 PM PST
+#  displayName: Daily vs-green insertion
+#  branches:
+#    include:
+#    - feature/lsp_tools_host
 
 parameters:
   - name: InsertTargetBranch

azure-pipelines/profiling.yml

@@ -0,0 +1,59 @@
+trigger: none
+pr: none
+schedules:
+- cron: '18 1 * * *' # every day at 1:18 AM
+  displayName: Periodic profiling run
+  branches:
+    include:
+    - main
+
+variables:
+- name: TRACE_DROP_LOCATION
+  value: $(Build.SourcesDirectory)/out/profiling/
+- name: MERGED_TRACE_LOCATION
+  value: $(Build.SourcesDirectory)/out/profiling/merged/
+- name: LOGS_DIRECTORY
+  value: $(Build.SourcesDirectory)/out/logs/
+- template: /azure-pipelines/dotnet-variables.yml@self
+
+
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: netcore1espool-internal
+        image: 1es-windows-2022
+        os: windows
+    stages:
+    - stage: Run_Profiling
+      displayName: Run Profiling
+      jobs:
+      - job: Profile
+        pool:
+          name: netcore1espool-internal
+          image: 1es-ubuntu-2204
+          os: linux
+        templateContext:
+          outputs:
+          - output: pipelineArtifact
+            targetPath: $(TRACE_DROP_LOCATION)
+            artifactName: traces
+            displayName: 📢 Publish intermediate trace files
+            condition: failed()
+          - output: pipelineArtifact
+            targetPath: $(MERGED_TRACE_LOCATION)
+            artifactName: merged mibc
+            displayName: 📢 Publish merged MIBC
+        steps:
+        - template: /azure-pipelines/test.yml@self
+          parameters:
+            dotnetVersion: $(defaultDotnetVersion)
+            npmCommand: profiling
+            testVSCodeVersion: stable

azure-pipelines/test.yml

@@ -44,9 +44,17 @@ steps:
     mergeTestResults: true
     testRunTitle: $(System.StageDisplayName) $(Agent.JobName) (Attempt $(System.JobAttempt))
 
-- task: PublishPipelineArtifact@1
-  condition: failed()
-  displayName: 'Upload integration test logs'
-  inputs:
-    targetPath: '$(Build.SourcesDirectory)/out/logs'
-    artifactName: 'Test Logs ($(System.StageDisplayName)-$(Agent.JobName)-$(System.JobAttempt))'
+- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - task: 1ES.PublishPipelineArtifact@1
+    condition: failed()
+    displayName: 'Upload integration test logs'
+    inputs:
+      path: '$(Build.SourcesDirectory)/out/logs'
+      artifact: 'Test Logs ($(System.StageDisplayName)-$(Agent.JobName)-$(System.JobAttempt))'
+- ${{ else }}: 
+  - task: PublishPipelineArtifact@1
+    condition: failed()
+    displayName: 'Upload integration test logs'
+    inputs:
+      targetPath: '$(Build.SourcesDirectory)/out/logs'
+      artifactName: 'Test Logs ($(System.StageDisplayName)-$(Agent.JobName)-$(System.JobAttempt))'

gulpfile.ts

@@ -11,3 +11,4 @@ require('./tasks/createTagsTasks');
 require('./tasks/debuggerTasks');
 require('./tasks/snapTasks');
 require('./tasks/signingTasks');
+require('./tasks/profilingTasks');

l10n/bundle.l10n.json

@@ -162,8 +162,14 @@
   "Text editor must be focused to fix all issues": "Text editor must be focused to fix all issues",
   "Fix all issues": "Fix all issues",
   "Select fix all action": "Select fix all action",
+  "C# LSP Trace Logs": "C# LSP Trace Logs",
+  "Open solution": "Open solution",
+  "Restart server": "Restart server",
+  "C# Workspace Status": "C# Workspace Status",
+  "The active document is not part of the open workspace. Not all language features will be available.": "The active document is not part of the open workspace. Not all language features will be available.",
+  "Dismiss": "Dismiss",
+  "Do not show for this workspace": "Do not show for this workspace",
   "Test run already in progress": "Test run already in progress",
-  "Generated document not found": "Generated document not found",
   "Server stopped": "Server stopped",
   "Workspace projects": "Workspace projects",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.",
@@ -174,21 +180,15 @@
   "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
   "Go to output": "Go to output",
   "Suppress notification": "Suppress notification",
-  "C# LSP Trace Logs": "C# LSP Trace Logs",
   "Restore {0}": "Restore {0}",
   "Restore already in progress": "Restore already in progress",
   "Sending request": "Sending request",
+  "C# Project Context Status": "C# Project Context Status",
+  "Active File Context": "Active File Context",
   "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# configuration has changed. Would you like to reload the window to apply your changes?",
+  "Generated document not found": "Generated document not found",
   "Nested Code Action": "Nested Code Action",
   "Fix All: ": "Fix All: ",
-  "The active document is not part of the open workspace. Not all language features will be available.": "The active document is not part of the open workspace. Not all language features will be available.",
-  "Dismiss": "Dismiss",
-  "Do not show for this workspace": "Do not show for this workspace",
-  "Open solution": "Open solution",
-  "Restart server": "Restart server",
-  "C# Workspace Status": "C# Workspace Status",
-  "C# Project Context Status": "C# Project Context Status",
-  "Active File Context": "Active File Context",
   "Pick a fix all scope": "Pick a fix all scope",
   "Fix All Code Action": "Fix All Code Action",
   "Failed to set extension directory": "Failed to set extension directory",

package.json

@@ -37,11 +37,11 @@
     }
   },
   "defaults": {
-    "roslyn": "4.14.0-1.25074.7",
+    "roslyn": "4.14.0-2.25106.12",
     "omniSharp": "1.39.12",
-    "razor": "9.0.0-preview.25064.4",
+    "razor": "9.0.0-preview.25073.1",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.14.35730.156"
+    "xamlTools": "17.14.35807.11"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -73,6 +73,7 @@
     "test:integration:devkit": "tsc -p ./ && gulp test:integration:devkit",
     "test:razor": "tsc -p ./ && npm run compile:razorTextMate && gulp test:razor",
     "test:razorintegration": "tsc -p ./ && gulp test:razorintegration",
+    "profiling": "tsc -p ./ && gulp profiling",
     "test:artifacts": "tsc -p ./ && gulp test:artifacts",
     "omnisharptest": "tsc -p ./ && gulp omnisharptest",
     "omnisharptest:unit": "tsc -p ./ && gulp omnisharptest:unit",

package.nls.cs.json

@@ -45,7 +45,7 @@
   "configuration.dotnet.completion.triggerCompletionInArgumentLists": "Automaticky zobrazovat seznam dokončení v seznamech argumentů",
   "configuration.dotnet.defaultSolution.description": "Cesta výchozího řešení, které se má otevřít v pracovním prostoru. Můžete přeskočit nastavením na „zakázat“. (Dříve omnisharp.defaultLaunchSolution)",
   "configuration.dotnet.enableXamlTools": "Povolí nástroje XAML při použití sady C# Dev Kit",
-  "configuration.dotnet.formatting.organizeImportsOnFormat": "Specifies whether 'using' directives should be grouped and sorted during document formatting. (Previously `omnisharp.organizeImportsOnFormat`)",
+  "configuration.dotnet.formatting.organizeImportsOnFormat": "Určuje, zda mají být během formátování dokumentu seskupeny a seřazeny direktivy using. (dříve omnisharp.organizeImportsOnFormat)",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zvýrazněte související komponenty JSON pod kurzorem.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zvýraznit související komponenty regulárního výrazu pod kurzorem.",
   "configuration.dotnet.inlayHints.enableInlayHintsForLiteralParameters": "Zobrazit nápovědy pro literály",

package.nls.de.json

@@ -45,7 +45,7 @@
   "configuration.dotnet.completion.triggerCompletionInArgumentLists": "Vervollständigungsliste in Argumentlisten automatisch anzeigen",
   "configuration.dotnet.defaultSolution.description": "Der Pfad der Standardlösung, die im Arbeitsbereich geöffnet werden soll, oder auf \"deaktivieren\" festlegen, um sie zu überspringen. (Zuvor \"omnisharp.defaultLaunchSolution\")",
   "configuration.dotnet.enableXamlTools": "Aktiviert XAML-Tools bei Verwendung des C#-Dev Kit",
-  "configuration.dotnet.formatting.organizeImportsOnFormat": "Specifies whether 'using' directives should be grouped and sorted during document formatting. (Previously `omnisharp.organizeImportsOnFormat`)",
+  "configuration.dotnet.formatting.organizeImportsOnFormat": "Gibt an, ob „using“-Anweisungen während der Dokumentformatierung gruppiert und sortiert werden sollen. (Zuvor „omnisharp.organizeImportsOnFormat“)",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zugehörige JSON-Komponenten unter dem Cursor markieren.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zugehörige Komponenten regulärer Ausdrücke unter dem Cursor markieren.",
   "configuration.dotnet.inlayHints.enableInlayHintsForLiteralParameters": "Hinweise für Literale anzeigen",

package.nls.es.json

@@ -45,7 +45,7 @@
   "configuration.dotnet.completion.triggerCompletionInArgumentLists": "Mostrar automáticamente la lista de finalización en las listas de argumentos",
   "configuration.dotnet.defaultSolution.description": "Ruta de acceso de la solución predeterminada que se va a abrir en el área de trabajo o se establece en \"deshabilitar\" para omitirla. (Anteriormente \"omnisharp.defaultLaunchSolution\")",
   "configuration.dotnet.enableXamlTools": "Habilita las herramientas XAML al usar el Kit de desarrollo de C#",
-  "configuration.dotnet.formatting.organizeImportsOnFormat": "Specifies whether 'using' directives should be grouped and sorted during document formatting. (Previously `omnisharp.organizeImportsOnFormat`)",
+  "configuration.dotnet.formatting.organizeImportsOnFormat": "Especifica si las directivas \"using\" deben agruparse y ordenarse durante el formato del documento. (Anteriormente \"omnisharp.organizeImportsOnFormat\")",
   "configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Resaltar los componentes JSON relacionados bajo el cursor.",
   "configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Resaltar los componentes de expresiones regulares relacionados bajo el cursor.",
   "configuration.dotnet.inlayHints.enableInlayHintsForLiteralParameters": "Mostrar sugerencias para los literales",