Skip to content

Commit 87005bd

Browse files
[release/8.x] Sync non-code with origin/main (#8094)
* sync non-code with origin/main * Update default TFM to net8.0 in launch.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Justin Anderson <[email protected]>
1 parent 6d58db8 commit 87005bd

12 files changed

+85
-132
lines changed

.github/dependabot.template.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
#@ def getBranches():
1919
#@ return [
2020
#@ struct.encode({"name": "main", "majorVersion": "8"}),
21-
#@ struct.encode({"name": "release/9.x", "majorVersion": "9"}),
21+
#@ struct.encode({"name": "release/9.0", "majorVersion": "9"}),
2222
#@ struct.encode({"name": "release/8.x", "majorVersion": "8"}),
23-
#@ struct.encode({"name": "release/8.0", "majorVersion": "8"}),
2423
#@ ]
2524
#@ end
2625

.github/dependabot.yml

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ updates:
5555
directory: /eng/dependabot/independent
5656
schedule:
5757
interval: daily
58-
target-branch: release/9.x
58+
target-branch: release/9.0
5959
ignore:
6060
- dependency-name: Microsoft.Extensions.*
6161
update-types:
6262
- version-update:semver-major
6363
- dependency-name: Moq
6464
commit-message:
65-
prefix: '[release/9.x] '
65+
prefix: '[release/9.0] '
6666
groups:
6767
azure-sdk-dependencies:
6868
patterns:
@@ -77,20 +77,20 @@ updates:
7777
directory: /eng/dependabot/nuget.org
7878
schedule:
7979
interval: daily
80-
target-branch: release/9.x
80+
target-branch: release/9.0
8181
commit-message:
82-
prefix: '[release/9.x] '
82+
prefix: '[release/9.0] '
8383
- package-ecosystem: nuget
8484
directory: /eng/dependabot/net9.0
8585
schedule:
8686
interval: daily
87-
target-branch: release/9.x
87+
target-branch: release/9.0
8888
ignore:
8989
- dependency-name: '*'
9090
update-types:
9191
- version-update:semver-major
9292
commit-message:
93-
prefix: '[release/9.x] '
93+
prefix: '[release/9.0] '
9494
groups:
9595
runtime-dependencies:
9696
patterns:
@@ -101,13 +101,13 @@ updates:
101101
directory: /eng/dependabot/net8.0
102102
schedule:
103103
interval: daily
104-
target-branch: release/9.x
104+
target-branch: release/9.0
105105
ignore:
106106
- dependency-name: '*'
107107
update-types:
108108
- version-update:semver-major
109109
commit-message:
110-
prefix: '[release/9.x] '
110+
prefix: '[release/9.0] '
111111
groups:
112112
runtime-dependencies:
113113
patterns:
@@ -160,49 +160,3 @@ updates:
160160
- Microsoft.Extensions.*
161161
- Microsoft.NETCore.DotNetHost
162162
- System.Text.Json
163-
- package-ecosystem: nuget
164-
directory: /eng/dependabot/independent
165-
schedule:
166-
interval: daily
167-
target-branch: release/8.0
168-
ignore:
169-
- dependency-name: Microsoft.Extensions.*
170-
update-types:
171-
- version-update:semver-major
172-
- dependency-name: Moq
173-
commit-message:
174-
prefix: '[release/8.0] '
175-
groups:
176-
azure-sdk-dependencies:
177-
patterns:
178-
- Azure.Core
179-
- Azure.Identity
180-
- Azure.Storage.*
181-
identity-dependencies:
182-
patterns:
183-
- Microsoft.Identity.*
184-
- Microsoft.IdentityModel.*
185-
- package-ecosystem: nuget
186-
directory: /eng/dependabot/nuget.org
187-
schedule:
188-
interval: daily
189-
target-branch: release/8.0
190-
commit-message:
191-
prefix: '[release/8.0] '
192-
- package-ecosystem: nuget
193-
directory: /eng/dependabot/net8.0
194-
schedule:
195-
interval: daily
196-
target-branch: release/8.0
197-
ignore:
198-
- dependency-name: '*'
199-
update-types:
200-
- version-update:semver-major
201-
commit-message:
202-
prefix: '[release/8.0] '
203-
groups:
204-
runtime-dependencies:
205-
patterns:
206-
- Microsoft.Extensions.*
207-
- Microsoft.NETCore.DotNetHost
208-
- System.Text.Json

.github/learning-path-sha.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
414fc673021e3f7723ecb1b8aa24ca55ed59e547
1+
2ed430e3a03dab15101ee8c2359b8d05ac1fb921

.github/releases.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
]
6363
},
6464
"9.1": {
65-
"tag": "v9.1.0-preview.1.25155.2",
66-
"minorReleaseDate": "2025-03-11T00:00:00.000Z",
67-
"patchReleaseDate": "2025-03-11T00:00:00.000Z",
65+
"tag": "v9.1.0-preview.2.25201.5",
66+
"minorReleaseDate": "2025-04-08T00:00:00.000Z",
67+
"patchReleaseDate": "2025-04-08T00:00:00.000Z",
6868
"supportedFrameworks": [
6969
"net9.0"
7070
]

documentation/learningPath/aks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is
66

77
This workflow takes your local development copy of `dotnet-monitor`, patches it with a local development copy of the [.NET Core Diagnostics Repo](https://github.com/dotnet/diagnostics#net-core-diagnostics-repo), and makes it available as an image for you to consume in an ACR (Azure Container Registry). Note that there are many other ways to do this - this is meant to serve as a basic template that can be adapted to match your needs.
88

9-
1. Open `pwsh` and run the [generate-dev-sln script](https://github.com/dotnet/dotnet-monitor/blob/414fc673021e3f7723ecb1b8aa24ca55ed59e547/generate-dev-sln.ps1), providing a path to your local copy of the diagnostics repo.
9+
1. Open `pwsh` and run the [generate-dev-sln script](https://github.com/dotnet/dotnet-monitor/blob/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/generate-dev-sln.ps1), providing a path to your local copy of the diagnostics repo.
1010

1111
> [!NOTE]
1212
> If your changes do not involve the [.NET Core Diagnostics Repo](https://github.com/dotnet/diagnostics#net-core-diagnostics-repo), you don't need to complete this step.

documentation/learningPath/api.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ dotnet-monitor exposes functionality through both [collection rules](./collectio
44

55
## Adding New APIs
66

7-
The web API surface is defined by a series of controllers [here](https://github.com/dotnet/dotnet-monitor/blob/414fc673021e3f7723ecb1b8aa24ca55ed59e547/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/). It's common for an API to expose functionality also available via [Actions](./collectionrules.md#actions) and so methods in these controllers are often wrappers around a shared implementation. Each controller may have one or more attributes that configure how and where it is exposed, you can learn more about the notable controller attributes [here](#notable-controller-attributes).
7+
The web API surface is defined by a series of controllers [here](https://github.com/dotnet/dotnet-monitor/blob/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/). It's common for an API to expose functionality also available via [Actions](./collectionrules.md#actions) and so methods in these controllers are often wrappers around a shared implementation. Each controller may have one or more attributes that configure how and where it is exposed, you can learn more about the notable controller attributes [here](#notable-controller-attributes).
88

9-
If the new API needs to either accept or return structured data, a dedicated model should be used. Models are defined [here](https://github.com/dotnet/dotnet-monitor/blob/414fc673021e3f7723ecb1b8aa24ca55ed59e547/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/).
9+
If the new API needs to either accept or return structured data, a dedicated model should be used. Models are defined [here](https://github.com/dotnet/dotnet-monitor/blob/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/).
1010

1111
When adding a new API, it's important to also update the [`openapi.json`](../openapi.json) spec which describes the API surface. There are CI tests that will ensure this file has been updated to reflect any API changes. Learn more about updating `openapi.json` [here](./testing.md#openapi-generation).
1212

1313
### Adding Tests
1414

15-
Web APIs in dotnet-monitor are typically tested using functional tests that leverage the [ApiClient](https://github.com/dotnet/dotnet-monitor/blob/414fc673021e3f7723ecb1b8aa24ca55ed59e547/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/HttpApi/ApiClient.cs) to call a specific API. Learn more about how the functional tests are defined and operate [here](./testing.md#functional-tests).
15+
Web APIs in dotnet-monitor are typically tested using functional tests that leverage the [ApiClient](https://github.com/dotnet/dotnet-monitor/blob/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/HttpApi/ApiClient.cs) to call a specific API. Learn more about how the functional tests are defined and operate [here](./testing.md#functional-tests).
1616

1717
## Notable Controller Attributes
1818

@@ -32,6 +32,6 @@ dotnet-monitor supports multiple different [authentication modes](../authenticat
3232

3333
### Determining Authentication Mode
3434

35-
When dotnet-monitor starts, the command line arguments are first inspected to see if a specific authentication mode was set (such as `--no-auth`), referred to as the `StartupAuthenticationMode`, this is calculated [here](https://github.com/dotnet/dotnet-monitor/blob/414fc673021e3f7723ecb1b8aa24ca55ed59e547/src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs#L28). If no modes were explicitly set via a command line argument, dotnet-monitor will select `Deferred` as the `StartupAuthenticationMode`. This indicates that the user configuration should be looked at to determine the authentication mode later on in the startup process.
35+
When dotnet-monitor starts, the command line arguments are first inspected to see if a specific authentication mode was set (such as `--no-auth`), referred to as the `StartupAuthenticationMode`, this is calculated [here](https://github.com/dotnet/dotnet-monitor/blob/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs#L28). If no modes were explicitly set via a command line argument, dotnet-monitor will select `Deferred` as the `StartupAuthenticationMode`. This indicates that the user configuration should be looked at to determine the authentication mode later on in the startup process.
3636

37-
After determining the `StartupAuthenticationMode` mode, the relevant [IAuthenticationConfigurator](https://github.com/dotnet/dotnet-monitor/blob/414fc673021e3f7723ecb1b8aa24ca55ed59e547/src/Tools/dotnet-monitor/Auth/IAuthenticationConfigurator.cs) is created by the [AuthConfiguratorFactory](https://github.com/dotnet/dotnet-monitor/blob/414fc673021e3f7723ecb1b8aa24ca55ed59e547/src/Tools/dotnet-monitor/Auth/AuthConfiguratorFactory.cs). This factory also handles deciding what authentication mode to use when `StartupAuthenticationMode` is `Deferred`. The selected configurator is used to configure various parts of dotnet-monitor that are specific to authentication, such as protecting the web APIs and adding authentication-mode specific logging.
37+
After determining the `StartupAuthenticationMode` mode, the relevant [IAuthenticationConfigurator](https://github.com/dotnet/dotnet-monitor/blob/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/src/Tools/dotnet-monitor/Auth/IAuthenticationConfigurator.cs) is created by the [AuthConfiguratorFactory](https://github.com/dotnet/dotnet-monitor/blob/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/src/Tools/dotnet-monitor/Auth/AuthConfiguratorFactory.cs). This factory also handles deciding what authentication mode to use when `StartupAuthenticationMode` is `Deferred`. The selected configurator is used to configure various parts of dotnet-monitor that are specific to authentication, such as protecting the web APIs and adding authentication-mode specific logging.

0 commit comments

Comments
 (0)