Skip to content

Commit 604c555

Browse files
authored
Merge branch 'main' into WaitForHtmlBufferUpdate
2 parents 648d8ea + 187e269 commit 604c555

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CHANGELOG.md

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

66
# 2.101.x
7+
* Update Roslyn to 5.3.0-2.25557.4 (PR: [#8759](https://github.com/dotnet/vscode-csharp/pull/8759))
8+
* Implement canonical miscellaneous files project loader for non-file-based programs (PR: [#80748](https://github.com/dotnet/roslyn/pull/80748))
9+
* Better handle if a BuildHost process crashes that prevents connection (PR: [#81041](https://github.com/dotnet/roslyn/pull/81041))
710
* Wait for Html buffer updates before making requests (PR: [#8748](https://github.com/dotnet/vscode-csharp/pull/8748))
811

912
# 2.97.x

docs/debugger/Troubleshoot-loading-the-.NET-Debug-Services.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can test for this condition by adding the following code to the start of you
4646
else if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.OSX))
4747
{
4848
nativeLibraryPrefix = "lib";
49-
nativeLibraryExtension = ".so";
49+
nativeLibraryExtension = ".dylib";
5050
}
5151
else
5252
{
@@ -101,4 +101,4 @@ Step 5: Start debugging. You should hopefully see debugging still fail with the
101101
### Error cause 3: Mismatched processor architecture (macOS only)
102102

103103
On ARM64 macOS, this error can be caused if the processor architecture of the debugger is different from the processor architecture of the target process. See [Debugging x64 processes on an arm64 computer
104-
](Debugging-x64-processes-on-an-arm64-computer) for more information.
104+
](Debugging-x64-processes-on-an-arm64-computer) for more information.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"workspace"
4141
],
4242
"defaults": {
43-
"roslyn": "5.3.0-2.25553.6",
43+
"roslyn": "5.3.0-2.25557.4",
4444
"omniSharp": "1.39.14",
4545
"razor": "10.0.0-preview.25552.2",
4646
"razorOmnisharp": "7.0.0-preview.23363.1",

0 commit comments

Comments
 (0)