From 65c468c7fb25c3d53ff37a6d5ea8f9efefbb9781 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Aug 2026 05:02:50 +0000 Subject: [PATCH] Update dependencies from build 325270 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.26378.118 -> 11.0.0-beta.26401.101) System.CommandLine (Version 3.0.0-rc.1.26378.118 -> 3.0.0-rc.1.26401.101) System.IO.Hashing, System.Security.Cryptography.Xml, System.Text.Json (Version 11.0.0-rc.1.26378.118 -> 11.0.0-rc.1.26401.101) [[ commit created by automation ]] --- eng/Version.Details.props | 10 ++++----- eng/Version.Details.xml | 22 +++++++++---------- .../core-templates/job/helix-job-monitor.yml | 10 ++++++++- .../core-templates/steps/publish-logs.yml | 1 - global.json | 2 +- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7aa826602c..0c3e6292df 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,11 +6,11 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26378.118 - 3.0.0-rc.1.26378.118 - 11.0.0-rc.1.26378.118 - 11.0.0-rc.1.26378.118 - 11.0.0-rc.1.26378.118 + 11.0.0-beta.26401.101 + 3.0.0-rc.1.26401.101 + 11.0.0-rc.1.26401.101 + 11.0.0-rc.1.26401.101 + 11.0.0-rc.1.26401.101 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fdbf0ee50..f5f10936ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,28 +1,28 @@ - + - + https://github.com/dotnet/dotnet - 43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53 + 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c - + https://github.com/dotnet/dotnet - 43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53 + 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c - + https://github.com/dotnet/dotnet - 43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53 + 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c - + https://github.com/dotnet/dotnet - 43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53 + 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c - + https://github.com/dotnet/dotnet - 43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53 + 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 4247a4f30b..62fa199711 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -104,9 +104,11 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) + os: linux demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ else }}: name: $(DncEngInternalBuildPool) + os: linux demands: ImageOverride -equals build.azurelinux.3.amd64 steps: - checkout: self @@ -198,12 +200,18 @@ jobs: # Fall back to Azure DevOps-provided environment variables when the caller did not # supply organization / repository explicitly. BUILD_REPOSITORY_NAME is typically - # 'owner/repo' for GitHub-backed builds. + # 'owner/repo' for GitHub-backed builds and 'owner-repo' for internal builds. if [ -z "$organization" ] || [ -z "$repository" ]; then buildRepoName="${BUILD_REPOSITORY_NAME:-}" if [ -n "$buildRepoName" ] && [[ "$buildRepoName" == */* ]]; then repoOwner="${buildRepoName%%/*}" repoName="${buildRepoName#*/}" + elif [ -n "$buildRepoName" ] && [[ "$buildRepoName" == *-* ]]; then + repoOwner="${buildRepoName%%-*}" + repoName="${buildRepoName#*-}" + fi + + if [ -n "${repoOwner:-}" ] && [ -n "${repoName:-}" ]; then if [ -z "$organization" ]; then organization="$repoOwner"; fi if [ -z "$repository" ]; then repository="$repoName"; fi fi diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 2731e48cce..c496f3d0dc 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -31,7 +31,6 @@ steps: -runtimeSourceFeed https://ci.dot.net/internal -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' - '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' '$(System.AccessToken)' ${{parameters.CustomSensitiveDataList}} diff --git a/global.json b/global.json index c26df198ca..8fd93e3252 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "dotnet": "11.0.100-preview.6.26359.118" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26378.118", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26401.101", "Microsoft.Build.NoTargets": "3.7.0" } }