diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 985eef5d0b4..a72d4368b0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8 + 24c548a0d3de04c06530d87dff376a37a0a0c723 - + https://github.com/dotnet/arcade - 1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8 + 24c548a0d3de04c06530d87dff376a37a0a0c723 - + https://github.com/dotnet/arcade - 1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8 + 24c548a0d3de04c06530d87dff376a37a0a0c723 - + https://github.com/dotnet/arcade - 1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8 + 24c548a0d3de04c06530d87dff376a37a0a0c723 - + https://github.com/dotnet/arcade - 1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8 + 24c548a0d3de04c06530d87dff376a37a0a0c723 diff --git a/eng/Versions.props b/eng/Versions.props index cd7b74e48fd..d306677f790 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26372.4 - 11.0.0-beta.26372.4 - 11.0.0-beta.26372.4 + 11.0.0-beta.26373.4 + 11.0.0-beta.26373.4 + 11.0.0-beta.26373.4 diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 0da13cf69db..4247a4f30bd 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -190,6 +190,7 @@ jobs: --use-fully-qualified-test-name '${{ parameters.useFullyQualifiedTestName }}' --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)' + --stage-attempt '$(System.StageAttempt)' ) organization='${{ parameters.organization }}' diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 536c5947586..f58abbd2d10 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -9,7 +9,7 @@ usage() echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" echo " for alpine can be specified with version: alpineX.YY or alpineedge" echo " for FreeBSD can be: freebsd14, freebsd15" - echo " for OpenBSD can be: openbsd" + echo " for OpenBSD can be: openbsd7.8, openbsd7.9" echo " for illumos can be: illumos" echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" diff --git a/global.json b/global.json index 01a7dcce78d..640aa25c895 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26302.115" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26372.4", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26372.4" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26373.4", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26373.4" } }