Merge pull request #6925 from dotnet/main

Merge main into prerelease

Author: dibarbet

.vscode/launch.json

@@ -169,8 +169,8 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/420a6ec206eb7453acee219ddfe97a14/razorlanguageserver-linux-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/8579bdea0d4232379986316e1f72572f/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/5b08fc7913366c8768377a2dcfa055db/razorlanguageserver-linux-musl-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/83d96cafc10aa3c3fc12d5bbacad6c89/razorlanguageserver-linux-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/e28e9c3759d96a1245e1bd1cc5c5a4d2/razorlanguageserver-osx-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/2726c9e015da3df40d96785def167b38/razorlanguageserver-osx-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/f0497330cb14752e01106d27040b4354/razorlanguageserver-platformagnostic-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/a38740e0591c3332438c589fc8785e3f/razorlanguageserver-win-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/dc56cfd34f209d91021fcd8ca5d40154/razorlanguageserver-win-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/b7731470e03e47b60da3c7fdb5d5a3a8/razorlanguageserver-win-x86-7.0.0-preview.24079.3.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.24079.3",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/0ce72ecaa0b9a67b39cea18025786b90/razorlanguageserver-linux-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/74a65593baeaeb10154713e11a9e68a8/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/5cbae16234f328232da847a0851a1e12/razorlanguageserver-linux-musl-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/060eaf53ac7fd0d71b5d5decf5579f32/razorlanguageserver-linux-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/69648379cf44428a0b9ce6d6561eb27a/razorlanguageserver-osx-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/51b72807ef40beaa1491bddfdeeb63d2/razorlanguageserver-osx-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/67aca4cc00c7b4ab84f2a96e0ec3075c/razorlanguageserver-platformagnostic-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/6d8d428753d69be448825e1a9f6d0eea/razorlanguageserver-win-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/d0fc3a78c8750dac73343148df52b2db/razorlanguageserver-win-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/73353585bcf24eab0cc8d4d621a69e34/razorlanguageserver-win-x86-7.0.0-preview.24123.5.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.24123.5",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/84815a04739f5b763e2153c360e12cf6/devkittelemetry-linux-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/b4f50214c6aa2ce8b5262573d4b6b5df/devkittelemetry-linux-musl-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/adf4a7897daa09a568223ad7de3c72cf/devkittelemetry-linux-musl-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/c0449814753c26a2795808672c3b77e1/devkittelemetry-linux-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/c00d50f4ad20c4cce5aa200d3eeff9fd/devkittelemetry-osx-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/4e918b14388b718713c24f833e9a4a4e/devkittelemetry-osx-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/f983493b8869761430a81c661452fc1d/devkittelemetry-platformagnostic-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/ed3b467402a10d0a96f997a9c57b927b/devkittelemetry-win-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/32f8cf11ce10df3e6c2af81a088b069f/devkittelemetry-win-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/5a469c04cd09bbe907dc144dc42a5710/devkittelemetry-win-x86-7.0.0-preview.24079.3.zip",
-            "NEW_DEPS_VERSION": "7.0.0-preview.24079.3",
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/51adeda12bc934767e36813f327a8baa/devkittelemetry-linux-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/c81a757ab77b6d5605c72875d154979a/devkittelemetry-linux-musl-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/d4f320dd71116931551c073d15326ebd/devkittelemetry-linux-musl-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/f15274366f6896b9c6dfce928959e8ba/devkittelemetry-linux-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/c45539c107a572afe1aff7232eff5ea2/devkittelemetry-osx-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/795c3aa2aaea3dc95ad5d6af0695cc42/devkittelemetry-osx-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/434f2345fd5bcac240e45bc209af9734/devkittelemetry-platformagnostic-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/ea3b4abf058c44c94016ce6249f20e3d/devkittelemetry-win-arm64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/37a2286689b59511ed292913c53bbc1c/devkittelemetry-win-x64-7.0.0-preview.24123.5.zip,https://download.visualstudio.microsoft.com/download/pr/4c52c3f6-ab3d-402c-9334-34d55094901b/da0668950c0478a093fd0a50cd29d5f8/devkittelemetry-win-x86-7.0.0-preview.24123.5.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.24123.5",
             "NEW_DEPS_ID": "RazorTelemetry"
         },
         "cwd": "${workspaceFolder}"

CHANGELOG.md

@@ -4,6 +4,16 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+- Update Roslyn to run on .NET 8 (PR: [#6920](https://github.com/dotnet/vscode-csharp/pull/6920))
+  * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247))
+  * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862))
+  * Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909))
+* Update Razor to 7.0.0-preview.24123.5 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
+  - Upgrade language server to run on .NET 8 (PR: [#9981](https://github.com/dotnet/razor/pull/9981))
+  - Support inlay hints (PR: [#9904](https://github.com/dotnet/razor/pull/9904) and [#6857](https://github.com/dotnet/vscode-csharp/pull/6857))
+  - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891))
+
+## 2.19.13
 * Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879))
 * Add grammar support for new Razor directives: rendermode, preservewhitespace and typeparam (PR: [#6887](https://github.com/dotnet/vscode-csharp/pull/6887))
 * Ensure failures to connect to the named pipe are propagated (PR: [#6881](https://github.com/dotnet/vscode-csharp/pull/6881))

CONTRIBUTING.md

@@ -67,7 +67,7 @@ This section shows how to set up local Razor or Roslyn language servers for debu
 1. Clone the [Roslyn repository](https://github.com/dotnet/roslyn). This repository contains the Roslyn server implementation.
 2. Follow the build instructions provided in the repository.
 
-The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net7.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
+The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
 
 #### Razor
 
@@ -110,7 +110,7 @@ In your workspace `settings.json` file, add the following lines:
 
 ```json
 "dotnet.server.waitForDebugger": true,
-"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net7.0/Microsoft.CodeAnalysis.LanguageServer.dll"
+"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll"
 ```
 
 Replace <roslynRepoRoot> with the actual path to your Roslyn repository.

azure-pipelines/prereqs.yml

@@ -16,7 +16,7 @@ steps:
 - task: UseDotNet@2
   displayName: 'Install .NET Core SDKs'
   inputs:
-    version: '7.x'
+    version: '8.x'
 
 - script: |
     dotnet tool install --tool-path $(Agent.BuildDirectory) nbgv