From 2363020b79e56c46370d6e1fd35126b36c5c4782 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2026 05:50:55 +0000 Subject: [PATCH 01/12] Update dependencies from https://github.com/dotnet/arcade build 20260401.4 (#9172) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88a288c497e..f209cecbfc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet b0f34d51fccc69fd334253924abd8d6853fad7aa - + https://github.com/dotnet/arcade - 62dc2defffeadabf6761a9ed7e142692107330c0 + 2ad6e0a00c692279222642dbcd6e72eb21572d93 - + https://github.com/dotnet/arcade - 62dc2defffeadabf6761a9ed7e142692107330c0 + 2ad6e0a00c692279222642dbcd6e72eb21572d93 - + https://github.com/dotnet/arcade - 62dc2defffeadabf6761a9ed7e142692107330c0 + 2ad6e0a00c692279222642dbcd6e72eb21572d93 - + https://github.com/dotnet/arcade - 62dc2defffeadabf6761a9ed7e142692107330c0 + 2ad6e0a00c692279222642dbcd6e72eb21572d93 - + https://github.com/dotnet/arcade - 62dc2defffeadabf6761a9ed7e142692107330c0 + 2ad6e0a00c692279222642dbcd6e72eb21572d93 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 091b0ab8107..08767d0cbdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ 10.0.0 10.0.100 - 10.0.0-beta.26177.7 - 10.0.0-beta.26177.7 - 10.0.0-beta.26177.7 + 10.0.0-beta.26201.4 + 10.0.0-beta.26201.4 + 10.0.0-beta.26201.4 10.0.0 2.0.0 10.0.0-rtm.25523.111 diff --git a/global.json b/global.json index 6788f009fd3..edd3cc4e1bb 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26177.7", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26177.7" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26201.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26201.4" } } From 63697c51ffb3821da6af8f3cc5d492fe989b8731 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 23:02:44 -0700 Subject: [PATCH 02/12] [main] Bump AWSSDK.S3 from 4.0.19.4 to 4.0.20.1 (#9163) --- updated-dependencies: - dependency-name: AWSSDK.S3 dependency-version: 4.0.20.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 4f9d00d9740..726eb60b472 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -14,7 +14,7 @@ 13.0.4 11.5.2 - 4.0.19.4 + 4.0.20.1 4.0.5.15 13.0.4 11.5.2 - 4.0.20.1 + 4.0.20.2 4.0.5.17 + + ReferenceOutputAssembly="false" + Private="false" /> From 8217015cbee1c5725c21818d6c36b75804bc2b2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 10:21:30 -0700 Subject: [PATCH 09/12] Bump streetsidesoftware/cspell-action from 8.3.0 to 8.4.0 (#9191) Bumps [streetsidesoftware/cspell-action](https://github.com/streetsidesoftware/cspell-action) from 8.3.0 to 8.4.0. - [Release notes](https://github.com/streetsidesoftware/cspell-action/releases) - [Changelog](https://github.com/streetsidesoftware/cspell-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell-action/compare/9cd41bb518a24fefdafd9880cbab8f0ceba04d28...de2a73e963e7443969755b648a1008f77033c5b2) --- updated-dependencies: - dependency-name: streetsidesoftware/cspell-action dependency-version: 8.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/spellcheck.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml index 5b85eba8c85..e5ad211d602 100644 --- a/.github/workflows/spellcheck.yml +++ b/.github/workflows/spellcheck.yml @@ -17,7 +17,7 @@ jobs: with: persist-credentials: false - - uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28 + - uses: streetsidesoftware/cspell-action@de2a73e963e7443969755b648a1008f77033c5b2 name: Documentation spellcheck if: ${{ !cancelled() }} with: @@ -25,7 +25,7 @@ jobs: inline: error incremental_files_only: true - - uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28 + - uses: streetsidesoftware/cspell-action@de2a73e963e7443969755b648a1008f77033c5b2 name: Resx spellcheck if: ${{ !cancelled() }} with: @@ -33,7 +33,7 @@ jobs: inline: error incremental_files_only: true - - uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28 + - uses: streetsidesoftware/cspell-action@de2a73e963e7443969755b648a1008f77033c5b2 name: Source code spellcheck if: ${{ !cancelled() }} with: From ae6685a2384f04c06992bc285a21889e21655a89 Mon Sep 17 00:00:00 2001 From: kkeirstead <85592574+kkeirstead@users.noreply.github.com> Date: Mon, 6 Apr 2026 17:19:49 -0700 Subject: [PATCH 10/12] Specify Versions for Failing Actions (#9200) * Initial plan * Update installAndRequirePackages to support versioned packages and pin @actions/core@2 and @actions/github@8 Agent-Logs-Url: https://github.com/kkeirstead/dotnet-monitor/sessions/2c2f479a-31d2-49bc-8656-541b8e2d2c55 Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .github/actions/action-utils.js | 21 ++++++++++--------- .../actions/generate-release-notes/index.js | 2 +- .../learning-path-staleness-check/index.js | 2 +- .github/actions/update-releases-json/index.js | 2 +- .github/actions/update-releases-md/index.js | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/actions/action-utils.js b/.github/actions/action-utils.js index b401cf2a1ba..888b1da8b95 100644 --- a/.github/actions/action-utils.js +++ b/.github/actions/action-utils.js @@ -2,21 +2,22 @@ const util = require("util"); const fs = require("fs"); const jsExec = util.promisify(require("child_process").exec); -module.exports.installAndRequirePackages = async function(...newPackages) -{ +module.exports.installAndRequirePackages = async function (...packages) { + // Back-compat: allow strings ("@actions/core") as well as objects ({ name, version }) + const normalized = packages.map(p => typeof p === "string" ? { name: p } : p); + + const installSpecs = normalized.map(p => + p.version ? `${p.name}@${p.version}` : p.name + ); + console.log("Installing npm dependency"); - const { stdout, stderr } = await jsExec(`npm install ${newPackages.join(' ')}`); + const { stdout, stderr } = await jsExec(`npm install ${installSpecs.join(" ")}`); console.log("npm-install stderr:\n\n" + stderr); console.log("npm-install stdout:\n\n" + stdout); console.log("Finished installing npm dependencies"); - let requiredPackages = []; - for (const packageName of newPackages) { - requiredPackages.push(require(packageName)); - } - - return requiredPackages; -} + return normalized.map(p => require(p.name)); +}; function splitVersionTag(tag) { const regex = /v(?\d+)\.(?\d+)\.(?\d+)(-(?[a-zA-Z]+)\.(?\d+))?/; diff --git a/.github/actions/generate-release-notes/index.js b/.github/actions/generate-release-notes/index.js index f981e769965..68c063e7d15 100644 --- a/.github/actions/generate-release-notes/index.js +++ b/.github/actions/generate-release-notes/index.js @@ -5,7 +5,7 @@ const UpdateReleaseNotesLabel = "update-release-notes"; const BackportLabel = "backport"; async function run() { - const [core, github] = await actionUtils.installAndRequirePackages("@actions/core", "@actions/github"); + const [core, github] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" }, { name: "@actions/github", version: "8" }); const octokit = github.getOctokit(core.getInput("auth_token", { required: true })); diff --git a/.github/actions/learning-path-staleness-check/index.js b/.github/actions/learning-path-staleness-check/index.js index 4d6a5ddc7c1..e466449a27d 100644 --- a/.github/actions/learning-path-staleness-check/index.js +++ b/.github/actions/learning-path-staleness-check/index.js @@ -202,7 +202,7 @@ function ValidateLinks(learningPathContents, repoURLToSearch, modifiedPRFiles, l const main = async () => { - const [core] = await actionUtils.installAndRequirePackages("@actions/core"); + const [core] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" }); try { const learningPathDirectory = core.getInput('learningPathsDirectory', { required: true }); diff --git a/.github/actions/update-releases-json/index.js b/.github/actions/update-releases-json/index.js index c93391508c0..35487e98b4f 100644 --- a/.github/actions/update-releases-json/index.js +++ b/.github/actions/update-releases-json/index.js @@ -2,7 +2,7 @@ const actionUtils = require('../action-utils.js'); const path = require('path'); async function run() { - const [core, github] = await actionUtils.installAndRequirePackages("@actions/core", "@actions/github"); + const [core, github] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" }, { name: "@actions/github", version: "8" }); const releasesDataFile = core.getInput("releases_json_file", { required: true }); let octokit = undefined; diff --git a/.github/actions/update-releases-md/index.js b/.github/actions/update-releases-md/index.js index 2290832036f..0739202f0fd 100644 --- a/.github/actions/update-releases-md/index.js +++ b/.github/actions/update-releases-md/index.js @@ -1,7 +1,7 @@ const actionUtils = require('../action-utils.js'); async function run() { - const [core, github] = await actionUtils.installAndRequirePackages("@actions/core", "@actions/github"); + const [core, github] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" }, { name: "@actions/github", version: "8" }); const releasesDataFile = core.getInput("releases_json_file", { required: true }); const outputFile = core.getInput("releases_md_file", { required: true }); From 91a7bd20fe45f0b68a6b99003c905d78eff67898 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2026 17:12:02 -0700 Subject: [PATCH 11/12] [main] Bump AWSSDK.SecurityToken from 4.0.5.17 to 4.0.5.19 (#9202) --- updated-dependencies: - dependency-name: AWSSDK.SecurityToken dependency-version: 4.0.5.19 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index f979e906c57..7a83d2d4eba 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -15,7 +15,7 @@ 13.0.4 11.5.2 4.0.20.2 - 4.0.5.17 + 4.0.5.19 13.0.4 11.5.2 - 4.0.20.2 + 4.0.20.4 4.0.5.19