Merge remote-tracking branch 'upstream/main' into parameter-capturing/merge-main

Author: schmittjoseph

.devcontainer/devcontainer.json

@@ -17,7 +17,7 @@
         "vscode": {
             "extensions": [
                 "ms-vscode.cpptools",
-                "ms-dotnettools.csharp",
+                "ms-dotnettools.csdevkit",
                 "EditorConfig.EditorConfig",
                 "ms-vscode.powershell",
                 "tintoy.msbuild-project-tools",

.devcontainer/musl/devcontainer.json

@@ -17,7 +17,7 @@
         "vscode": {
             "extensions": [
                 "ms-vscode.cpptools",
-                "ms-dotnettools.csharp",
+                "ms-dotnettools.csdevkit",
                 "EditorConfig.EditorConfig",
                 "tintoy.msbuild-project-tools",
                 "streetsidesoftware.code-spell-checker",

.github/dependabot.template.yml

@@ -9,7 +9,7 @@ updates:
     schedule:
       interval: "daily"
     target-branch: "main"
-#@ for branch in ["main", "release/7.x", "release/7.2", "release/7.1", "release/7.0", "release/6.x"]:
+#@ for branch in ["main", "release/7.x", "release/7.2", "release/7.1", "release/6.x"]:
 #@ commit_prefix = "[" + branch + "] "
   - package-ecosystem: "nuget"
     directory: "/eng/dependabot"

.github/dependabot.yml

@@ -209,57 +209,6 @@ updates:
     - version-update:semver-major
   commit-message:
     prefix: '[release/7.1] '
-- package-ecosystem: nuget
-  directory: /eng/dependabot
-  schedule:
-    interval: daily
-  target-branch: release/7.0
-  ignore:
-  - dependency-name: Microsoft.Extensions.*
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/7.0] '
-- package-ecosystem: nuget
-  directory: /eng/dependabot/nuget.org
-  schedule:
-    interval: daily
-  target-branch: release/7.0
-  commit-message:
-    prefix: '[release/7.0] '
-- package-ecosystem: nuget
-  directory: /eng/dependabot/net7.0
-  schedule:
-    interval: daily
-  target-branch: release/7.0
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/7.0] '
-- package-ecosystem: nuget
-  directory: /eng/dependabot/net6.0
-  schedule:
-    interval: daily
-  target-branch: release/7.0
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/7.0] '
-- package-ecosystem: nuget
-  directory: /eng/dependabot/netcoreapp3.1
-  schedule:
-    interval: daily
-  target-branch: release/7.0
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  commit-message:
-    prefix: '[release/7.0] '
 - package-ecosystem: nuget
   directory: /eng/dependabot
   schedule:

.github/releases.json

@@ -7,11 +7,12 @@
     "8.0"
   ],
   "supported": [
+    "7.2",
     "7.1",
-    "7.0",
     "6.3"
   ],
   "unsupported": [
+    "7.0",
     "6.2",
     "6.1"
   ],
@@ -62,16 +63,26 @@
       "supportedFrameworks": [
         "net6.0",
         "net7.0"
-      ]
+      ],
+      "outOfSupportDate": "2023-09-13T00:00:00.000Z"
     },
     "8.0": {
-      "tag": "v8.0.0-preview.4.23260.4",
-      "minorReleaseDate": "2023-05-16T00:00:00.000Z",
-      "patchReleaseDate": "2023-05-16T00:00:00.000Z",
+      "tag": "v8.0.0-preview.5.23307.11",
+      "minorReleaseDate": "2023-06-13T00:00:00.000Z",
+      "patchReleaseDate": "2023-06-13T00:00:00.000Z",
       "supportedFrameworks": [
         "net6.0",
         "net8.0"
       ]
+    },
+    "7.2": {
+      "tag": "v7.2.0",
+      "minorReleaseDate": "2023-06-13T00:00:00.000Z",
+      "patchReleaseDate": "2023-06-13T00:00:00.000Z",
+      "supportedFrameworks": [
+        "net6.0",
+        "net7.0"
+      ]
     }
   }
 }

.github/workflows/add-markdown-feedback.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 

.github/workflows/backport.yml

@@ -41,7 +41,7 @@ jobs:
             body: backport_start_body
           });
     - name: Checkout repo
-      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
       with:
         persist-credentials: true # We need to persist credentials to push the resulting changes upstream.
         fetch-depth: 0

.github/workflows/check-markdown-links.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 

.github/workflows/cleanup-releases.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: true # We need to persist credentials inorder to open a PR.
 

.github/workflows/generate-release-notes.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout release branch
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
           fetch-depth: 0 # Fetch the entire repo for the below git commit graph operations
@@ -44,7 +44,7 @@ jobs:
           if [[ "$TEST_RUN" == "true" ]]; then
             qualified_release_version="test-$release_version"
           else
-            version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor-win-x64.zip.version"
+            version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor.version"
             qualified_release_version=$(curl -sL $version_url)
             # Check if the aka.ms url existed
             if [[ "$qualified_release_version" =~ "<html" || -z "$qualified_release_version" ]]; then
@@ -74,7 +74,7 @@ jobs:
           TEST_RUN: ${{ inputs.test_run }}
 
       - name: Checkout main
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: true # We need to persist credentials to push the resulting changes upstream.
           ref: main

.github/workflows/lint-csharp.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 

.github/workflows/post-release.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 
@@ -72,7 +72,7 @@ jobs:
     # It's simpler than trying to parse our `eng/Versions.prop` due to the conditionals in it.
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 
@@ -95,7 +95,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 
@@ -147,7 +147,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: true # We need to persist credentials inorder to open a PR.
           ref: bot/${{ env.TARGET_BRANCH_POSTFIX }}

.github/workflows/spellcheck.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 

.github/workflows/submit-linter-suggestions.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 
@@ -60,7 +60,7 @@ jobs:
             }
 
       - name: 'Setup reviewdog'
-        uses: reviewdog/action-setup@8dc47785c4a3a899d16d7371637b070e600cd65f
+        uses: reviewdog/action-setup@8e48baae926e97848f0863ae248f3b08e089c81f
 
       # Manually supply the triggering PR event information since when a PR is from a fork,
       # this workflow running in the base repo will not be given information about it.

.github/workflows/submit-to-do-issue.yml

@@ -27,7 +27,7 @@ jobs:
             });
 
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 

.github/workflows/sync-branches.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.repository == 'dotnet/dotnet-monitor'
     strategy:
       matrix:
-        branch: ["release/6.x", "release/7.x", "release/7.2", "release/7.1", "release/7.0"]
+        branch: ["release/6.x", "release/7.x", "release/7.2", "release/7.1"]
     name: 'Sync ${{ matrix.branch }}'
     runs-on: ubuntu-latest
     permissions:
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: true # We need to persist credentials to push the resulting changes upstream.
           fetch-depth: 0 # Fetch the entire repo for the below git operations

.github/workflows/update-release-version.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: true # We need to persist credentials to push the resulting changes upstream.
 

.vscode/settings.json

@@ -19,15 +19,15 @@
     // ms-dotnettools.csharp settings
     "csharp.format.enable": true,
     "csharp.semanticHighlighting.enabled": true,
+    "dotnet.defaultSolution": "dotnet-monitor.sln",
+    "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true,
 
     // ms-dotnettools.csharp settings
     "omnisharp.path": "latest",
-    "omnisharp.defaultLaunchSolution": "dotnet-monitor.sln",
     "omnisharp.disableMSBuildDiagnosticWarning": true,
     "omnisharp.useModernNet": true,
     "omnisharp.enableAsyncCompletion": true,
     "omnisharp.enableEditorConfigSupport": true,
-    "omnisharp.enableImportCompletion": true,
     "omnisharp.enableRoslynAnalyzers": true,
     "omnisharp.organizeImportsOnFormat": true,
     "omnisharp.autoStart": true,

documentation/authentication.md

@@ -20,6 +20,7 @@ Azure Active Directory integration (referred to as Azure AD) is the recommended
 
 - [Create an App Registration](https://learn.microsoft.com/azure/active-directory/develop/quickstart-register-app#register-an-application) in your Azure tenant that will be used by `dotnet monitor`. Note that a single App Registration can be used by multiple instances of `dotnet monitor`.
 - [Add a new app role](https://learn.microsoft.com/azure/active-directory/develop/howto-add-app-roles-in-azure-ad-apps#app-roles-ui) for general API access.
+- [Assign user to role](https://learn.microsoft.com/azure/active-directory/develop/howto-add-app-roles-in-apps#assign-users-and-groups-to-roles) via the Enterprise Applications section of AAD.
 - [Configure Azure AD in dotnet monitor](./configuration/azure-ad-authentication-configuration.md).
 
 > **Note**: Azure AD B2C is currently not supported.

documentation/egress.md

@@ -26,3 +26,35 @@ GET /dump?egressProvider=monitorBlob HTTP/1.1
 ```http
 HTTP/1.1 202 Accepted
 Location: https://localhost:52323/operations/26e74e52-0a16-4e84-84bb-27f904bfaf85
+```
+
+## Egress Extensibility (8.0+)
+
+Starting with `dotnet monitor` 8, the tool includes an egress extensibility model that allows additional egress providers to be discovered and usable by a `dotnet monitor` installation. The existing `AzureBlobStorage` egress provider has been moved to this model and remains as an available egress provider in the .NET Tool and `mcr.microsoft.com/dotnet/monitor` image offerings.
+
+In addition to the current `dotnet monitor` offerings, a `monitor-base` image is now available; this image does not include egress providers (with the exception of `FileSystem` egress), allowing users to only include their preferred egress providers. For convenience, the `monitor` image and the nuget package will include all of `dotnet monitor`'s supported extensions.
+
+### Manually Installing Supported Extensions
+
+Users using the `monitor-base` image can manually install supported extensions via Multi-Stage Docker Builds, creating their own image that includes any desired egress providers.
+
+For an example of using Multi-Stage Docker Builds, see the [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) that the `dotnet monitor` team uses to construct the `amd64` `monitor` image.
+
+To directly access archives for one of `dotnet monitor`'s supported extensions, these are available using the following link (this example is specifically for the `linux-x64` archive): `https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz`. Note: the versions in this link will change in response to new `dotnet monitor` releases; as a result, the link will need to be changed to reflect the most recent version when updating your extensions.
+
+#### Example Of Manually Installing AzureBlobStorage Extension Locally (Version Numbers May Vary)
+
+1. Download the archive: `curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/8.0.0-preview.4.23260.4/dotnet-monitor-egress-azureblobstorage-8.0.0-preview.4.23260.4-linux-x64.tar.gz`
+2. Extract the contents of `dotnet-monitor-egress-azureblobstorage.tar.gz`
+   * Example (Linux): `tar -xvzf dotnet-monitor-egress-azureblobstorage.tar.gz`
+4. Place the `AzureBlobStorage` directory found inside the archive in one of `dotnet monitor`'s designated extension [locations](./learningPath/egress.md#well-known-egress-provider-locations).
+   * Example (Linux): Place `AzureBlobStorage` at `$XDG_CONFIG_HOME/dotnet-monitor/settings.json`.
+5. `dotnet monitor` will now automatically detect the extension - ensure you have added the necessary configuration for the extension (configuration for extensions is written alongside the rest of `dotnet monitor` configuration).
+
+> `dotnet monitor` may expand the acquisition model for extensions in the future; if you have a scenario that requires additional installation options, please let us know by creating a [discussion](https://github.com/dotnet/dotnet-monitor/discussions).
+
+### Third-Party Egress Extensions
+
+The extensibility model allows users to utilize third-party egress providers with `dotnet monitor`. **Note that `dotnet monitor` does not endorse or guarantee any third-party extensions - users should always exercise caution when providing sensitive authentication information (such as passwords) to untrusted extensions.** Third-party egress extensions are responsible for their own distribution, and are not included with `dotnet monitor`.
+
+For more information on how to create your own egress extension, see our [learning path](../documentation/learningPath/).

documentation/releaseNotes/releaseNotes.v7.2.0.md

@@ -0,0 +1,7 @@
+Today we are releasing the 7.2.0 build of the `dotnet monitor` tool. This release includes:
+
+- ⚠️ Disable azure developer cli credentials ([#4479](https://github.com/dotnet/dotnet-monitor/pull/4479))
+- Enable workflow identity ([#4473](https://github.com/dotnet/dotnet-monitor/pull/4473))
+- Allow per provider interval specification ([#4144](https://github.com/dotnet/dotnet-monitor/pull/4144))
+
+\*⚠️ **_indicates a breaking change_**

documentation/releaseNotes/releaseNotes.v8.0.0-preview.5.23307.11.md

@@ -0,0 +1,2 @@
+Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes:
+- Updated dependencies