Skip to content

Commit 52d1fe0

Browse files
dibarbetdibarbet
authored
Merge pull request #7311 from dotnet/merge_prerelease_to_release
Merge prerelease to release
2 parents 767a940 + 6b0a904 commit 52d1fe0

31 files changed

+624
-548
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ pipelines:
3030
lastModifiedDate: 2024-03-19
3131
armory:
3232
lastModifiedDate: 2024-03-19
33+
policheck:
34+
lastModifiedDate: 2024-06-27
3335
binary:
3436
credscan:
3537
lastModifiedDate: 2024-03-19

‎.config/guardian/.gdnbaselines

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
],
2222
"tool": "credscan",
2323
"ruleId": "CSCAN-GENERAL0020",
24-
"createdDate": "2024-04-19 18:19:20Z",
25-
"expirationDate": "2024-10-06 18:25:02Z",
26-
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-19 18:25:02Z"
24+
"createdDate": "2024-06-27 21:30:23Z",
25+
"expirationDate": "2024-12-14 21:44:58Z",
26+
"justification": "This error is baselined with an expiration date of 180 days from 2024-06-27 21:44:58Z"
2727
}
2828
}
2929
}

‎.config/guardian/TSAConfig.gdntsa

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"codebaseName": "VSCode-CSharp-GitHub",
3+
"notificationAliases": [
4+
"[email protected]"
5+
],
6+
"codebaseAdmins": [
7+
"REDMOND\\phillipa",
8+
"REDMOND\\arkalyan"
9+
],
10+
"instanceUrl": "https://devdiv.visualstudio.com",
11+
"projectName": "DevDiv",
12+
"areaPath": "DevDiv\\NET Developer Experience\\CSharp and VB IDE\\VSCode",
13+
"iterationPath": "DevDiv",
14+
"allTools": true
15+
}

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# Latest
7+
* Bump xamltools to 17.11.35027.17 (PR: [#7288](https://github.com/dotnet/vscode-csharp/pull/7288))
8+
* Fix impossible to enter multiple spaces in attribute area
9+
* Fix cannot accept Copilot suggestion with Tab when IntelliSense is open
10+
* Fixing snippets in Razor LSP completion (PR: [#7274](https://github.com/dotnet/vscode-csharp/pull/7274))
11+
* Fix NRE in Razor completion. (PR: [#7272](https://github.com/dotnet/vscode-csharp/pull/7272))
12+
* Update debugger to indicate Monterey as the lowest supported MacOS version (PR: [#7256](https://github.com/dotnet/vscode-csharp/pull/7256))
13+
* Improve Razor completion experience (tag helpers, icons) (PR: [#7205](https://github.com/dotnet/vscode-csharp/pull/7205))
14+
15+
# 2.36.19
716
* Update Razor to 9.0.0-preview.24325.5 (PR: [#7277](https://github.com/dotnet/vscode-csharp/pull/7277))
817
* Fix completion commit characters (PR: [#10533](https://github.com/dotnet/razor/pull/10533))
918
* Add back roll foward to rzls (PR: [#10530](https://github.com/dotnet/razor/pull/10530))

‎azure-pipelines-official.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,21 @@ extends:
3333
name: netcore1espool-internal
3434
image: 1es-windows-2022
3535
os: windows
36+
sdl:
37+
sourceAnalysisPool:
38+
name: netcore1espool-internal
39+
image: 1es-windows-2022
40+
os: windows
41+
policheck:
42+
enabled: true
43+
tsa:
44+
enabled: true
45+
configFile: '$(Build.SourcesDirectory)/.config/guardian/TSAConfig.gdntsa'
3646
customBuildTags:
3747
- ES365AIMigrationTooling
3848
stages:
3949
- template: /azure-pipelines/build-all.yml@self
4050
parameters:
4151
versionNumberOverride: ${{ parameters.versionNumberOverride }}
4252
isOfficial: true
43-
channel: ${{ parameters.channel }}
53+
channel: ${{ parameters.channel }}

‎l10n/bundle.l10n.cs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"Unable to resolve VSCode's version of CSharp": "Nepovedlo se rozpoznat verzi jazyka CSharp v nástroji VSCode.",
151151
"Unable to resolve VSCode's version of Html": "Nepovedlo se přeložit verzi HTML nástroje VSCode.",
152152
"Unexpected RuntimeId '{0}'.": "Neočekávané RuntimeId „{0}“",
153-
"Unexpected completion trigger kind: {0}": "Neočekávaný druh triggeru dokončení: {0}",
154153
"Unexpected error when attaching to C# preview window.": "Při připojování k oknu náhledu jazyka C# došlo k neočekávané chybě.",
155154
"Unexpected error when attaching to HTML preview window.": "Při připojování k oknu náhledu HTML došlo k neočekávané chybě.",
156155
"Unexpected error when attaching to report Razor issue window.": "Při připojování k oknu pro nahlášení problémů s Razorem došlo k neočekávané chybě.",
@@ -168,7 +167,8 @@
168167
"You must first start the data collection before copying.": "Před kopírováním je zapotřebí nejdříve spustit shromažďování dat.",
169168
"You must first start the data collection before stopping.": "Před zastavením je zapotřebí nejdříve spustit shromažďování dat.",
170169
"Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Váš pracovní prostor má více souborů řešení Visual Studio. Vyberte prosím jednu, abyste získali úplnou technologii IntelliSense.",
171-
"[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program vyžaduje macOS 10.12 (Sierra) nebo novější.",
170+
"[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program není pro {0} podporován.",
171+
"[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program vyžaduje macOS 12 (Monterey) nebo novější.",
172172
"[ERROR] The debugger cannot be installed. Unknown platform.": "[CHYBA] Ladicí program nelze nainstalovat. Neznámá platforma.",
173173
"[ERROR]: C# Extension failed to install the debugger package.": "[CHYBA]: Rozšíření jazyka C# se nepodařilo nainstalovat balíček ladicího programu.",
174174
"[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[UPOZORNĚNÍ]: Ladicí program .NET nepodporuje systém Windows pro platformu x86. Ladění nebude k dispozici.",

‎l10n/bundle.l10n.de.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"Unable to resolve VSCode's version of CSharp": "VSCode-Version von CSharp kann nicht aufgelöst werden.",
151151
"Unable to resolve VSCode's version of Html": "VSCode-Version von HTML kann nicht aufgelöst werden",
152152
"Unexpected RuntimeId '{0}'.": "Unerwartete RuntimeId \"{0}\".",
153-
"Unexpected completion trigger kind: {0}": "Unerwartete Vervollständigungstriggerart: {0}",
154153
"Unexpected error when attaching to C# preview window.": "Unerwarteter Fehler beim Anfügen an das C#-Vorschaufenster.",
155154
"Unexpected error when attaching to HTML preview window.": "Unerwarteter Fehler beim Anfügen an das HTML-Vorschaufenster.",
156155
"Unexpected error when attaching to report Razor issue window.": "Unerwarteter Fehler beim Anfügen an das Fenster \"Razor-Problem melden\"",
@@ -168,7 +167,8 @@
168167
"You must first start the data collection before copying.": "Sie müssen die Datensammlung vor dem Kopieren starten.",
169168
"You must first start the data collection before stopping.": "Sie müssen zuerst die Datensammlung starten, bevor Sie sie beenden.",
170169
"Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Ihr Arbeitsbereich umfasst mehrere Visual Studio-Projektmappendateien. Wählen Sie eine aus, um vollständiges IntelliSense zu erhalten.",
171-
"[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[FEHLER] Der Debugger kann nicht installiert werden. Der Debugger erfordert macOS 10.12 (Sierra) oder höher.",
170+
"[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[FEHLER] Der Debugger kann nicht installiert werden. Der Debugger wird für „{0}“ nicht unterstützt.",
171+
"[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[FEHLER] Der Debugger kann nicht installiert werden. Der Debugger erfordert macOS 12 (Monterey) oder höher.",
172172
"[ERROR] The debugger cannot be installed. Unknown platform.": "[FEHLER] Der Debugger kann nicht installiert werden. Unbekannte Plattform.",
173173
"[ERROR]: C# Extension failed to install the debugger package.": "[FEHLER]: Fehler beim Installieren des Debuggerpakets durch die C#-Erweiterung.",
174174
"[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[WARNUNG]: x86 Windows wird vom .NET-Debugger nicht unterstützt. Debuggen ist nicht verfügbar.",

‎l10n/bundle.l10n.es.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"Unable to resolve VSCode's version of CSharp": "No se puede resolver la versión de CSharp de VSCode",
151151
"Unable to resolve VSCode's version of Html": "No se puede resolver la versión de HTML de VSCode",
152152
"Unexpected RuntimeId '{0}'.": "RuntimeId '{0}' inesperado.",
153-
"Unexpected completion trigger kind: {0}": "Tipo de desencadenador de finalización inesperado: {0}",
154153
"Unexpected error when attaching to C# preview window.": "Error inesperado al adjuntar a la ventana de vista previa de C#.",
155154
"Unexpected error when attaching to HTML preview window.": "Error inesperado al adjuntar a la ventana de vista previa HTML.",
156155
"Unexpected error when attaching to report Razor issue window.": "Error inesperado al adjuntar a la ventana de problemas de Razor de informe.",
@@ -168,7 +167,8 @@
168167
"You must first start the data collection before copying.": "Primero debe iniciar la recopilación de datos antes de copiar.",
169168
"You must first start the data collection before stopping.": "Primero debe iniciar la recopilación de datos antes de detenerse.",
170169
"Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "El área de trabajo tiene varios archivos de solución de Visual Studio; seleccione uno para obtener IntelliSense completo.",
171-
"[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERROR] No se puede instalar el depurador. El depurador requiere macOS 10.12 (Sierra) o posterior.",
170+
"[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERROR] No se puede instalar el depurador. El depurador no se admite en '{0}'",
171+
"[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERROR] No se puede instalar el depurador. El depurador requiere macOS 12 (Monterey) o una versión más reciente.",
172172
"[ERROR] The debugger cannot be installed. Unknown platform.": "[ERROR] No se puede instalar el depurador. Plataforma desconocida.",
173173
"[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: la extensión de C# no pudo instalar el paquete del depurador.",
174174
"[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[ADVERTENCIA]: El depurador de .NET no admite Windows x86. La depuración no estará disponible.",

‎l10n/bundle.l10n.fr.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"Unable to resolve VSCode's version of CSharp": "Impossible de résoudre la version de CSharp de VSCode",
151151
"Unable to resolve VSCode's version of Html": "Impossible de résoudre la version HTML de VSCode",
152152
"Unexpected RuntimeId '{0}'.": "RuntimeId « {0} » inattendu.",
153-
"Unexpected completion trigger kind: {0}": "Genre de déclencheur d’achèvement inattendu : {0}",
154153
"Unexpected error when attaching to C# preview window.": "Erreur inattendue lors de l’attachement à la fenêtre d’aperçu C#.",
155154
"Unexpected error when attaching to HTML preview window.": "Erreur inattendue lors de l’attachement à la fenêtre d’aperçu HTML.",
156155
"Unexpected error when attaching to report Razor issue window.": "Erreur inattendue lors de l’attachement à la fenêtre de rapport du problème Razor.",
@@ -168,7 +167,8 @@
168167
"You must first start the data collection before copying.": "Vous devez d’abord démarrer la collecte de données avant de la copier.",
169168
"You must first start the data collection before stopping.": "Vous devez commencer par démarrer la collecte de données avant de l’arrêter.",
170169
"Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Votre espace de travail comporte plusieurs fichiers solution Visual Studio ; sélectionnez-en un pour obtenir intelliSense complet.",
171-
"[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERREUR] Impossible d’installer le débogueur. Le débogueur nécessite macOS 10.12 (Sierra) ou version ultérieure.",
170+
"[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERREUR] Impossible d’installer le débogueur. Le débogueur n’est pas pris en charge sur « {0} »",
171+
"[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERREUR] Impossible d’installer le débogueur. Le débogueur nécessite macOS 12 (Monterey) ou une version plus récente.",
172172
"[ERROR] The debugger cannot be installed. Unknown platform.": "[ERREUR] Impossible d’installer le débogueur. Plateforme inconnue.",
173173
"[ERROR]: C# Extension failed to install the debugger package.": "[ERREUR] : l’extension C# n’a pas pu installer le package du débogueur.",
174174
"[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[AVERTISSEMENT] : Windows x86 n'est pas pris en charge par le débogueur .NET. Le débogage ne sera pas disponible.",

‎l10n/bundle.l10n.it.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"Unable to resolve VSCode's version of CSharp": "Non è possibile risolvere la versione VSCode di CSharp",
151151
"Unable to resolve VSCode's version of Html": "Non è possibile risolvere la versione HTML di VSCode",
152152
"Unexpected RuntimeId '{0}'.": "RuntimeId imprevisto '{0}'.",
153-
"Unexpected completion trigger kind: {0}": "Tipo di trigger di completamento imprevisto: {0}",
154153
"Unexpected error when attaching to C# preview window.": "Errore imprevisto durante il collegamento alla finestra di anteprima di C#.",
155154
"Unexpected error when attaching to HTML preview window.": "Errore imprevisto durante il collegamento alla finestra di anteprima HTML.",
156155
"Unexpected error when attaching to report Razor issue window.": "Errore imprevisto durante il collegamento alla finestra di segnalazione del problema Razor.",
@@ -168,7 +167,8 @@
168167
"You must first start the data collection before copying.": "Prima di eseguire la copia, è necessario avviare la raccolta dati.",
169168
"You must first start the data collection before stopping.": "Prima di arrestare è necessario avviare la raccolta dati prima.",
170169
"Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "L'area di lavoro contiene più file di soluzione Visual Studio; selezionarne uno per ottenere IntelliSense completo.",
171-
"[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERROR] Impossibile installare il debugger. Il debugger richiede macOS 10.12 (Sierra) o versione successiva.",
170+
"[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERROR] Impossibile installare il debugger. Il debugger non è supportato in '{0}'",
171+
"[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERROR] Impossibile installare il debugger. Il debugger richiede macOS 12 (Monterey) o una versione successiva.",
172172
"[ERROR] The debugger cannot be installed. Unknown platform.": "[ERROR] Impossibile installare il debugger. Piattaforma sconosciuta.",
173173
"[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: l'estensione C# non è riuscita a installare il pacchetto del debugger.",
174174
"[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[AVVISO]: x86 Windows non è supportato dal debugger .NET. Il debug non sarà disponibile.",

0 commit comments

Comments
 (0)