Merge main to feature/10.0 (#8095)

Author: jander-msft

.github/dependabot.template.yml

@@ -8,8 +8,8 @@
 #! 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" ],
+#@     "9": [ "net9.0", "net8.0" ],
+#@     "8": [ "net8.0" ],
 #@   }
 #@ end
 
@@ -18,9 +18,8 @@
 #@ def getBranches():
 #@   return [
 #@     struct.encode({"name": "main", "majorVersion": "8"}),
-#@     struct.encode({"name": "release/9.x", "majorVersion": "9"}),
+#@     struct.encode({"name": "release/9.0", "majorVersion": "9"}),
 #@     struct.encode({"name": "release/8.x", "majorVersion": "8"}),
-#@     struct.encode({"name": "release/8.0", "majorVersion": "8"}),
 #@   ]
 #@ end
 

.github/dependabot.yml

@@ -51,52 +51,18 @@ updates:
       - Microsoft.Extensions.*
       - Microsoft.NETCore.DotNetHost
       - System.Text.Json
-- package-ecosystem: nuget
-  directory: /eng/dependabot/net7.0
-  schedule:
-    interval: daily
-  target-branch: main
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[main] '
-  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: main
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[main] '
-  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/9.x
+  target-branch: release/9.0
   ignore:
   - dependency-name: Microsoft.Extensions.*
     update-types:
     - version-update:semver-major
   - dependency-name: Moq
   commit-message:
-    prefix: '[release/9.x] '
+    prefix: '[release/9.0] '
   groups:
     azure-sdk-dependencies:
       patterns:
@@ -111,20 +77,20 @@ updates:
   directory: /eng/dependabot/nuget.org
   schedule:
     interval: daily
-  target-branch: release/9.x
+  target-branch: release/9.0
   commit-message:
-    prefix: '[release/9.x] '
+    prefix: '[release/9.0] '
 - package-ecosystem: nuget
   directory: /eng/dependabot/net9.0
   schedule:
     interval: daily
-  target-branch: release/9.x
+  target-branch: release/9.0
   ignore:
   - dependency-name: '*'
     update-types:
     - version-update:semver-major
   commit-message:
-    prefix: '[release/9.x] '
+    prefix: '[release/9.0] '
   groups:
     runtime-dependencies:
       patterns:
@@ -135,47 +101,13 @@ updates:
   directory: /eng/dependabot/net8.0
   schedule:
     interval: daily
-  target-branch: release/9.x
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/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: release/9.x
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/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: release/9.x
+  target-branch: release/9.0
   ignore:
   - dependency-name: '*'
     update-types:
     - version-update:semver-major
   commit-message:
-    prefix: '[release/9.x] '
+    prefix: '[release/9.0] '
   groups:
     runtime-dependencies:
       patterns:
@@ -228,117 +160,3 @@ updates:
       - Microsoft.Extensions.*
       - Microsoft.NETCore.DotNetHost
       - System.Text.Json
-- package-ecosystem: nuget
-  directory: /eng/dependabot/net7.0
-  schedule:
-    interval: daily
-  target-branch: release/8.x
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/8.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: release/8.x
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/8.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
-  commit-message:
-    prefix: '[release/8.0] '
-  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: release/8.0
-  commit-message:
-    prefix: '[release/8.0] '
-- package-ecosystem: nuget
-  directory: /eng/dependabot/net8.0
-  schedule:
-    interval: daily
-  target-branch: release/8.0
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/8.0] '
-  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: release/8.0
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/8.0] '
-  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: release/8.0
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/8.0] '
-  groups:
-    runtime-dependencies:
-      patterns:
-      - Microsoft.Extensions.*
-      - Microsoft.NETCore.DotNetHost
-      - System.Text.Json

.github/learning-path-sha.txt

@@ -1 +1 @@
-414fc673021e3f7723ecb1b8aa24ca55ed59e547
+2ed430e3a03dab15101ee8c2359b8d05ac1fb921

.github/releases.json

@@ -62,9 +62,9 @@
       ]
     },
     "9.1": {
-      "tag": "v9.1.0-preview.1.25155.2",
-      "minorReleaseDate": "2025-03-11T00:00:00.000Z",
-      "patchReleaseDate": "2025-03-11T00:00:00.000Z",
+      "tag": "v9.1.0-preview.2.25201.5",
+      "minorReleaseDate": "2025-04-08T00:00:00.000Z",
+      "patchReleaseDate": "2025-04-08T00:00:00.000Z",
       "supportedFrameworks": [
         "net9.0"
       ]

.vscode/launch.json

@@ -14,7 +14,7 @@
             "args": {
                 "fileName": "${workspaceFolder}/eng/branch-vscode-config",
                 "key": "TFM",
-                "default": "net6.0"
+                "default": "net9.0"
             }
         }
     ],

NuGet.config

@@ -14,9 +14,6 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
-    <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
-    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
-    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />

documentation/learningPath/aks.md

@@ -6,7 +6,7 @@ In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is
 
 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.
 
-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.
+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.
 
 > [!NOTE]
 > 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

@@ -4,15 +4,15 @@ dotnet-monitor exposes functionality through both [collection rules](./collectio
 
 ## Adding New APIs
 
-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).
+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).
 
-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/).
+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/).
 
 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).
 
 ### Adding Tests
 
-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).
+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).
 
 ## Notable Controller Attributes
 
@@ -32,6 +32,6 @@ dotnet-monitor supports multiple different [authentication modes](../authenticat
 
 ### Determining Authentication Mode
 
-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.
+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.
 
-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.
+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.