Skip to content

Commit c1546ae

Browse files
author
Mike McLaughlin
authored
Merge pull request #4444 from mikem8361/release/stable
Update release/stable from main
2 parents 966acd1 + e182468 commit c1546ae

File tree

94 files changed

+3303
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3303
-456
lines changed

‎.github/fabricbot.json

Lines changed: 0 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -887,149 +887,6 @@
887887
]
888888
}
889889
},
890-
{
891-
"taskType": "scheduled",
892-
"capabilityId": "ScheduledSearch",
893-
"subCapability": "ScheduledSearch",
894-
"version": "1.1",
895-
"config": {
896-
"frequency": [
897-
{
898-
"weekDay": 0,
899-
"hours": [
900-
1,
901-
4,
902-
7,
903-
10,
904-
13,
905-
16,
906-
19,
907-
22
908-
],
909-
"timezoneOffset": -8
910-
},
911-
{
912-
"weekDay": 1,
913-
"hours": [
914-
1,
915-
4,
916-
7,
917-
10,
918-
13,
919-
16,
920-
19,
921-
22
922-
],
923-
"timezoneOffset": -8
924-
},
925-
{
926-
"weekDay": 2,
927-
"hours": [
928-
1,
929-
4,
930-
7,
931-
10,
932-
13,
933-
16,
934-
19,
935-
22
936-
],
937-
"timezoneOffset": -8
938-
},
939-
{
940-
"weekDay": 3,
941-
"hours": [
942-
1,
943-
4,
944-
7,
945-
10,
946-
13,
947-
16,
948-
19,
949-
22
950-
],
951-
"timezoneOffset": -8
952-
},
953-
{
954-
"weekDay": 4,
955-
"hours": [
956-
1,
957-
4,
958-
7,
959-
10,
960-
13,
961-
16,
962-
19,
963-
22
964-
],
965-
"timezoneOffset": -8
966-
},
967-
{
968-
"weekDay": 5,
969-
"hours": [
970-
1,
971-
4,
972-
7,
973-
10,
974-
13,
975-
16,
976-
19,
977-
22
978-
],
979-
"timezoneOffset": -8
980-
},
981-
{
982-
"weekDay": 6,
983-
"hours": [
984-
1,
985-
4,
986-
7,
987-
10,
988-
13,
989-
16,
990-
19,
991-
22
992-
],
993-
"timezoneOffset": -8
994-
}
995-
],
996-
"searchTerms": [
997-
{
998-
"name": "isClosed",
999-
"parameters": {}
1000-
},
1001-
{
1002-
"name": "noActivitySince",
1003-
"parameters": {
1004-
"days": 30
1005-
}
1006-
},
1007-
{
1008-
"name": "isUnlocked",
1009-
"parameters": {}
1010-
},
1011-
{
1012-
"name": "isIssue",
1013-
"parameters": {}
1014-
},
1015-
{
1016-
"name": "noLabel",
1017-
"parameters": {
1018-
"label": "Bot: Do Not Lock"
1019-
}
1020-
}
1021-
],
1022-
"taskName": "[Closed Issue Management] Lock issues closed without activity for over 30 days",
1023-
"actions": [
1024-
{
1025-
"name": "lockIssue",
1026-
"parameters": {
1027-
"reason": "resolved"
1028-
}
1029-
}
1030-
]
1031-
}
1032-
}
1033890
],
1034891
"userGroups": []
1035892
}

‎.github/workflows/locker.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Locker - Lock stale issues and PRs
2+
on:
3+
schedule:
4+
- cron: '0 9 * * *' # Once per day, early morning PT
5+
6+
workflow_dispatch:
7+
# Manual triggering through the GitHub UI, API, or CLI
8+
inputs:
9+
daysSinceClose:
10+
required: true
11+
default: "30"
12+
daysSinceUpdate:
13+
required: true
14+
default: "30"
15+
16+
permissions:
17+
issues: write
18+
pull-requests: write
19+
20+
jobs:
21+
main:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout Actions
25+
uses: actions/checkout@v4
26+
with:
27+
repository: "microsoft/vscode-github-triage-actions"
28+
path: ./actions
29+
ref: cd16cd2aad6ba2da74bb6c6f7293adddd579a90e # locker action commit sha
30+
- name: Install Actions
31+
run: npm install --production --prefix ./actions
32+
- name: Run Locker
33+
uses: ./actions/locker
34+
with:
35+
daysSinceClose: ${{ fromJson(inputs.daysSinceClose || 30) }}
36+
daysSinceUpdate: ${{ fromJson(inputs.daysSinceUpdate || 30) }}

‎diagnostics.sln

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Debug
219219
EndProject
220220
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "inc", "inc", "{BE45F03E-D700-404F-A890-8ED7D8969958}"
221221
ProjectSection(SolutionItems) = preProject
222+
src\SOS\inc\clrma.h = src\SOS\inc\clrma.h
223+
src\SOS\inc\clrma.idl = src\SOS\inc\clrma.idl
222224
src\SOS\inc\debuggerservices.h = src\SOS\inc\debuggerservices.h
223225
src\SOS\inc\host.h = src\SOS\inc\host.h
224226
src\SOS\inc\hostservices.h = src\SOS\inc\hostservices.h

‎documentation/design-docs/ipc-protocol.md

Lines changed: 69 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ enum class ProfilerCommandId : uint8_t
370370
AttachProfiler = 0x01,
371371
// future
372372
}
373-
```
373+
```
374374
See: [Profiler Commands](#Profiler-Commands)
375375
376376
```c++
@@ -460,7 +460,7 @@ Payload
460460
array<provider_config> providers
461461
}
462462

463-
provider_config
463+
provider_config
464464
{
465465
ulong keywords,
466466
uint logLevel,
@@ -482,7 +482,7 @@ Followed by an Optional Continuation of a `nettrace` format stream of events.
482482

483483
Command Code: `0x0203`
484484

485-
The `CollectTracing2` Command is an extension of the `CollectTracing` command - its behavior is the same as `CollectTracing` command, except that it has another field that lets you specify whether rundown events should be fired by the runtime.
485+
The `CollectTracing2` command is an extension of the `CollectTracing` command - its behavior is the same as `CollectTracing` command, except that it has another field that lets you specify whether rundown events should be fired by the runtime.
486486

487487
#### Inputs:
488488

@@ -500,7 +500,7 @@ A `provider_config` is composed of the following data:
500500
* `string filter_data` (optional): Filter information
501501

502502
> see ETW documentation for a more detailed explanation of Keywords, Filters, and Log Level.
503-
>
503+
>
504504
#### Returns (as an IPC Message Payload):
505505

506506
Header: `{ Magic; 28; 0xFF00; 0x0000; }`
@@ -520,7 +520,7 @@ Payload
520520
array<provider_config> providers
521521
}
522522
523-
provider_config
523+
provider_config
524524
{
525525
ulong keywords,
526526
uint logLevel,
@@ -538,7 +538,70 @@ Payload
538538
```
539539
Followed by an Optional Continuation of a `nettrace` format stream of events.
540540

541-
### `StopTracing`
541+
### `CollectTracing3`
542+
543+
Command Code: `0x0204`
544+
545+
The `CollectTracing3` command is an extension of the `CollectTracing2` command - its behavior is the same as `CollectTracing2` command, except that it has another field that lets you specify whether the stackwalk should be made for each event.
546+
547+
#### Inputs:
548+
549+
Header: `{ Magic; Size; 0x0203; 0x0000 }`
550+
551+
* `uint circularBufferMB`: The size of the circular buffer used for buffering event data while streaming
552+
* `uint format`: 0 for the legacy NetPerf format and 1 for the NetTrace format
553+
* `bool requestRundown`: Indicates whether rundown should be fired by the runtime.
554+
* `bool requestStackwalk`: Indicates whether stacktrace information should be recorded.
555+
* `array<provider_config> providers`: The providers to turn on for the streaming session
556+
557+
A `provider_config` is composed of the following data:
558+
* `ulong keywords`: The keywords to turn on with this providers
559+
* `uint logLevel`: The level of information to turn on
560+
* `string provider_name`: The name of the provider
561+
* `string filter_data` (optional): Filter information
562+
563+
> see ETW documentation for a more detailed explanation of Keywords, Filters, and Log Level.
564+
>
565+
#### Returns (as an IPC Message Payload):
566+
567+
Header: `{ Magic; 28; 0xFF00; 0x0000; }`
568+
569+
`CollectTracing2` returns:
570+
* `ulong sessionId`: the ID for the stream session starting on the current connection
571+
572+
##### Details:
573+
574+
Input:
575+
```
576+
Payload
577+
{
578+
uint circularBufferMB,
579+
uint format,
580+
bool requestRundown,
581+
bool requestStackwalk,
582+
array<provider_config> providers
583+
}
584+
585+
provider_config
586+
{
587+
ulong keywords,
588+
uint logLevel,
589+
string provider_name,
590+
string filter_data (optional)
591+
}
592+
```
593+
594+
Returns:
595+
```c
596+
Payload
597+
{
598+
ulong sessionId
599+
}
600+
```
601+
Followed by an Optional Continuation of a `nettrace` format stream of events.
602+
603+
604+
### `StopTracing`
542605

543606
Command Code: `0x0201`
544607

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44
<UsageData>
55
<IgnorePatterns>
6-
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
76
</IgnorePatterns>
8-
</UsageData>
7+
</UsageData>

‎eng/Version.Details.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.SymbolStore" Version="1.0.451601">
3+
<Dependency Name="Microsoft.SymbolStore" Version="1.0.505101">
44
<Uri>https://github.com/dotnet/symstore</Uri>
5-
<Sha>21508f9ab057e19d4060855647edeb376ac7d59d</Sha>
5+
<Sha>b26b065af8647262418c1ef4609de690a003bfa3</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="3.1.451701">
7+
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="3.1.457001">
88
<Uri>https://github.com/microsoft/clrmd</Uri>
9-
<Sha>b64f583396784300c7ded11d22c65053197e958a</Sha>
9+
<Sha>b9b01f21c353f59908b1563e1f17831eaad41b28</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="3.1.451701">
11+
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="3.1.457001">
1212
<Uri>https://github.com/microsoft/clrmd</Uri>
13-
<Sha>b64f583396784300c7ded11d22c65053197e958a</Sha>
13+
<Sha>b9b01f21c353f59908b1563e1f17831eaad41b28</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
17-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23518.2">
17+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23607.2">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
19+
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
2020
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23518.2">
22+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23607.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
24+
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
2525
</Dependency>
2626
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
2828
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rtm.23522.1">
30+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.101-servicing.23567.12">
3131
<Uri>https://github.com/dotnet/installer</Uri>
32-
<Sha>30d7d24a6592aa0c97f81ac36b563fab2b451b14</Sha>
32+
<Sha>bc60f176c86a6b1a290b3badc509ec86233f9543</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rtm.23520.10">
34+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rtm.23524.15">
3535
<Uri>https://github.com/dotnet/aspnetcore</Uri>
36-
<Sha>c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc</Sha>
36+
<Sha>815eb281ecad13eb69cf50516ac7f534b947f2b0</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rtm.23520.10">
38+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rtm.23524.15">
3939
<Uri>https://github.com/dotnet/aspnetcore</Uri>
40-
<Sha>c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc</Sha>
40+
<Sha>815eb281ecad13eb69cf50516ac7f534b947f2b0</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rtm.23520.16">
42+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0">
4343
<Uri>https://github.com/dotnet/runtime</Uri>
44-
<Sha>11ad607efb2b31c5e1b906303fcd70341e9d5206</Sha>
44+
<Sha>59edaad404d1b8e47080015ae8d0787f94c970df</Sha>
4545
</Dependency>
46-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rtm.23520.16">
46+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rtm.23524.7">
4747
<Uri>https://github.com/dotnet/runtime</Uri>
48-
<Sha>11ad607efb2b31c5e1b906303fcd70341e9d5206</Sha>
48+
<Sha>59edaad404d1b8e47080015ae8d0787f94c970df</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23519.2">
50+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24052.1">
5151
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
52-
<Sha>d3fbf3c3d4c4f142ea12efceaa6efece9ad2e6b5</Sha>
52+
<Sha>5357f2bafb9e23858aa57136d38dbb113cdf81a2</Sha>
5353
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
5454
</Dependency>
5555
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-1.23073.4">

0 commit comments

Comments
 (0)