Skip to content

Commit e982d57

Browse files
dibarbetdibarbet
authored
Merge pull request #7089 from dibarbet/merge_main
Merge main into prerelease
2 parents 9384a84 + 7b1e605 commit e982d57

File tree

5 files changed

+32
-25
lines changed

5 files changed

+32
-25
lines changed

‎CHANGELOG.md

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

66
# Latest
7+
* List solution filter files (.slnf) in the 'Open Solution' command. (PR: [#7082](https://github.com/dotnet/vscode-csharp/pull/7082))
8+
* No longer activate on the presence of .sln or .slnf files (PR: [#7081](https://github.com/dotnet/vscode-csharp/pull/7081))
9+
* Update Debugger Packages to v2.28.1 (PR: [#7072](https://github.com/dotnet/vscode-csharp/pull/7072))
10+
11+
# 2.28.8
712
* Update Roslyn to 4.11.0-1.24226.4 (PR: [#7069](https://github.com/dotnet/vscode-csharp/pull/7069))
813
* Separate document diagnostics into multiple buckets to improve diagnostics performance (PR: [#73073](https://github.com/dotnet/roslyn/pull/73073))
914
* Improve performance of diagnostics when analysis is set to fullSolution (PR: [#73201](https://github.com/dotnet/roslyn/pull/73201))

‎package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420
{
421421
"id": "Debugger",
422422
"description": ".NET Core Debugger (Windows / x64)",
423-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-win7-x64.zip",
423+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-win7-x64.zip",
424424
"installPath": ".debugger/x86_64",
425425
"platforms": [
426426
"win32"
@@ -430,12 +430,12 @@
430430
"arm64"
431431
],
432432
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
433-
"integrity": "CE69C839F829DEF94A82B901C91AAF68F34347185B69EE28F6785F815C5BD4A4"
433+
"integrity": "0620F452B5AEE259FD160210AD1AA52B8E91CAD6F6250E2A8C1303A4082C50D2"
434434
},
435435
{
436436
"id": "Debugger",
437437
"description": ".NET Core Debugger (Windows / ARM64)",
438-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-win10-arm64.zip",
438+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-win10-arm64.zip",
439439
"installPath": ".debugger/arm64",
440440
"platforms": [
441441
"win32"
@@ -444,12 +444,12 @@
444444
"arm64"
445445
],
446446
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
447-
"integrity": "54CCB244E433E1842DC4E9676C0668CCD376F2B0F39191B749DFE916349B8BCF"
447+
"integrity": "00A74FB412267AA95DB850189406E1D613B707262992B3159B0F2E66EEBD6695"
448448
},
449449
{
450450
"id": "Debugger",
451451
"description": ".NET Core Debugger (macOS / x64)",
452-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-osx-x64.zip",
452+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-osx-x64.zip",
453453
"installPath": ".debugger/x86_64",
454454
"platforms": [
455455
"darwin"
@@ -463,12 +463,12 @@
463463
"./vsdbg"
464464
],
465465
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
466-
"integrity": "9292ECC3CA147D7EB33F2C0317E71F10EB40A15C6DD89868459F79F5D141368A"
466+
"integrity": "F982AD4A511D6B18A17767C62731D6B158C656115C07E24DD87A7009D24F621F"
467467
},
468468
{
469469
"id": "Debugger",
470470
"description": ".NET Core Debugger (macOS / arm64)",
471-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-osx-arm64.zip",
471+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-osx-arm64.zip",
472472
"installPath": ".debugger/arm64",
473473
"platforms": [
474474
"darwin"
@@ -481,12 +481,12 @@
481481
"./vsdbg"
482482
],
483483
"installTestPath": "./.debugger/arm64/vsdbg-ui",
484-
"integrity": "65679210178241932F4D688769D7394CDA05ABE302F6C66FCD213974B34E7DF3"
484+
"integrity": "F317A3AFE2A93B13DF7AC9EFAFA22311674113F68BC3990B8BFCF3E815B7CEA2"
485485
},
486486
{
487487
"id": "Debugger",
488488
"description": ".NET Core Debugger (linux / ARM)",
489-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-linux-arm.zip",
489+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-linux-arm.zip",
490490
"installPath": ".debugger",
491491
"platforms": [
492492
"linux"
@@ -499,12 +499,12 @@
499499
"./vsdbg"
500500
],
501501
"installTestPath": "./.debugger/vsdbg-ui",
502-
"integrity": "12590D9CFA333081F667AFAB6C6877235764D0DA82A7BC191AC2AB3B2B473B0C"
502+
"integrity": "C9056D60D443E7C76E40A3703B3BB749FC2AD2C7EFFC4E3FFEB145C9A7CF3E12"
503503
},
504504
{
505505
"id": "Debugger",
506506
"description": ".NET Core Debugger (linux / ARM64)",
507-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-linux-arm64.zip",
507+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-linux-arm64.zip",
508508
"installPath": ".debugger",
509509
"platforms": [
510510
"linux"
@@ -517,12 +517,12 @@
517517
"./vsdbg"
518518
],
519519
"installTestPath": "./.debugger/vsdbg-ui",
520-
"integrity": "73A576F98203224708F75C4538967AC7636BFFC8394E6034FE586554D7C1FC0E"
520+
"integrity": "5A5A06AAD40F1645F5EE4BEDF94DCCC9C1B673E5D8AA3E6DC40E5EFA05FC5BAE"
521521
},
522522
{
523523
"id": "Debugger",
524524
"description": ".NET Core Debugger (linux musl / x64)",
525-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-linux-musl-x64.zip",
525+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-linux-musl-x64.zip",
526526
"installPath": ".debugger",
527527
"platforms": [
528528
"linux-musl"
@@ -535,12 +535,12 @@
535535
"./vsdbg"
536536
],
537537
"installTestPath": "./.debugger/vsdbg-ui",
538-
"integrity": "44889E74066F8ACFF1B5D46368F9AA579470EFBEA47F9F0BACD0AA219FA7C7A1"
538+
"integrity": "D3BF80D1155A52CE2BB4BD149E9415EDB2B039F40ADF0C7F3B558722BAEB4481"
539539
},
540540
{
541541
"id": "Debugger",
542542
"description": ".NET Core Debugger (linux musl / ARM64)",
543-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-linux-musl-arm64.zip",
543+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-linux-musl-arm64.zip",
544544
"installPath": ".debugger",
545545
"platforms": [
546546
"linux-musl"
@@ -553,12 +553,12 @@
553553
"./vsdbg"
554554
],
555555
"installTestPath": "./.debugger/vsdbg-ui",
556-
"integrity": "C79202A750BB95FE2F9621A29AD8811B39753109B6508EC9E36D7D1830F891B9"
556+
"integrity": "9A9EA50FCEB9FB9C23EE31382B74499D96D372C6C35A06976B0A3A473E633D2D"
557557
},
558558
{
559559
"id": "Debugger",
560560
"description": ".NET Core Debugger (linux / x64)",
561-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-18/coreclr-debug-linux-x64.zip",
561+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-28-1/coreclr-debug-linux-x64.zip",
562562
"installPath": ".debugger",
563563
"platforms": [
564564
"linux"
@@ -571,7 +571,7 @@
571571
"./vsdbg"
572572
],
573573
"installTestPath": "./.debugger/vsdbg-ui",
574-
"integrity": "899CDF7BFE503BA4DA93DB9D4FCE5A9B98D17E5B512DC599896AECD866F687FA"
574+
"integrity": "9885025FDD0B4117A1705A96D2A7583380B8650AEA387A9C3E861F8BF1703F59"
575575
},
576576
{
577577
"id": "Razor",
@@ -957,7 +957,7 @@
957957
"onCommand:o.showOutput",
958958
"onCommand:omnisharp.registerLanguageMiddleware",
959959
"workspaceContains:project.json",
960-
"workspaceContains:**/*.{csproj,sln,slnf,csx,cake}"
960+
"workspaceContains:**/*.{csproj,csx,cake}"
961961
],
962962
"contributes": {
963963
"themes": [
@@ -5679,4 +5679,4 @@
56795679
}
56805680
]
56815681
}
5682-
}
5682+
}

‎src/lsptoolshost/commands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ async function openSolution(languageServer: RoslynLanguageServer): Promise<vscod
178178
return undefined;
179179
}
180180

181-
const solutionFiles = await vscode.workspace.findFiles('**/*.sln');
181+
const solutionFiles = await vscode.workspace.findFiles('**/*.{sln,slnf}');
182182
const launchTargets = solutionFiles.map(createLaunchTargetForSolution);
183183
const launchTarget = await vscode.window.showQuickPick(launchTargets, {
184184
matchOnDescription: true,

‎src/shared/launchTarget.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ export interface LaunchTarget {
2929
}
3030

3131
export function createLaunchTargetForSolution(resource: vscode.Uri): LaunchTarget {
32-
const dirname = path.dirname(resource.fsPath);
32+
const directoryPath = path.dirname(resource.fsPath);
33+
const relativePath = vscode.workspace.asRelativePath(directoryPath);
3334
return {
3435
label: path.basename(resource.fsPath),
35-
description: vscode.workspace.asRelativePath(dirname),
36+
// When the relativePath matches the directoryPath, it means we are in the root of the workspace.
37+
description: directoryPath === relativePath ? '' : relativePath,
3638
target: resource.fsPath,
37-
directory: path.dirname(resource.fsPath),
39+
directory: directoryPath,
3840
workspaceKind: LaunchTargetKind.Solution,
3941
};
4042
}

‎version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.28",
3+
"version": "2.29",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release$",
66
"^refs/heads/prerelease$",

0 commit comments

Comments
 (0)