Skip to content

Commit 31db8be

Browse files
authored
Merge branch 'main' into merges/release-to-main
2 parents 65a6081 + 0e63b4a commit 31db8be

File tree

85 files changed

+28287
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+28287
-185
lines changed

.vscode/launch.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,17 @@
290290
"NEW_DEPS_ID": "Razor"
291291
},
292292
"cwd": "${workspaceFolder}"
293-
}
293+
},
294+
{
295+
"type": "node",
296+
"request": "launch",
297+
"name": "Generate debugger options schema",
298+
"preLaunchTask": "build",
299+
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
300+
"args": [
301+
"generateOptionsSchema"
302+
],
303+
"cwd": "${workspaceFolder}"
304+
}
294305
]
295306
}

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- [O# Parity] FixAll support for code fixes and refactorings [#5735](https://github.com/dotnet/vscode-csharp/issues/5735)
55
- [O# Parity] Nuget restore [#5725](https://github.com/dotnet/vscode-csharp/issues/5725)
6-
- [O# Parity] Support loading projects/files without a solution file [#5722](https://github.com/dotnet/vscode-csharp/issues/5722)
7-
- [O# Parity] Some csproj projects will not correctly load [#5721](https://github.com/dotnet/vscode-csharp/issues/5721)
6+
- [O# Parity] Projects running on Mono may not load correctly [#5721](https://github.com/dotnet/vscode-csharp/issues/5721)
87
- [O# Parity] Run and debug tests in context [#5719](https://github.com/dotnet/vscode-csharp/issues/5719)
98
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
109

1110
## Latest
11+
* Update Roslyn version
12+
* Includes better support for .NET 8 and .NET Framework-targeting projects (PR: [#69616](https://github.com/dotnet/roslyn/pull/69616))
13+
* 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.
14+
* Fix issues where some projects fail to load being unable to find NuGet.Frameworks (PR: [#69824](https://github.com/dotnet/roslyn/pull/69824))
15+
16+
## 2.0.448
1217
* Update Roslyn version (PR: [#6264](https://github.com/dotnet/vscode-csharp/pull/6264))
1318
* Upgrade MSBuildLocator to fix homebrew dotnet resolution (PR: [#69769](https://github.com/dotnet/roslyn/pull/69769))
1419
* Fix reported ExeName / ExeVersion (PR: [#69771](https://github.com/dotnet/roslyn/pull/69771))

jest.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const config: Config = {
88
projects: [
99
'<rootDir>/test/unitTests/jest.config.ts',
1010
'<rootDir>/test/integrationTests/jest.config.ts',
11+
'<rootDir>/test/razorTests/jest.config.ts',
1112
'<rootDir>/omnisharptest/omnisharpJestTests/jest.config.ts',
1213
],
1314
};

l10n/bundle.l10n.cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"Required assets to build and debug are missing from '{0}'. Add them?": "V „{0}“ chybí požadované prostředky pro sestavení a ladění. Chcete je přidat?",
100100
"Restart": "Restartovat",
101101
"Restart Language Server": "Restartovat jazykový server",
102-
"Run and Debug: A valid browser is not installed": "Spustit a ladit: Není nainstalovaný platný prohlížeč.",
102+
"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.",
103103
"Run and Debug: auto-detection found {0} for a launch browser": "Spustit a ladit: Automatická detekce našla {0} pro spouštěný prohlížeč.",
104104
"See {0} output": "Zobrazit výstup {0}",
105105
"Select the process to attach to": "Vyberte proces, ke kterému se má program připojit.",

l10n/bundle.l10n.de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"Required assets to build and debug are missing from '{0}'. Add them?": "Erforderliche Ressourcen zum Erstellen und Debuggen fehlen in \"{0}\". Sie hinzufügen?",
100100
"Restart": "Neu starten",
101101
"Restart Language Server": "Sprachserver neu starten",
102-
"Run and Debug: A valid browser is not installed": "Ausführen und Debuggen: Es ist kein gültiger Browser installiert.",
102+
"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.",
103103
"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.",
104104
"See {0} output": "{0}-Ausgabe anzeigen",
105105
"Select the process to attach to": "Prozess auswählen, an den angefügt werden soll",

l10n/bundle.l10n.es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"Required assets to build and debug are missing from '{0}'. Add them?": "Faltan los recursos en '{0}' necesarios para compilar y depurar. ¿Quiere agregarlos?",
100100
"Restart": "Reiniciar",
101101
"Restart Language Server": "Reiniciar servidor de lenguaje",
102-
"Run and Debug: A valid browser is not installed": "Ejecutar y depurar: no hay instalado un explorador válido",
102+
"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.",
103103
"Run and Debug: auto-detection found {0} for a launch browser": "Ejecución y depuración: detección automática encontrada {0} para un explorador de inicio",
104104
"See {0} output": "Ver salida {0}",
105105
"Select the process to attach to": "Seleccione el proceso al que debe asociarse",

l10n/bundle.l10n.fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"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 ?",
100100
"Restart": "Redémarrer",
101101
"Restart Language Server": "Redémarrer le serveur de langue",
102-
"Run and Debug: A valid browser is not installed": "Exécuter et déboguer : aucun navigateur valide n’est installé",
102+
"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.",
103103
"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",
104104
"See {0} output": "Voir la sortie {0}",
105105
"Select the process to attach to": "Sélectionner le processus à attacher",

l10n/bundle.l10n.it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"Required assets to build and debug are missing from '{0}'. Add them?": "Le risorse necessarie per la compilazione e il debug non sono presenti in '{0}'. Aggiungerli?",
100100
"Restart": "Riavvia",
101101
"Restart Language Server": "Riavviare il server di linguaggio",
102-
"Run and Debug: A valid browser is not installed": "Esecuzione e debug: non è installato un browser valido",
102+
"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.",
103103
"Run and Debug: auto-detection found {0} for a launch browser": "Esecuzione e debug: il rilevamento automatico ha trovato {0} per un browser di avvio",
104104
"See {0} output": "Vedi output {0}",
105105
"Select the process to attach to": "Selezionare il processo a cui collegarsi",

l10n/bundle.l10n.ja.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"Required assets to build and debug are missing from '{0}'. Add them?": "ビルドおよびデバッグに必要な資産が '{0}' にありません。追加しますか?",
100100
"Restart": "再起動",
101101
"Restart Language Server": "言語サーバーの再起動",
102-
"Run and Debug: A valid browser is not installed": "実行とデバッグ: 有効なブラウザーがインストールされていません",
102+
"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.",
103103
"Run and Debug: auto-detection found {0} for a launch browser": "実行とデバッグ: 起動ブラウザーの自動検出で {0} が見つかりました",
104104
"See {0} output": "{0} 出力を参照",
105105
"Select the process to attach to": "アタッチするプロセスを選択する",

l10n/bundle.l10n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.": "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.",
118118
"View Debug Docs": "View Debug Docs",
119119
"Ignore": "Ignore",
120-
"Run and Debug: A valid browser is not installed": "Run and Debug: A valid browser is not installed",
120+
"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.",
121121
"dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
122122
"Reload Window": "Reload Window",
123123
"C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",

0 commit comments

Comments
 (0)