sync non-code with origin/main (#8106)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: github-actions[bot]

.github/dependabot.template.yml

@@ -17,7 +17,7 @@
 #! target branch and which major version of .NET Monitor it builds.
 #@ def getBranches():
 #@   return [
-#@     struct.encode({"name": "main", "majorVersion": "8"}),
+#@     struct.encode({"name": "main", "majorVersion": "9"}),
 #@     struct.encode({"name": "release/9.0", "majorVersion": "9"}),
 #@     struct.encode({"name": "release/8.x", "majorVersion": "8"}),
 #@   ]

.github/dependabot.yml

@@ -34,6 +34,23 @@ updates:
   target-branch: main
   commit-message:
     prefix: '[main] '
+- package-ecosystem: nuget
+  directory: /eng/dependabot/net9.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/net8.0
   schedule:

.github/learning-path-sha.txt

@@ -1 +1 @@
-2ed430e3a03dab15101ee8c2359b8d05ac1fb921
+cd505c19acbea28dc8d9aff84908ced335911801

.github/releases.json

@@ -8,11 +8,10 @@
   ],
   "supported": [
     "9.0",
-    "8.1",
-    "8.0"
+    "8.1"
   ],
   "unsupported": [
-    "7.3",
+    "8.0",
     "6.3"
   ],
   "releases": {
@@ -35,36 +34,26 @@
       ],
       "outOfSupportDate": "2025-05-11T00:00:00.000Z"
     },
-    "7.3": {
-      "tag": "v7.3.4",
-      "minorReleaseDate": "2023-08-08T00:00:00.000Z",
-      "patchReleaseDate": "2024-05-14T00:00:00.000Z",
-      "supportedFrameworks": [
-        "net6.0",
-        "net7.0"
-      ],
-      "outOfSupportDate": "2024-05-14T00:00:00.000Z"
-    },
     "9.0": {
-      "tag": "v9.0.2",
+      "tag": "v9.0.3",
       "minorReleaseDate": "2024-11-12T00:00:00.000Z",
-      "patchReleaseDate": "2025-02-11T00:00:00.000Z",
+      "patchReleaseDate": "2025-05-13T00:00:00.000Z",
       "supportedFrameworks": [
         "net9.0"
       ]
     },
     "8.1": {
-      "tag": "v8.1.0",
+      "tag": "v8.1.1",
       "minorReleaseDate": "2025-02-11T00:00:00.000Z",
-      "patchReleaseDate": "2025-02-11T00:00:00.000Z",
+      "patchReleaseDate": "2025-05-14T00:00:00.000Z",
       "supportedFrameworks": [
         "net8.0"
       ]
     },
     "9.1": {
-      "tag": "v9.1.0-preview.2.25201.5",
-      "minorReleaseDate": "2025-04-08T00:00:00.000Z",
-      "patchReleaseDate": "2025-04-08T00:00:00.000Z",
+      "tag": "v9.1.0-preview.3.25257.5",
+      "minorReleaseDate": "2025-05-13T00:00:00.000Z",
+      "patchReleaseDate": "2025-05-13T00:00:00.000Z",
       "supportedFrameworks": [
         "net9.0"
       ]

.github/workflows/backport.yml

@@ -8,7 +8,7 @@ permissions: {}
 jobs:
   backport:
     if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to') && contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       issues: write

.github/workflows/spellcheck.yml

@@ -17,23 +17,23 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: streetsidesoftware/cspell-action@8485bb4b688c68384c2f6db7ad931f5e3e63f21c
+      - uses: streetsidesoftware/cspell-action@eb29b6a67d122d2e6af385ff16bdb200d93b2e54
         name: Documentation spellcheck
         if: ${{ !cancelled() }}
         with:
             files: '**/*.md'
             inline: error
             incremental_files_only: true
 
-      - uses: streetsidesoftware/cspell-action@8485bb4b688c68384c2f6db7ad931f5e3e63f21c
+      - uses: streetsidesoftware/cspell-action@eb29b6a67d122d2e6af385ff16bdb200d93b2e54
         name: Resx spellcheck
         if: ${{ !cancelled() }}
         with:
             files: 'src/**/*.resx'
             inline: error
             incremental_files_only: true
 
-      - uses: streetsidesoftware/cspell-action@8485bb4b688c68384c2f6db7ad931f5e3e63f21c
+      - uses: streetsidesoftware/cspell-action@eb29b6a67d122d2e6af385ff16bdb200d93b2e54
         name: Source code spellcheck
         if: ${{ !cancelled() }}
         with:

.vscode/launch.json

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

cspell.json

@@ -55,6 +55,7 @@
         "hresult",
         "Hsts",
         "Impls",
+        "inproc",
         "JITID",
         "JWTs",
         "LCID",
@@ -107,6 +108,7 @@
         "ukwn",
         "uninitialize",
         "Uninstallation",
+        "uninstrumented",
         "uniquifier",
         "Unlocalized",
         "Unredacted",

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/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/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/cd505c19acbea28dc8d9aff84908ced335911801/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/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).
+The web API surface is defined by a series of controllers [here](https://github.com/dotnet/dotnet-monitor/blob/cd505c19acbea28dc8d9aff84908ced335911801/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/2ed430e3a03dab15101ee8c2359b8d05ac1fb921/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/cd505c19acbea28dc8d9aff84908ced335911801/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/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).
+Web APIs in dotnet-monitor are typically tested using functional tests that leverage the [ApiClient](https://github.com/dotnet/dotnet-monitor/blob/cd505c19acbea28dc8d9aff84908ced335911801/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/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.
+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/cd505c19acbea28dc8d9aff84908ced335911801/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/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.
+After determining the `StartupAuthenticationMode` mode, the relevant [IAuthenticationConfigurator](https://github.com/dotnet/dotnet-monitor/blob/cd505c19acbea28dc8d9aff84908ced335911801/src/Tools/dotnet-monitor/Auth/IAuthenticationConfigurator.cs) is created by the [AuthConfiguratorFactory](https://github.com/dotnet/dotnet-monitor/blob/cd505c19acbea28dc8d9aff84908ced335911801/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.