Skip to content

Commit fcb12c8

Browse files
WardenGnawWardenGnaw
authored
Upgrade Debugger for 2.19.14 Release (#6937)
- Fix .NET debugging broken with searchNuGetOrgSymbolServer enabled. #6918 - Support for csharp.debug.symbolOptions.moduleFilter.includeSymbolsOnDemand - Update the version of .NET used to run the debugger itself
1 parent 51387f7 commit fcb12c8

File tree

3 files changed

+56
-21
lines changed

3 files changed

+56
-21
lines changed

‎package.json

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
{
453453
"id": "Debugger",
454454
"description": ".NET Core Debugger (Windows / x64)",
455-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-win7-x64.zip",
455+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-win7-x64.zip",
456456
"installPath": ".debugger/x86_64",
457457
"platforms": [
458458
"win32"
@@ -462,12 +462,12 @@
462462
"arm64"
463463
],
464464
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
465-
"integrity": "9BDAF86ED83697B24AB2DF2943BA17077D2760742622184EE947653EB4FE54FE"
465+
"integrity": "31995A00369B2489A3C677EF11B7180B883C665D0BA2CAEF9C8FDE384996C925"
466466
},
467467
{
468468
"id": "Debugger",
469469
"description": ".NET Core Debugger (Windows / ARM64)",
470-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-win10-arm64.zip",
470+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-win10-arm64.zip",
471471
"installPath": ".debugger/arm64",
472472
"platforms": [
473473
"win32"
@@ -476,12 +476,12 @@
476476
"arm64"
477477
],
478478
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
479-
"integrity": "B4B61AF13AD8BE13C79909A25943F91F2CD199664809D50C0827565DC7680BD5"
479+
"integrity": "6B4EFE48B76247E897B4427F6D779376868C17BF3CD08CFDED913A94986B9F4E"
480480
},
481481
{
482482
"id": "Debugger",
483483
"description": ".NET Core Debugger (macOS / x64)",
484-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-osx-x64.zip",
484+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-osx-x64.zip",
485485
"installPath": ".debugger/x86_64",
486486
"platforms": [
487487
"darwin"
@@ -495,12 +495,12 @@
495495
"./vsdbg"
496496
],
497497
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
498-
"integrity": "B9243B352670971BADD6065F0BB7F0D0CEE25DF90204DD59261E0B7015345D7A"
498+
"integrity": "F634B0D0AF4AF8C7E83E165FA8B1F663CA1D4629C54AE5D2ACBFF96A89F6302D"
499499
},
500500
{
501501
"id": "Debugger",
502502
"description": ".NET Core Debugger (macOS / arm64)",
503-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-osx-arm64.zip",
503+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-osx-arm64.zip",
504504
"installPath": ".debugger/arm64",
505505
"platforms": [
506506
"darwin"
@@ -513,12 +513,12 @@
513513
"./vsdbg"
514514
],
515515
"installTestPath": "./.debugger/arm64/vsdbg-ui",
516-
"integrity": "D4247872C14C8132F754433D317184C9E0EDEB2EB11384C2150D0484E863FBA7"
516+
"integrity": "8BB85A9D0A9D2D1314D2F6A1E8598C7E358DB27EB7CE8CD09202EA5A6102EA98"
517517
},
518518
{
519519
"id": "Debugger",
520520
"description": ".NET Core Debugger (linux / ARM)",
521-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-linux-arm.zip",
521+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-arm.zip",
522522
"installPath": ".debugger",
523523
"platforms": [
524524
"linux"
@@ -531,12 +531,12 @@
531531
"./vsdbg"
532532
],
533533
"installTestPath": "./.debugger/vsdbg-ui",
534-
"integrity": "746389412FCCEA63DB193A0E0474B17C6B06DE819348470851AA4F168E9FA970"
534+
"integrity": "9A09FE4B0D6AD7949016981E98AE27BC991E0CA325651008A16AFDF42228C0A7"
535535
},
536536
{
537537
"id": "Debugger",
538538
"description": ".NET Core Debugger (linux / ARM64)",
539-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-linux-arm64.zip",
539+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-arm64.zip",
540540
"installPath": ".debugger",
541541
"platforms": [
542542
"linux"
@@ -549,12 +549,12 @@
549549
"./vsdbg"
550550
],
551551
"installTestPath": "./.debugger/vsdbg-ui",
552-
"integrity": "29D3407CEA0F789820CB47D9A3B112A8C50D674F4E6A91A8C1E145F3C054E605"
552+
"integrity": "AEEC76A9C20160AE29FA992DF74632B501CBF28662F133D6FFC415EB5878D496"
553553
},
554554
{
555555
"id": "Debugger",
556556
"description": ".NET Core Debugger (linux musl / x64)",
557-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-linux-musl-x64.zip",
557+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-musl-x64.zip",
558558
"installPath": ".debugger",
559559
"platforms": [
560560
"linux-musl"
@@ -567,12 +567,12 @@
567567
"./vsdbg"
568568
],
569569
"installTestPath": "./.debugger/vsdbg-ui",
570-
"integrity": "2EA7A92AF540F2302FA9620FB9B3E97BF9682C2F164196956AB0360434F63958"
570+
"integrity": "ADBCAC35AFFF89880FFE73788E87E1E89E77646D336D5EFE8E9953B5565F7F94"
571571
},
572572
{
573573
"id": "Debugger",
574574
"description": ".NET Core Debugger (linux musl / ARM64)",
575-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-linux-musl-arm64.zip",
575+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-musl-arm64.zip",
576576
"installPath": ".debugger",
577577
"platforms": [
578578
"linux-musl"
@@ -585,12 +585,12 @@
585585
"./vsdbg"
586586
],
587587
"installTestPath": "./.debugger/vsdbg-ui",
588-
"integrity": "6A237680134BA11A97FF5DCD4F5AD9D66A2188A26DD8C852C5114A8FAF4B0B5F"
588+
"integrity": "D7B5EACA7A92829A92DE1E1218B0746CA9C5820A81F7F6360E79A1671860EBAC"
589589
},
590590
{
591591
"id": "Debugger",
592592
"description": ".NET Core Debugger (linux / x64)",
593-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-18-0/coreclr-debug-linux-x64.zip",
593+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-x64.zip",
594594
"installPath": ".debugger",
595595
"platforms": [
596596
"linux"
@@ -603,7 +603,7 @@
603603
"./vsdbg"
604604
],
605605
"installTestPath": "./.debugger/vsdbg-ui",
606-
"integrity": "285D119C936F4822376E722B088C7F6EBC19A67EB140D81F929E6206820B79B6"
606+
"integrity": "059D545D3B1584F122544A1E230C91266FC283F86E40C125A4224D37EE36F049"
607607
},
608608
{
609609
"id": "Razor",
@@ -1456,6 +1456,11 @@
14561456
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
14571457
"default": true
14581458
},
1459+
"csharp.debug.symbolOptions.moduleFilter.includeSymbolsOnDemand": {
1460+
"type": "boolean",
1461+
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description%",
1462+
"default": true
1463+
},
14591464
"csharp.debug.allowFastEvaluate": {
14601465
"type": "boolean",
14611466
"description": "%generateOptionsSchema.allowFastEvaluate.description%",
@@ -1602,6 +1607,11 @@
16021607
"type": "boolean",
16031608
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
16041609
"default": true
1610+
},
1611+
"includeSymbolsOnDemand": {
1612+
"type": "boolean",
1613+
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description%",
1614+
"default": true
16051615
}
16061616
}
16071617
}
@@ -1643,8 +1653,7 @@
16431653
"type": "string",
16441654
"enum": [
16451655
"coreclr",
1646-
"clr",
1647-
"monovsdbg"
1656+
"clr"
16481657
],
16491658
"description": "Type type of code to debug. Can be either 'coreclr' for .NET Core debugging, or 'clr' for Desktop .NET Framework. 'clr' only works on Windows as the Desktop framework is Windows-only.",
16501659
"default": "coreclr"
@@ -2793,6 +2802,11 @@
27932802
"type": "boolean",
27942803
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
27952804
"default": true
2805+
},
2806+
"includeSymbolsOnDemand": {
2807+
"type": "boolean",
2808+
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description%",
2809+
"default": true
27962810
}
27972811
}
27982812
}
@@ -3298,6 +3312,11 @@
32983312
"type": "boolean",
32993313
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
33003314
"default": true
3315+
},
3316+
"includeSymbolsOnDemand": {
3317+
"type": "boolean",
3318+
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description%",
3319+
"default": true
33013320
}
33023321
}
33033322
}
@@ -4079,6 +4098,11 @@
40794098
"type": "boolean",
40804099
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
40814100
"default": true
4101+
},
4102+
"includeSymbolsOnDemand": {
4103+
"type": "boolean",
4104+
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description%",
4105+
"default": true
40824106
}
40834107
}
40844108
}
@@ -4584,6 +4608,11 @@
45844608
"type": "boolean",
45854609
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description%",
45864610
"default": true
4611+
},
4612+
"includeSymbolsOnDemand": {
4613+
"type": "boolean",
4614+
"description": "%generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description%",
4615+
"default": true
45874616
}
45884617
}
45894618
}

‎package.nls.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@
376376
"generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description": "Array of modules that the debugger should NOT load symbols for. Wildcards (example: MyCompany.*.dll) are supported.\n\nThis property is ignored unless 'mode' is set to 'loadAllButExcluded'.",
377377
"generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description": "Array of modules that the debugger should load symbols for. Wildcards (example: MyCompany.*.dll) are supported.\n\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.",
378378
"generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description": "If true, for any module NOT in the 'includedModules' array, the debugger will still check next to the module itself and the launching executable, but it will not check paths on the symbol search list. This option defaults to 'true'.\n\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.",
379+
"generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "If true, for any module NOT in the 'includedModules' array, the debugger will attempt to download symbols when it detects symbols are needed, such as when trying to step into the module. This option defaults to 'true'.\n\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.",
379380
"generateOptionsSchema.sourceLinkOptions.markdownDescription": "Options to control how Source Link connects to web servers. [More information](https://aka.ms/VSCode-DotNet-SourceLink)",
380381
"generateOptionsSchema.sourceLinkOptions.additionalItems.enabled.markdownDescription": {
381382
"message": "Is Source Link enabled for this URL? If unspecified, this option defaults to `true`.",
@@ -415,4 +416,4 @@
415416
"Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
416417
]
417418
}
418-
}
419+
}

‎src/tools/VSSymbolSettings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"type": "boolean",
7676
"description": "If true, for any module NOT in the 'includedModules' array, the debugger will still check next to the module itself and the launching executable, but it will not check paths on the symbol search list. This option defaults to 'true'.\n\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.",
7777
"default": true
78+
},
79+
"includeSymbolsOnDemand": {
80+
"type": "boolean",
81+
"description": "If true, for any module NOT in the 'includedModules' array, the debugger will attempt to download symbols when it detects symbols are needed, such as when trying to step into the module. This option defaults to 'true'.\n\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.",
82+
"default": true
7883
}
7984
}
8085
}

0 commit comments

Comments
 (0)