diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e5c2fd46..c93bd647 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,13 +3,13 @@
-
+
https://github.com/dotnet/arcade
- b076228a542025c4f879f254d38adb5cf34a2475
+ f87bce1e0d389d515282c5f74466d629ef653026
-
+
https://github.com/dotnet/arcade
- b076228a542025c4f879f254d38adb5cf34a2475
+ f87bce1e0d389d515282c5f74466d629ef653026
diff --git a/eng/Versions.props b/eng/Versions.props
index 8b73cc03..27334fc4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -15,7 +15,7 @@
13.0.1
3.2.2146
9.3.3
- 11.0.0-beta.26325.1
+ 11.0.0-beta.26330.1
6.0.3-dotnet.3
diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml
index a8162c51..96287e55 100644
--- a/eng/common/core-templates/job/helix-job-monitor.yml
+++ b/eng/common/core-templates/job/helix-job-monitor.yml
@@ -57,6 +57,14 @@ parameters:
type: number
default: 30
+# When 'true' (the default), Helix work items that exit 0 but have failed AzDO test results
+# are treated as failed: they count toward the monitor's exit code and are resubmitted by a
+# later invocation's retry pass. Set to 'false' to fall back to exit-code-only outcomes.
+# Forwarded as --fail-on-failed-tests.
+- name: failWorkItemsWithFailedTests
+ type: boolean
+ default: true
+
# Advanced: optional pipeline artifact (produced earlier in this run) that contains the tool
# nupkg. When set, the artifact is downloaded and the tool is installed from the nupkg into
# a local tool-path; this bypasses the repo's .config/dotnet-tools.json manifest and is
@@ -170,6 +178,7 @@ jobs:
toolArgs=(
--helix-base-uri '${{ parameters.helixBaseUri }}'
--polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
+ --fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}'
--max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
--stage-name '$(System.StageName)'
)
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 69ca926a..3164fff3 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -423,7 +423,7 @@ function InitializeToolset {
if [[ -z "$nuget_config" ]]; then
# Search for any variation of nuget.config in the RepoRoot
local found_config
- found_config=$(find "$repo_root" -maxdepth 1 -type f -iname "nuget.config" -print -quit)
+ found_config=$(find "$repo_root" -maxdepth 1 -type f -iname nuget.config | head -n 1)
if [[ -n "$found_config" ]]; then
nuget_config="$found_config"
diff --git a/global.json b/global.json
index 3be7d27a..eb5fd142 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "11.0.100-preview.5.26227.104",
+ "dotnet": "11.0.100-preview.5.26302.115",
"runtimes": {
"dotnet": [
"8.0.0"
@@ -8,7 +8,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26325.1",
+ "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26330.1",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.3"
}
}