Skip to content

Commit

Permalink
Merge branch 'main' into dev/wiktork/docs
Browse files Browse the repository at this point in the history
  • Loading branch information
wiktork authored Nov 5, 2024
2 parents 84d6dd8 + 4729283 commit 38d2268
Show file tree
Hide file tree
Showing 70 changed files with 1,654 additions and 421 deletions.
8 changes: 4 additions & 4 deletions .github/dependabot.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#! to the list of TFMs that the major version uses for build and test.
#@ def getTfms():
#@ return {
#@ "9": [ "net9.0", "net8.0", "net7.0", "net6.0" ],
#@ "8": [ "net8.0", "net7.0", "net6.0" ],
#@ "6": [ "net6.0", "netcoreapp3.1" ]
#@ }
Expand All @@ -18,6 +19,7 @@
#@ def getBranches():
#@ return [
#@ struct.encode({"name": "main", "majorVersion": "8"}),
#@ struct.encode({"name": "feature/9.x", "majorVersion": "9"}),
#@ struct.encode({"name": "release/8.0", "majorVersion": "8"}),
#@ struct.encode({"name": "release/6.x", "majorVersion": "6"}),
#@ ]
Expand Down Expand Up @@ -49,9 +51,6 @@ updates:
- "version-update:semver-major"
- "version-update:semver-minor"
#@ end
- dependency-name: System.Text.Json
update-types:
- "version-update:semver-major"
- dependency-name: "Moq"
commit-message:
prefix: #@ commit_prefix
Expand Down Expand Up @@ -88,6 +87,7 @@ updates:
runtime-dependencies:
patterns:
- "Microsoft.Extensions.*"
- "Microsoft.NETCore.App.Runtime.*"
- "Microsoft.NETCore.DotNetHost"
- "System.Text.Json"
#@ end
#@ end
128 changes: 112 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ updates:
- dependency-name: Microsoft.Extensions.*
update-types:
- version-update:semver-major
- dependency-name: System.Text.Json
update-types:
- version-update:semver-major
- dependency-name: Moq
commit-message:
prefix: '[main] '
Expand Down Expand Up @@ -52,7 +49,8 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net7.0
schedule:
Expand All @@ -68,7 +66,8 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net6.0
schedule:
Expand All @@ -84,17 +83,112 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/independent
schedule:
interval: daily
target-branch: release/8.0
target-branch: feature/9.x
ignore:
- dependency-name: Microsoft.Extensions.*
update-types:
- version-update:semver-major
- dependency-name: System.Text.Json
- dependency-name: Moq
commit-message:
prefix: '[feature/9.x] '
groups:
azure-sdk-dependencies:
patterns:
- Azure.Core
- Azure.Identity
- Azure.Storage.*
identity-dependencies:
patterns:
- Microsoft.Identity.*
- Microsoft.IdentityModel.*
- package-ecosystem: nuget
directory: /eng/dependabot/nuget.org
schedule:
interval: daily
target-branch: feature/9.x
commit-message:
prefix: '[feature/9.x] '
- package-ecosystem: nuget
directory: /eng/dependabot/net9.0
schedule:
interval: daily
target-branch: feature/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
groups:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net8.0
schedule:
interval: daily
target-branch: feature/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
groups:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net7.0
schedule:
interval: daily
target-branch: feature/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
groups:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net6.0
schedule:
interval: daily
target-branch: feature/9.x
ignore:
- dependency-name: '*'
update-types:
- version-update:semver-major
commit-message:
prefix: '[feature/9.x] '
groups:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/independent
schedule:
interval: daily
target-branch: release/8.0
ignore:
- dependency-name: Microsoft.Extensions.*
update-types:
- version-update:semver-major
- dependency-name: Moq
Expand Down Expand Up @@ -132,7 +226,8 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net7.0
schedule:
Expand All @@ -148,7 +243,8 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/net6.0
schedule:
Expand All @@ -164,7 +260,8 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/independent
schedule:
Expand All @@ -178,9 +275,6 @@ updates:
update-types:
- version-update:semver-major
- version-update:semver-minor
- dependency-name: System.Text.Json
update-types:
- version-update:semver-major
- dependency-name: Moq
commit-message:
prefix: '[release/6.x] '
Expand Down Expand Up @@ -216,7 +310,8 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
- package-ecosystem: nuget
directory: /eng/dependabot/netcoreapp3.1
schedule:
Expand All @@ -232,4 +327,5 @@ updates:
runtime-dependencies:
patterns:
- Microsoft.Extensions.*
- Microsoft.NETCore.App.Runtime.*
- Microsoft.NETCore.DotNetHost
- System.Text.Json
2 changes: 1 addition & 1 deletion .github/workflows/scan-for-to-do-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
COMMENT_AUTHOR: ${{ github.event.comment.user.login }}

- name: Upload artifacts
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
with:
name: issue-todo
path: issue/
6 changes: 3 additions & 3 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ jobs:
with:
persist-credentials: false

- uses: streetsidesoftware/cspell-action@934c74da3775ac844ec89503f666f67efb427fed
- uses: streetsidesoftware/cspell-action@9759be9ad475fe8145f8d2a1bf29a1c4d1c6f18d
name: Documentation spellcheck
if: ${{ !cancelled() }}
with:
files: '**/*.md'
inline: error
incremental_files_only: true

- uses: streetsidesoftware/cspell-action@934c74da3775ac844ec89503f666f67efb427fed
- uses: streetsidesoftware/cspell-action@9759be9ad475fe8145f8d2a1bf29a1c4d1c6f18d
name: Resx spellcheck
if: ${{ !cancelled() }}
with:
files: 'src/**/*.resx'
inline: error
incremental_files_only: true

- uses: streetsidesoftware/cspell-action@934c74da3775ac844ec89503f666f67efb427fed
- uses: streetsidesoftware/cspell-action@9759be9ad475fe8145f8d2a1bf29a1c4d1c6f18d
name: Source code spellcheck
if: ${{ !cancelled() }}
with:
Expand Down
3 changes: 2 additions & 1 deletion documentation/api/definitions.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ First Available: 8.0 Preview 7
|---|---|---|
| `methodName` | string | Name of the method for this frame. This includes generic parameters. |
| `methodToken` | int | TypeDef token for the method. |
| `parameterTypes` | string[] | Array of parameter types. Empty array if none. |
| `parameterTypes` | string[] | Array of parameter types. Empty array if none. Field does not exist when this information is not available. |
| `typeName` | string | Name of the class for this frame. This includes generic parameters. |
| `moduleName` | string | Name of the module for this frame. |
| `moduleVersionId` | guid | Unique identifier used to distinguish between two versions of the same module. An empty value: `00000000-0000-0000-0000-000000000000`. |
| `hidden`| bool |(8.1+ and 9.0+) Whether this frame has the [StackTraceHiddenAttribute](https://learn.microsoft.com/dotnet/api/system.diagnostics.stacktracehiddenattribute) and should be omitted from stack trace text. |

## CallStackResult

Expand Down
8 changes: 4 additions & 4 deletions documentation/api/exceptions.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ System.InvalidOperationException: Operation is not valid due to the current stat
First chance exception at 2023-07-13T21:46:18.7530773Z
System.ObjectDisposedException: Cannot access a disposed object.
Object name: 'System.Net.Sockets.NetworkStream'.
at System.ThrowHelper.ThrowObjectDisposedException(System.Object)
at System.ObjectDisposedException.ThrowIf(System.Boolean,System.Object)
at System.Net.Sockets.NetworkStream.ReadAsync(System.Memory`1[[System.Byte, System.Private.CoreLib, Version=8.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]][System.Byte],System.Threading.CancellationToken)
at System.Net.Http.HttpConnection+<<EnsureReadAheadTaskHasStarted>g__ReadAheadWithZeroByteReadAsync|43_0>d.MoveNext()
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1+TResult,System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1+TStateMachine].ExecutionContextCallback(System.Object)
Expand Down Expand Up @@ -140,7 +138,8 @@ Content-Type: application/x-ndjson
"parameterTypes": [],
"typeName": "WebApplication3.Pages.IndexModel\u002B\u003CGetData\u003Ed__3",
"moduleName": "WebApplication3.dll",
"moduleVersionId": "bf769014-c2e2-496a-93b7-76fbbcd04be5"
"moduleVersionId": "bf769014-c2e2-496a-93b7-76fbbcd04be5",
"hidden": false
},
... // see stacks.md
]
Expand All @@ -165,7 +164,8 @@ Content-Type: application/x-ndjson
],
"typeName": "System.ThrowHelper",
"moduleName": "System.Private.CoreLib.dll",
"moduleVersionId": "bf769014-c2e2-496a-93b7-76fbbcd04be5"
"moduleVersionId": "bf769014-c2e2-496a-93b7-76fbbcd04be5",
"hidden": true
},
... // see stacks.md
]
Expand Down
19 changes: 9 additions & 10 deletions documentation/api/stacks.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ Allowed schemes:

## Responses

> [!NOTE]
> Parameter type information is not available through this feature. The `parameterTypes` field of [CallStackFrame](definitions.md#callstackframe) is omitted.
| Name | Type | Description | Content Type |
|---|---|---|---|
| 200 OK | [CallStackResult](definitions.md#callstackresult) | Callstacks for all managed threads in the process. | `application/json` |
Expand Down Expand Up @@ -79,30 +82,26 @@ Location: localhost:52323/operations/67f07e40-5cca-4709-9062-26302c484f18
{
"methodName": "GetQueuedCompletionStatus",
"methodToken": 100663634,
"parameterTypes": [],
"typeName": "Interop\u002BKernel32",
"moduleName": "System.Private.CoreLib.dll",
"moduleVersionId": "194ddabd-a802-4520-90ef-854e2f1cd606"
"moduleVersionId": "194ddabd-a802-4520-90ef-854e2f1cd606",
"hidden": false
},
{
"methodName": "WaitForSignal",
"methodToken": 100663639,
"parameterTypes": [
"System.Threading.ExecutionContext",
"System.Threading.ContextCallback",
"System.Object"
],
"typeName": "System.Threading.LowLevelLifoSemaphore",
"moduleName": "System.Private.CoreLib.dll",
"moduleVersionId": "194ddabd-a802-4520-90ef-854e2f1cd606"
"moduleVersionId": "194ddabd-a802-4520-90ef-854e2f1cd606",
"hidden": false
},
{
"methodName": "Wait",
"methodToken": 100663643,
"parameterTypes": [],
"typeName": "System.Threading.LowLevelLifoSemaphore",
"moduleName": "System.Private.CoreLib.dll",
"moduleVersionId": "194ddabd-a802-4520-90ef-854e2f1cd606"
"moduleVersionId": "194ddabd-a802-4520-90ef-854e2f1cd606",
"hidden": false
}
]
}
Expand Down
Loading

0 comments on commit 38d2268

Please sign in to comment.