Merge pull request #7370 from dotnet/merge/main-to-prerelease

[automated] Merge branch 'main' => 'prerelease'

Author: dibarbet

.config/branch-merge.json

@@ -0,0 +1,14 @@
+{
+    "merge-flow-configurations": {
+        // Merge any prerelease only changes to main.
+        "prerelease": {
+            "MergeToBranch": "main",
+            "ExtraSwitches": "-QuietComments"
+        },
+        // Merge any release only changes to main.
+        "release": {
+            "MergeToBranch": "release",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}

.gitattributes

@@ -2,4 +2,7 @@
 l10n/bundle.l10n.json text eol=lf
 
 # This is a Unix shell script, so it always use the 'lf' line ends
-scripts/remoteProcessPickerScript text eol=lf
+scripts/remoteProcessPickerScript text eol=lf
+
+# This is a generated file. Set it to 'lf' so we don't get git errors when it is generated on Windows.
+src/razor/syntaxes/aspnetcorerazor.tmLanguage.json eol=lf

.github/workflows/branch-merge.yml

@@ -0,0 +1,17 @@
+# Merges any changes from release/prerelease to main (e.g. servicing changes)
+
+name: Flow release/prerelease changes to main
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 */3 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  check-script:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with:
+      configuration_file_path: '.config/branch-merge.json'

.github/workflows/branch-snap.yml

@@ -10,4 +10,26 @@ jobs:
   check-script:
     uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
     with:
-      configuration_file_path: '.config/snap-flow.json'
+      configuration_file_path: '.config/snap-flow.json'
+
+  create-pull-request:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+      - name: Install NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+      - name: Install dependencies 
+        run: npm ci
+      - name: Update version.json
+        run: npx gulp incrementVersionJson
+      - name: Create version.json update PR
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update main version
+          title: 'Update main version'
+          branch: merge/update-main-version

CHANGELOG.md

@@ -4,6 +4,17 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* Add option to disable server gc (PR: [#7155](https://github.com/dotnet/vscode-csharp/pull/7155))
+* Update the workspace status bar when the server is stopped. (PR: [#7352](https://github.com/dotnet/vscode-csharp/pull/7352))
+* Update Debugger to v2.39.0 (PR: [#7342](https://github.com/dotnet/vscode-csharp/pull/7342))
+* Bump xamltools to 17.12.35119.17 (PR: [#7366](https://github.com/dotnet/vscode-csharp/pull/7366))
+* Update Roslyn to 4.12.0-1.24366.6 (PR: [#7356](https://github.com/dotnet/vscode-csharp/pull/7356))
+  * Convert ImplementTypeOptions to editorconfig options (PR: [#74376](https://github.com/dotnet/roslyn/pull/74376))
+  * Remove double array allocation in SemanticTokens (PR: [#74271](https://github.com/dotnet/roslyn/pull/74271))
+  * Do not use memory mapped files on non-windows (PR: [#74339](https://github.com/dotnet/roslyn/pull/74339))
+* Renamed settings (PR: [#7356](https://github.com/dotnet/vscode-csharp/pull/7356))
+  * `dotnet.implementType.insertionBehavior` to `dotnet.typeMembers.memberInsertionLocation`
+  * `dotnet.implementType.propertyGenerationBehavior` to `dotnet.typeMembers.propertyGenerationBehavior`
 
 # 2.39.x
 * Add language status bar item displaying project context for open files (PR: [#7321](https://github.com/dotnet/vscode-csharp/pull/7321), PR: [#7333](https://github.com/dotnet/vscode-csharp/pull/7333))
@@ -42,7 +53,6 @@
   * Fixed issue with Exception type related to https://github.com/microsoft/vscode-dotnettools/issues/1247
   * Fixed Hot Reload not working on some Android device models: https://github.com/microsoft/vscode-dotnettools/issues/1241
 
-
 # 2.38.16
 * Start localizing additional strings (PR: [#7305](https://github.com/dotnet/vscode-csharp/pull/7305))
 * Fix issue launching Razor server on macOS (PR: [#7300](https://github.com/dotnet/vscode-csharp/pull/7300))

gulpfile.ts

@@ -9,3 +9,4 @@ require('./tasks/backcompatTasks');
 require('./tasks/localizationTasks');
 require('./tasks/createTagsTasks');
 require('./tasks/debuggerTasks');
+require('./tasks/snapTasks');

l10n/bundle.l10n.cs.json

@@ -5,12 +5,12 @@
   "'{0}' was not set in the debug configuration.": "\"{0}\" wurde in der Debugkonfiguration nicht festgelegt.",
   "1 reference": "1 Verweis",
   "A valid dotnet installation could not be found: {0}": "Es wurde keine gültige dotnet-Installation gefunden: {0}",
-  "Active File Context": "Active File Context",
+  "Active File Context": "Aktiver Dateikontext",
   "Actual behavior": "Tatsächliches Verhalten",
   "An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Fehler bei der Installation des .NET-Debuggers. Die C#-Erweiterung muss möglicherweise neu installiert werden.",
   "Author": "Autor",
   "Bug": "Fehler",
-  "C# Project Context Status": "C# Project Context Status",
+  "C# Project Context Status": "C#-Projektkontextstatus",
   "C# Workspace Status": "C#-Arbeitsbereichsstatus",
   "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Die C#-Konfiguration wurde geändert. Möchten Sie den Sprachserver mit Ihren Änderungen neu starten?",
   "C# configuration has changed. Would you like to reload the window to apply your changes?": "Die C#-Konfiguration wurde geändert. Möchten Sie das Fenster neu laden, um Ihre Änderungen anzuwenden?",
@@ -126,6 +126,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",
+  "Restart server": "Server neu starten",
   "Restore": "Wiederherstellen",
   "Restore already in progress": "Wiederherstellung wird bereits ausgeführt",
   "Restore {0}": "\"{0}\" wiederherstellen",
@@ -138,6 +139,7 @@
   "Self-signed certificate sucessfully {0}": "Selbstsigniertes Zertifikat erfolgreich {0}",
   "Sending request": "Anforderung wird gesendet",
   "Server failed to start after retrying 5 times.": "Der Server konnte nach fünf Wiederholungsversuchen nicht gestartet werden.",
+  "Server stopped": "Der Server wurde beendet.",
   "Show Output": "Ausgabe Anzeigen",
   "Some projects have trouble loading. Please review the output for more details.": "Bei einigen Projekten treten Probleme beim Laden auf. Überprüfen Sie die Ausgabe, um weitere Informationen zu erhalten.",
   "Start": "Start",

l10n/bundle.l10n.de.json

@@ -5,13 +5,13 @@
   "'{0}' was not set in the debug configuration.": "No se estableció '{0}' en la configuración de depuración.",
   "1 reference": "1 referencia",
   "A valid dotnet installation could not be found: {0}": "No se encontró una instalación de dotnet válida: {0}",
-  "Active File Context": "Active File Context",
+  "Active File Context": "Contexto de archivo activo",
   "Actual behavior": "Comportamiento real",
   "An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Error durante la instalación del depurador de .NET. Es posible que sea necesario reinstalar la extensión de C#.",
   "Author": "Autor",
   "Bug": "Error",
-  "C# Project Context Status": "C# Project Context Status",
-  "C# Workspace Status": "C# Workspace Status",
+  "C# Project Context Status": "Estado de contexto del proyecto de C#",
+  "C# Workspace Status": "Estado del área de trabajo de C#",
   "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "La configuración de C# ha cambiado. ¿Desea volver a iniciar el servidor de lenguaje con los cambios?",
   "C# configuration has changed. Would you like to reload the window to apply your changes?": "La configuración de C# ha cambiado. ¿Desea volver a cargar la ventana para aplicar los cambios?",
   "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "No se encuentra ninguna carpeta de área de trabajo abierta. Abra una carpeta antes de iniciar la depuración con una configuración de '{0}'.",
@@ -94,7 +94,7 @@
   "OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.": "OmniSharp requiere una instalación completa de Mono (incluido MSBuild) para proporcionar servicios de lenguaje cuando \"omnisharp.useModernNet\" está deshabilitado en Configuración. Instale la versión más reciente de Mono y reinicie.",
   "Open envFile": "Abrir envFile",
   "Open settings": "Abrir configuración",
-  "Open solution": "Open solution",
+  "Open solution": "Abrir solución",
   "Operating system \"{0}\" not supported.": "No se admite el sistema operativo \"{0}\".",
   "Package {0} download from {1} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download": "Error en la comprobación de integridad del paquete {0} desde {1}. Es posible que algunas características no funcionen según lo esperado. Reinicie Visual Studio Code para volver a desencadenar la descarga",
   "Perform the actions (or no action) that resulted in your Razor issue": "Realizar las acciones (o ninguna acción) que provocaron el problema de Razor",
@@ -126,6 +126,7 @@
   "Required assets to build and debug are missing from '{0}'. Add them?": "Faltan los recursos en '{0}' necesarios para compilar y depurar. ¿Quiere agregarlos?",
   "Restart": "Reiniciar",
   "Restart Language Server": "Reiniciar servidor de lenguaje",
+  "Restart server": "Reiniciar servidor",
   "Restore": "Restaurar",
   "Restore already in progress": "La restauración ya está en curso",
   "Restore {0}": "Restaurar {0}",
@@ -138,6 +139,7 @@
   "Self-signed certificate sucessfully {0}": "El certificado autofirmado {0} correctamente",
   "Sending request": "Enviando la solicitud",
   "Server failed to start after retrying 5 times.": "El servidor no se pudo iniciar después de reintentar 5 veces.",
+  "Server stopped": "Servidor detenido",
   "Show Output": "Mostrar salida",
   "Some projects have trouble loading. Please review the output for more details.": "Algunos proyectos tienen problemas para cargarse. Revise la salida para obtener más detalles.",
   "Start": "Iniciar",
@@ -183,7 +185,7 @@
   "Virtual document file path": "Ruta de archivo del documento virtual",
   "WARNING": "ADVERTENCIA",
   "Workspace information": "Ver información del área de trabajo",
-  "Workspace projects": "Workspace projects",
+  "Workspace projects": "Proyectos de área de trabajo",
   "Would you like to restart the Razor Language Server to enable the Razor trace configuration change?": "¿Desea reiniciar el servidor de lenguaje Razor para habilitar el cambio de configuración de seguimiento de Razor?",
   "Yes": "Sí",
   "You must first start the data collection before copying.": "Primero debe iniciar la recopilación de datos antes de copiar.",