Merge remote-tracking branch 'upstream/main' into nuget_restore

Author: dibarbet

.vscode/launch.json

@@ -41,7 +41,8 @@
                 "${workspaceFolder}/**",
                 "!**/node_modules/**"
             ],
-            "preLaunchTask": "buildDev"
+            "preLaunchTask": "buildDev",
+            "internalConsoleOptions": "openOnSessionStart"
         },
         {
             "name": "Launch Current File BasicRazorApp2_1 Integration Tests",
@@ -69,7 +70,8 @@
                 "${workspaceFolder}/**",
                 "!**/node_modules/**"
             ],
-            "preLaunchTask": "buildDev"
+            "preLaunchTask": "buildDev",
+            "internalConsoleOptions": "openOnSessionStart"
         },
         {
             "name": "Omnisharp: Launch Current File Integration Tests",

CHANGELOG.md

@@ -5,17 +5,24 @@
 - [O# Parity] Nuget restore [#5725](https://github.com/dotnet/vscode-csharp/issues/5725)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
-## Next (Replace once current release version is generated)
+## Latest
 * Update Roslyn to 4.9.0-1.23530.4 (PR: [#6603](https://github.com/dotnet/vscode-csharp/pull/6603))
   * Enable NuGet restore commands `dotnet.restore.all` and `dotnet.restore.project` (PR: [#70588](https://github.com/dotnet/roslyn/pull/70588))
   * Fix issue where server did not reload projects after NuGet restore (PR: [#70602](https://github.com/dotnet/roslyn/pull/70602))
+* Update debugger to 2.9.0 (PR: [#6623](https://github.com/dotnet/vscode-csharp/pull/6623))
+  * Flush `Console.Write` buffer more often (Fixes: [#6598](https://github.com/dotnet/vscode-csharp/issues/6598))
+  * Fix logpoint freezing on start (Fixes: [#6585](https://github.com/dotnet/vscode-csharp/issues/6585))
+  * Fix logpoints when using variables after breakpoint breaks (Fixes: [#583](https://github.com/microsoft/vscode-dotnettools/issues/583))
 
-## Latest
-* Update Roslyn to 4.9.0-1.23525.5 (PR: [#6595](https://github.com/dotnet/vscode-csharp/pull/6595))
+## 2.9.20
+* Bump Roslyn to 4.9.0-1.23526.14 (PR: [#6608](https://github.com/dotnet/vscode-csharp/pull/6608))
   * Fix some project loading issues caused by evaluation failures (PR: [#70496](https://github.com/dotnet/roslyn/pull/70496))
   * Ensure evaluation diagnostics are logged during project load (PR: [#70467](https://github.com/dotnet/roslyn/pull/70467))
   * Include evaluation results in binlogs (PR: [#70472](https://github.com/dotnet/roslyn/pull/70472))
   * Fix failure to start language server when pipe name is too long (PR: [#70492](https://github.com/dotnet/roslyn/pull/70492))
+* Update Razor to 7.0.0-preview.23528.1 (PR: [#6607](https://github.com/dotnet/vscode-csharp/pull/6607))
+* Support platform agnostic Razor language server & telemetry (PR: [#6600](https://github.com/dotnet/vscode-csharp/pull/6600))
+* Fix issue where runtime from PATH was not found when only 7.0.100 SDK was installed (PR: [#6601](https://github.com/dotnet/vscode-csharp/pull/6601))
 
 ## 2.8.23
 * Fix various failed requests in razor documents (PR: [#6580](https://github.com/dotnet/vscode-csharp/pull/6580))

README.md

@@ -6,7 +6,7 @@ While it is possible to use the C# extension as a standalone extension, we highl
 
 1. Installing [C# Dev Kit][csdevkitextension] will automatically install this extension as a required dependency.
 2. Open a folder/workspace that contains a C# project (.csproj) and a C# solution (.sln) and the extension will activate.
-3. Whether you install C# Dev Kit or just the C# extension, the [.NET Runtime Installer Tool extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscode-dotnet-runtime) will be installed as a dependency.
+3. Whether you install C# Dev Kit or just the C# extension, the [.NET Install Tool](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscode-dotnet-runtime) will be installed as a dependency.
 
 Note: If working on a solution that requires versions prior to .NET 6 or non-solution based projects, install a .NET Framework runtime and [MSBuild tooling](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022).
   * Set omnisharp.useModernNet to false and set dotnet.server.useOmnisharp to true

azure-pipelines/test-omnisharp.yml

@@ -14,6 +14,17 @@ steps:
   env:
     DISPLAY: :99.0
 
+- task: PublishTestResults@2
+  condition: succeededOrFailed()
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFormat: 'JUnit'
+    testResultsFiles: '*junit.xml'
+    searchFolder: '$(Build.SourcesDirectory)/out'
+    publishRunAttachments: true
+    mergeTestResults: true
+    testRunTitle: OmniSharp $(Agent.JobName) (Attempt $(System.JobAttempt))
+
 - task: PublishPipelineArtifact@1
   condition: failed()
   displayName: 'Upload integration test logs'

azure-pipelines/test.yml

@@ -36,6 +36,17 @@ jobs:
     env:
       DISPLAY: :99.0
 
+  - task: PublishTestResults@2
+    condition: succeededOrFailed()
+    displayName: 'Publish Test Results'
+    inputs:
+      testResultsFormat: 'JUnit'
+      testResultsFiles: '*junit.xml'
+      searchFolder: '$(Build.SourcesDirectory)/out'
+      publishRunAttachments: true
+      mergeTestResults: true
+      testRunTitle: $(Agent.JobName) (Attempt $(System.JobAttempt))
+
   - task: PublishPipelineArtifact@1
     condition: failed()
     displayName: 'Upload integration test logs'

jest.config.ts

@@ -14,6 +14,23 @@ const config: Config = {
         '<rootDir>/omnisharptest/omnisharpUnitTests/jest.config.ts',
         '<rootDir>/omnisharptest/omnisharpIntegrationTests/jest.config.ts',
     ],
+    // Reporters are a global jest configuration property and cannot be set in the project jest config.
+    // This configuration will create a 'junit.xml' file in the output directory, no matter which test project is running.
+    // In order to not overwrite test results in CI, we configure a unique output file name in the gulp testTasks.
+    reporters: [
+        'default',
+        [
+            'jest-junit',
+            {
+                outputDirectory: '<rootDir>/out/',
+                reportTestSuiteErrors: 'true',
+                // Azure DevOps does not display test suites (it ignores them entirely).
+                // So we have to put all the info in the test case name so the UI shows anything relatively useful.
+                // See https://github.com/microsoft/azure-pipelines-tasks/issues/7659
+                titleTemplate: '{filename} / {suitename} / {title}',
+            },
+        ],
+    ],
 };
 
 export default config;

l10n/bundle.l10n.cs.json

@@ -29,7 +29,9 @@
   "Could not find '{0}' in or above '{1}'.": "Nepovedlo se najít {0} v {1} ani výše.",
   "Could not find Razor Language Server executable within directory '{0}'": "V adresáři {0} se nepovedlo najít spustitelný soubor jazykového serveru Razor.",
   "Could not find a process id to attach.": "Nepovedlo se najít ID procesu, který se má připojit.",
+  "Could not locate .NET Core project in '{0}'. Assets were not generated.": "Could not locate .NET Core project in '{0}'. Assets were not generated.",
   "Couldn't create self-signed certificate. See output for more information.": "Certifikát podepsaný svým držitelem (self-signed certificate) se nepovedlo vytvořit. Další informace najdete ve výstupu.",
+  "Couldn't create self-signed certificate. {0}\r\ncode: {1}\r\nstdout: {2}": "Couldn't create self-signed certificate. {0}\r\ncode: {1}\r\nstdout: {2}",
   "Description of the problem": "Popis problému",
   "Disable message in settings": "Zakázat zprávu v nastavení",
   "Do not load any": "Nic nenačítat",
@@ -114,15 +116,20 @@
   "Steps to reproduce": "Kroky pro reprodukci",
   "Stop": "Zastavit",
   "Synchronization timed out": "Vypršel časový limit synchronizace.",
+  "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.",
+  "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.",
   "The C# extension is still downloading packages. Please see progress in the output window below.": "Rozšíření C# stále stahuje balíčky. Průběh si můžete prohlédnout v okně výstupu níže.",
   "The C# extension was unable to automatically decode projects in the current workspace to create a runnable launch.json file. A template launch.json file has been created as a placeholder.\r\n\r\nIf the server is currently unable to load your project, you can attempt to resolve this by restoring any missing project dependencies (example: run 'dotnet restore') and by fixing any reported errors from building the projects in your workspace.\r\nIf this allows the server to now load your project then --\r\n  * Delete this file\r\n  * Open the Visual Studio Code command palette (View->Command Palette)\r\n  * run the command: '.NET: Generate Assets for Build and Debug'.\r\n\r\nIf your project requires a more complex launch configuration, you may wish to delete this configuration and pick a different template using the 'Add Configuration...' button at the bottom of this file.": "Rozšíření C# nemohlo automaticky dekódovat projekty v aktuálním pracovním prostoru a vytvořit spustitelný soubor launch.json. Soubor launch.json šablony se vytvořil jako zástupný symbol.\r\n\r\nPokud server momentálně nemůže načíst váš projekt, můžete se pokusit tento problém vyřešit obnovením chybějících závislostí projektu (například spuštěním příkazu dotnet restore) a opravou všech nahlášených chyb při sestavování projektů ve vašem pracovním prostoru.\r\nPokud to serveru umožní načíst váš projekt, pak --\r\n  * Odstraňte tento soubor\r\n  * Otevřete paletu příkazů Visual Studio Code (View->Command Palette)\r\n  * Spusťte příkaz: .“NET: Generate Assets for Build and Debug“ (Generovat prostředky pro sestavení a ladění).\r\n\r\nPokud váš projekt vyžaduje složitější konfiguraci spuštění, možná budete chtít tuto konfiguraci odstranit a vybrat jinou šablonu pomocí možnosti „Přidat konfiguraci“ v dolní části tohoto souboru.",
   "The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?": "Vybraná konfigurace spuštění je nakonfigurovaná tak, aby spustila webový prohlížeč, ale nenašel se žádný důvěryhodný vývojový certifikát. Chcete vytvořit důvěryhodný certifikát podepsaný svým držitelem (self-signed certificate)?",
+  "The value '{0}' for 'targetArchitecture' in launch configuraiton is invalid. Expected 'x86_64' or 'arm64'.": "The value '{0}' for 'targetArchitecture' in launch configuraiton is invalid. Expected 'x86_64' or 'arm64'.",
   "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.": "Při spouštění relace ladění došlo k neočekávané chybě. Pokud chcete získat více informací, podívejte se, jestli se v konzole nenacházejí užitečné protokoly, a projděte si dokumenty k ladění.",
   "Token cancellation requested: {0}": "Požádáno o zrušení tokenu: {0}",
   "Transport attach could not obtain processes list.": "Operaci připojení přenosu se nepovedlo získat seznam procesů.",
   "Tried to bind on notification logic while server is not started.": "Došlo k pokusu o vytvoření vazby s logikou oznámení ve chvíli, kdy server není spuštěný.",
   "Tried to bind on request logic while server is not started.": "Došlo k pokusu o vytvoření vazby s logikou požadavku ve chvíli, kdy server není spuštěný.",
   "Tried to send requests while server is not started.": "Došlo k pokusu o odeslání žádostí ve chvíli, kdy server není spuštěný.",
+  "Unable to determine RuntimeId. Please set 'targetArchitecture' in your launch.json configuration.": "Unable to determine RuntimeId. Please set 'targetArchitecture' in your launch.json configuration.",
+  "Unable to determine a configuration for '{0}'. Please generate C# debug assets instead.": "Unable to determine a configuration for '{0}'. Please generate C# debug assets instead.",
   "Unable to determine debug settings for project '{0}'": "Nepovedlo se určit nastavení ladění pro projekt „{0}“",
   "Unable to find Razor extension version.": "Nepovedlo se najít verzi rozšíření Razor.",
   "Unable to generate assets to build and debug. {0}.": "Nepovedlo se vygenerovat prostředky pro sestavení a ladění. {0}",
@@ -150,6 +157,7 @@
   "[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ší.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[CHYBA] Ladicí program nelze nainstalovat. Neznámá platforma.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[CHYBA]: Rozšíření jazyka C# se nepodařilo nainstalovat balíček ladicího programu.",
+  "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Možnost dotnet.server.useOmharharp se změnila. Pokud chcete změnu použít, načtěte prosím znovu okno.",
   "pipeArgs must be a string or a string array type": "pipeArgs musí být řetězec nebo typ pole řetězců",
   "{0} Keyword": "Klíčové slovo {0}",