Merge remote-tracking branch 'origin/main' into dev/maryamariyan/ranges-changes

Conflict resolved in CHANGELOG.md

Author: maryamariyan

.vscodeignore

@@ -15,6 +15,11 @@ server/**
 src/**
 tasks/**
 test/**
+omnisharptest/**
+__mocks__/**
+jest.config.ts
+baseJestConfig.ts
+.prettierignore
 typings/**
 vsix/**
 node_modules

CHANGELOG.md

@@ -8,14 +8,26 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
-* Update Roslyn version to 7.0.0-preview.23456.2
-* Fixes regression where semantic colors for razor components appear as red
+* Update Razor version to 7.0.0-preview.23456.2 (PR: [#6304](https://github.com/dotnet/vscode-csharp/pull/6304))
+  * Fixes regression where semantic colors for razor components appear as red
+* Add support for specifying a .runsettings file when using Roslyn LSP (PR: [#6265](https://github.com/dotnet/vscode-csharp/pull/6265))
+* Update Roslyn version (PR: [#6265](https://github.com/dotnet/vscode-csharp/pull/6265))
+  * Add server support for .runsettings in unit tests (PR: [#69792](https://github.com/dotnet/roslyn/pull/69792))
+  * Log more information when we're unable to parse a URI (PR: [#69840](https://github.com/dotnet/roslyn/pull/69840))
+  * Bump ICSharpCode.Decompiler to 8.1.0.745 (PR: [#69772](https://github.com/dotnet/roslyn/pull/69772))
+  * Fix override completion erroring when framework assemblies are not found (PR: [#69795](https://github.com/dotnet/roslyn/pull/69795))
+* Fix override completion when drive letter casing does not match (PR: [#6315](https://github.com/dotnet/vscode-csharp/pull/6315))
+* Allow the server path to be specified by the `DOTNET_ROSLYN_SERVER_PATH` environment variable (PR: [#6316](https://github.com/dotnet/vscode-csharp/pull/6316))
+
+## 2.1.10
 * Update Roslyn version
   * Includes better support for .NET 8 and .NET Framework-targeting projects (PR: [#69616](https://github.com/dotnet/roslyn/pull/69616))
     * This should fix a number of reports where projects don't have full IntelliSense. .NET Framework projects on Windows should load without errors. .NET Framework targeting projects on Mac and Linux which would use Mono are still processed as if they are .NET Core projects and may not load correctly; support for Mono is coming in a future update.
   * Fix issues where some projects fail to load being unable to find NuGet.Frameworks (PR: [#69824](https://github.com/dotnet/roslyn/pull/69824))
 * Update Razor to 7.0.0-preview.23455.5 (PR: [#6291](https://github.com/dotnet/vscode-csharp/pull/6291))
   * Fixes issue reading razor.format.enable and other options (PR: [dotnet/razor#9240](https://github.com/dotnet/razor/issues/9240))
+* Fix parsing of tasks.json with comments in certain locations (PR: [#6288](https://github.com/dotnet/vscode-csharp/pull/6288))
+* Fix Razor browser discovery issues on Mac and Linux `DOTNET_ROSLYN_SERVER_PATH` environment variable (PR: [#6269](https://github.com/dotnet/vscode-csharp/pull/6269))
 
 ## 2.0.448
 * Update Roslyn version (PR: [#6264](https://github.com/dotnet/vscode-csharp/pull/6264))

azure-pipelines.yml

@@ -34,18 +34,23 @@ stages:
   displayName: Test
   dependsOn: []
   jobs:
-  - job: Test
-    strategy:
-      matrix:
-        linux:
-          demandsName: 1es-ubuntu-2004-open
-        windows:
-          demandsName: 1es-windows-2022-open
-    pool:
-      name: NetCore-Public
-      demands: ImageOverride -equals $(demandsName)
-    steps:
-    - template: azure-pipelines/test.yml
+  - template: azure-pipelines/test.yml
+    parameters:
+      jobName: Linux
+      poolName: NetCore-Public
+      demandsName: 1es-ubuntu-2004-open
+
+  - template: azure-pipelines/test.yml
+    parameters:
+      jobName: Windows
+      poolName: NetCore-Public
+      demandsName: 1es-windows-2022-open
+
+  - template: azure-pipelines/test.yml
+    parameters:
+      jobName: MacOS
+      poolName: Azure Pipelines
+      vmImageName: macOS-13
 
 - stage: Test_OmniSharp
   displayName: Test OmniSharp

azure-pipelines/release.yml

@@ -92,7 +92,7 @@ stages:
 - stage: 'TagRelease'
   displayName: 'Tag release of vscode-csharp'
   dependsOn: 'PublishStage'
-  condition: and(succeeded('PublishStage'), eq(variables['resources.pipeline.officialBuildCI.sourceBranch'], 'refs/heads/release'))
+  condition: succeeded('PublishStage')
   jobs:
   - job: 'Tag'
     pool:
@@ -109,7 +109,7 @@ stages:
       fetchDepth: 0
     - pwsh: |
         git checkout $(resources.pipeline.officialBuildCI.sourceCommit)
-      displayName: 'Checkout to release branch'
+      displayName: 'Checkout build source branch'
     - pwsh: |
         npm ci
         npm install

azure-pipelines/test.yml

@@ -1,22 +1,44 @@
-steps:
-- checkout: self
-  clean: true
-  submodules: true
-  fetchTags: false
-  fetchDepth: 1
+parameters:
+  - name: jobName
+    type: string
+  - name: poolName
+    type: string
+  - name: demandsName
+    type: string
+    default: ''
+  - name: vmImageName
+    type: string
+    default: ''
 
-- template: prereqs.yml
+jobs:
+- job: Test_${{ parameters.jobName }}
+  displayName: 'Test ${{ parameters.jobName }}'
+  pool:
+    ${{ if ne(parameters.poolName, '') }}:
+      name: ${{ parameters.poolName }}
+    ${{ if ne(parameters.demandsName, '') }}:
+      demands: ImageOverride -equals ${{ parameters.demandsName }}
+    ${{ if ne(parameters.vmImageName, '') }}:
+      vmImage: ${{ parameters.vmImageName }}
+  steps:
+  - checkout: self
+    clean: true
+    submodules: true
+    fetchTags: false
+    fetchDepth: 1
 
-- template: test-prereqs.yml
+  - template: prereqs.yml
 
-- script: npm run test
-  displayName: 🧪 Run unit and integration tests
-  env:
-    DISPLAY: :99.0
+  - template: test-prereqs.yml
 
-- task: PublishPipelineArtifact@1
-  condition: failed()
-  displayName: 'Upload integration test logs'
-  inputs:
-    targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
-    artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'
+  - script: npm run test
+    displayName: 🧪 Run unit and integration tests
+    env:
+      DISPLAY: :99.0
+
+  - task: PublishPipelineArtifact@1
+    condition: failed()
+    displayName: 'Upload integration test logs'
+    inputs:
+      targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
+      artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'

l10n/bundle.l10n.cs.json

@@ -42,7 +42,7 @@
   "Extension": "Rozšíření",
   "Extensions": "Rozšíření",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Nepovedlo se dokončit instalaci rozšíření C#. Podívejte se na chybu v okně výstupu níže.",
-  "Failed to parse tasks.json file: {0}": "Failed to parse tasks.json file: {0}",
+  "Failed to parse tasks.json file: {0}": "Nepovedlo se parsovat soubor tasks.json: {0}",
   "Failed to set debugadpter directory": "Nepovedlo se nastavit adresář debugadpter.",
   "Failed to set extension directory": "Nepovedlo se nastavit adresář rozšíření.",
   "Failed to set install complete file path": "Nepovedlo se nastavit úplnou cestu k souboru instalace",

l10n/bundle.l10n.de.json

@@ -42,7 +42,7 @@
   "Extension": "Erweiterung",
   "Extensions": "Erweiterungen",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Fehler beim Abschließen der Installation der C#-Erweiterung. Den Fehler finden Sie unten im Ausgabefenster.",
-  "Failed to parse tasks.json file: {0}": "Failed to parse tasks.json file: {0}",
+  "Failed to parse tasks.json file: {0}": "Fehler beim Analysieren der Datei \"tasks.json\": {0}",
   "Failed to set debugadpter directory": "Fehler beim Festlegen des Debugadapterverzeichnisses",
   "Failed to set extension directory": "Fehler beim Festlegen des Erweiterungsverzeichnisses",
   "Failed to set install complete file path": "Fehler beim Festlegen des Vollständigen Installationsdateipfads.",
@@ -99,7 +99,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Erforderliche Ressourcen zum Erstellen und Debuggen fehlen in \"{0}\". Sie hinzufügen?",
   "Restart": "Neu starten",
   "Restart Language Server": "Sprachserver neu starten",
-  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Ausführen und Debuggen: Es ist kein gültiger Browser installiert. Installieren Sie Edge oder Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Ausführen und Debuggen: Die automatische Erkennung hat {0} für einen Startbrowser gefunden.",
   "See {0} output": "{0}-Ausgabe anzeigen",
   "Select the process to attach to": "Prozess auswählen, an den angefügt werden soll",

l10n/bundle.l10n.es.json

@@ -42,7 +42,7 @@
   "Extension": "Extension",
   "Extensions": "Extensiones",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "No se pudo completar la instalación de la extensión de C#. Vea el error en la ventana de salida siguiente.",
-  "Failed to parse tasks.json file: {0}": "Failed to parse tasks.json file: {0}",
+  "Failed to parse tasks.json file: {0}": "No se pudo analizar el archivo tasks.json: {0}",
   "Failed to set debugadpter directory": "No se pudo establecer el directorio debugadpter",
   "Failed to set extension directory": "No se pudo establecer el directorio de la extensión",
   "Failed to set install complete file path": "No se pudo establecer la ruta de acceso completa del archivo de instalación",

l10n/bundle.l10n.fr.json

@@ -42,7 +42,7 @@
   "Extension": "Extension",
   "Extensions": "Extensions",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Échec de l’installation de l’extension C#. Consultez l’erreur dans la fenêtre sortie ci-dessous.",
-  "Failed to parse tasks.json file: {0}": "Failed to parse tasks.json file: {0}",
+  "Failed to parse tasks.json file: {0}": "Échec de l'analyse du fichier Tasks.json : {0}",
   "Failed to set debugadpter directory": "Échec de la définition du répertoire debugadpter",
   "Failed to set extension directory": "Échec de la définition du répertoire d’extensions",
   "Failed to set install complete file path": "Échec de la définition du chemin d’accès complet à l’installation",
@@ -99,7 +99,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Les ressources requises pour la génération et le débogage sont manquantes dans « {0} ». Les ajouter ?",
   "Restart": "Redémarrer",
   "Restart Language Server": "Redémarrer le serveur de langue",
-  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Exécuter et déboguer : aucun navigateur valide n’est installé. Installez Edge ou Chrome.",
   "Run and Debug: auto-detection found {0} for a launch browser": "Exécuter et déboguer : détection automatique détectée {0} pour un navigateur de lancement",
   "See {0} output": "Voir la sortie {0}",
   "Select the process to attach to": "Sélectionner le processus à attacher",

l10n/bundle.l10n.it.json

@@ -42,7 +42,7 @@
   "Extension": "Estensione",
   "Extensions": "Estensioni",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Non è stato possibile completare l'installazione dell'estensione C#. Vedere l'errore nella finestra di output seguente.",
-  "Failed to parse tasks.json file: {0}": "Failed to parse tasks.json file: {0}",
+  "Failed to parse tasks.json file: {0}": "Non è stato possibile analizzare il file tasks.json: {0}",
   "Failed to set debugadpter directory": "Non è stato possibile impostare la directory dell'elenco di debug",
   "Failed to set extension directory": "Non è stato possibile impostare la directory delle estensioni",
   "Failed to set install complete file path": "Non è stato possibile impostare il percorso completo del file di installazione",