diff --git a/.github/linters/check-markdown-links-config.json b/.github/linters/check-markdown-links-config.json index ef2b131a34c..486434b3662 100644 --- a/.github/linters/check-markdown-links-config.json +++ b/.github/linters/check-markdown-links-config.json @@ -14,7 +14,17 @@ }, { "pattern": "^https://hub\\.docker\\.com/.*" + }, + { + "pattern": "^https://eng\\.ms/.*" + }, + { + "pattern": "^\\.\\./\\.\\./azure-pipelines\\.yml" + }, + { + "pattern": "^\\.\\./\\.\\./azure-pipelines-pr\\.yml" } + ], "aliveStatusCodes": [ 0, diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index f8c6793cb55..9d5a071dca6 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -41,7 +41,7 @@ jobs: body: backport_start_body }); - name: Checkout repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: true # We need to persist credentials to push the resulting changes upstream. fetch-depth: 0 diff --git a/.github/workflows/check-learning-path-links.yml b/.github/workflows/check-learning-path-links.yml index dfe9d2d5e2d..c2a427fd77f 100644 --- a/.github/workflows/check-learning-path-links.yml +++ b/.github/workflows/check-learning-path-links.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout head - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: true # need this for opening a PR fetch-depth: 0 @@ -30,7 +30,7 @@ jobs: echo "prev_sha=$prev_sha" >> $GITHUB_ENV - name: Checkout previous update - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false ref: ${{ env.prev_sha }} diff --git a/.github/workflows/check-markdown-links.yml b/.github/workflows/check-markdown-links.yml index b8d9677b59a..b0843e38754 100644 --- a/.github/workflows/check-markdown-links.yml +++ b/.github/workflows/check-markdown-links.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: false diff --git a/.github/workflows/cleanup-releases.yml b/.github/workflows/cleanup-releases.yml index b385addba17..cb12d9f84d7 100644 --- a/.github/workflows/cleanup-releases.yml +++ b/.github/workflows/cleanup-releases.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: true # We need to persist credentials inorder to open a PR. diff --git a/.github/workflows/generate-release-notes.yml b/.github/workflows/generate-release-notes.yml index 2499cf7e240..3879ab2b54b 100644 --- a/.github/workflows/generate-release-notes.yml +++ b/.github/workflows/generate-release-notes.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout release branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: false fetch-depth: 0 # Fetch the entire repo for the below git commit graph operations @@ -65,7 +65,7 @@ jobs: BASELINE_TAG: ${{ inputs.baselineTag }} - name: Checkout main - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: true # We need to persist credentials to push the resulting changes upstream. ref: main diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index fad5edbb556..263f130a162 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -29,7 +29,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@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: false @@ -52,7 +52,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: false @@ -104,7 +104,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: true # We need to persist credentials inorder to open a PR. ref: bot/${{ env.TARGET_BRANCH_POSTFIX }} diff --git a/.github/workflows/respond-to-first-issue.yml b/.github/workflows/respond-to-first-issue.yml index e619dd39c49..0ee21fcb160 100644 --- a/.github/workflows/respond-to-first-issue.yml +++ b/.github/workflows/respond-to-first-issue.yml @@ -12,7 +12,7 @@ jobs: permissions: issues: write steps: - - uses: actions/first-interaction@2d4393e6bc0e2efb2e48fba7e06819c3bf61ffc9 + - uses: actions/first-interaction@753c925c8d1ac6fede23781875376600628d9b5d with: repo-token: ${{ secrets.GITHUB_TOKEN }} issue-message: "## Welcome to dotnet-monitor!\nThanks for creating your first issue; let us know what you think of dotnet-monitor by filling out our [survey](https://aka.ms/dotnet-monitor-survey?src=firstissue)." diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml index 454c0b99d33..ded1d6c9593 100644 --- a/.github/workflows/spellcheck.yml +++ b/.github/workflows/spellcheck.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: false diff --git a/.github/workflows/submit-to-do-issue.yml b/.github/workflows/submit-to-do-issue.yml index 49592f23d32..bb9540ec837 100644 --- a/.github/workflows/submit-to-do-issue.yml +++ b/.github/workflows/submit-to-do-issue.yml @@ -27,7 +27,7 @@ jobs: }); - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: false diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 2a96ba6d854..5d2bd5cea30 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 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 @@ -64,7 +64,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 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 diff --git a/.github/workflows/update-release-version.yml b/.github/workflows/update-release-version.yml index dc77c31152f..5a24e677d99 100644 --- a/.github/workflows/update-release-version.yml +++ b/.github/workflows/update-release-version.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: persist-credentials: true # We need to persist credentials to push the resulting changes upstream. diff --git a/documentation/egress.md b/documentation/egress.md index 0e871b448e4..f89fdb8249f 100644 --- a/documentation/egress.md +++ b/documentation/egress.md @@ -36,7 +36,7 @@ In addition to the current `dotnet monitor` offerings, a `monitor-base` image is 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. +For an example of using Multi-Stage Docker Builds, see the [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.1/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://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz`. > [!NOTE] diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index f86d1a25aa8..cb3e498c1ad 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -2,11 +2,11 @@ - 1.47.1 - 1.14.2 + 1.47.2 + 1.15.0 12.25.0 12.23.0 - 3.13.1 + 3.13.2 1.6.24 4.3.2 5.0.0 diff --git a/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs b/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs index 12af7e224ec..743d4e56937 100644 --- a/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs +++ b/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs @@ -402,12 +402,12 @@ private static DefaultAzureCredentialOptions GetDefaultCredentialOptions() => { ExcludeAzureCliCredential = true, ExcludeAzureDeveloperCliCredential = true, + ExcludeBrokerCredential = true, ExcludeManagedIdentityCredential = true, ExcludeWorkloadIdentityCredential = true, ExcludeAzurePowerShellCredential = true, ExcludeEnvironmentCredential = true, ExcludeInteractiveBrowserCredential = true, - ExcludeSharedTokenCacheCredential = true, ExcludeVisualStudioCredential = true, }; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs index d30722a2286..ffbf33d3658 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs @@ -245,11 +245,12 @@ public void AzureBlobEgress_DefaultCredentials() nameof(DefaultAzureCredentialOptions.ExcludeWorkloadIdentityCredential), nameof(DefaultAzureCredentialOptions.ExcludeManagedIdentityCredential), nameof(DefaultAzureCredentialOptions.ExcludeAzureDeveloperCliCredential), - nameof(DefaultAzureCredentialOptions.ExcludeSharedTokenCacheCredential), nameof(DefaultAzureCredentialOptions.ExcludeInteractiveBrowserCredential), + nameof(DefaultAzureCredentialOptions.ExcludeBrokerCredential), nameof(DefaultAzureCredentialOptions.ExcludeAzureCliCredential), nameof(DefaultAzureCredentialOptions.ExcludeVisualStudioCredential), "ExcludeVisualStudioCodeCredential", // Don't use nameof for an Obsolete member + "ExcludeSharedTokenCacheCredential", // Don't use nameof for an Obsolete member nameof(DefaultAzureCredentialOptions.ExcludeAzurePowerShellCredential), };