diff --git a/eng/Signing.props b/eng/Signing.props
index 0623aaa1c18cc1..d06028e5d5e24b 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -56,8 +56,6 @@
-
-
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
https://github.com/dotnet/runtime-assets
@@ -348,9 +348,9 @@
https://github.com/dotnet/xharness
6df4f3a2cd57adbde1607bba67f50613102d8bd9
-
+
https://github.com/dotnet/arcade
- 1ec6078c26e4a60b77d8fe64881491cd28335a08
+ 584374998d21b1d550452753c7b5f41725c07a11
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -402,9 +402,9 @@
bfe9d9f9059008d919d867fe5bdfabfe8b6ed69d
-
+
https://github.com/dotnet/sdk
- c921fd0a32c3e6001b10791dd0a30f8ef80f915f
+ 5ebd5267376b61d01b4afc9d4cf9c832488312b2
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index 24a6a7432c10d6..f9b02cc7053e73 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -83,24 +83,24 @@
0.2.0
- 10.0.100-preview.3.25126.5
+ 10.0.100-preview.3.25173.9
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 2.9.2-beta.25157.1
- 10.0.0-beta.25157.1
- 2.9.2-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
- 10.0.0-beta.25157.1
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 2.9.2-beta.25175.2
+ 10.0.0-beta.25175.2
+ 2.9.2-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
+ 10.0.0-beta.25175.2
1.4.0
diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd
index 56c2f25ac22ffa..ac1f72bf94e055 100644
--- a/eng/common/CIBuild.cmd
+++ b/eng/common/CIBuild.cmd
@@ -1,2 +1,2 @@
@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
\ No newline at end of file
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 438f9920c43e4e..d419c3a2eff55c 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -7,6 +7,7 @@ Param(
[string] $msbuildEngine = $null,
[bool] $warnAsError = $true,
[bool] $nodeReuse = $true,
+ [switch] $buildCheck = $false,
[switch][Alias('r')]$restore,
[switch] $deployDeps,
[switch][Alias('b')]$build,
@@ -71,6 +72,8 @@ function Print-Usage() {
Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
+ Write-Host " -nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')"
+ Write-Host " -buildCheck Sets /check msbuild parameter"
Write-Host ""
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +100,7 @@ function Build {
$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
+ $check = if ($buildCheck) { '/check' } else { '' }
if ($projects) {
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +117,7 @@ function Build {
MSBuild $toolsetBuildProj `
$bl `
$platformArg `
+ $check `
/p:Configuration=$configuration `
/p:RepoRoot=$RepoRoot `
/p:Restore=$restore `
@@ -166,4 +171,4 @@ catch {
ExitWithExitCode 1
}
-ExitWithExitCode 0
+ExitWithExitCode 0
\ No newline at end of file
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 483647daf182c6..e24bb68f484001 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -42,6 +42,7 @@ usage()
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')"
+ echo " --buildCheck Sets /check msbuild parameter"
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
echo "Arguments can also be passed in with a single hyphen."
@@ -76,6 +77,7 @@ clean=false
warn_as_error=true
node_reuse=true
+build_check=false
binary_log=false
exclude_ci_binary_log=false
pipelines_log=false
@@ -173,6 +175,9 @@ while [[ $# > 0 ]]; do
node_reuse=$2
shift
;;
+ -buildcheck)
+ build_check=true
+ ;;
-runtimesourcefeed)
runtime_source_feed=$2
shift
@@ -224,8 +229,14 @@ function Build {
bl="/bl:\"$log_dir/Build.binlog\""
fi
+ local check=""
+ if [[ "$build_check" == true ]]; then
+ check="/check"
+ fi
+
MSBuild $_InitializeToolset \
$bl \
+ $check \
/p:Configuration=$configuration \
/p:RepoRoot="$repo_root" \
/p:Restore=$restore \
@@ -256,4 +267,4 @@ if [[ "$restore" == true ]]; then
InitializeNativeTools
fi
-Build
+Build
\ No newline at end of file
diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh
index 1a02c0dec8fd7b..66e3b0ac61c365 100755
--- a/eng/common/cibuild.sh
+++ b/eng/common/cibuild.sh
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
\ No newline at end of file
+. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
index 2a6a529482b522..dba506e74c3cab 100644
--- a/eng/common/core-templates/steps/install-microbuild.yml
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -5,7 +5,7 @@ parameters:
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
enableMicrobuildForMacAndLinux: false
# Location of the MicroBuild output folder
- microBuildOutputFolder: '$(Agent.TempDirectory)'
+ microBuildOutputFolder: '$(Build.SourcesDirectory)'
continueOnError: false
steps:
@@ -41,7 +41,7 @@ steps:
inputs:
packageType: sdk
version: 8.0.x
- installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet
+ installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
workingDirectory: ${{ parameters.microBuildOutputFolder }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
@@ -53,6 +53,7 @@ steps:
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
+ useEsrpCli: true
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
@@ -71,3 +72,28 @@ steps:
eq(variables['_SignType'], 'real')
)
))
+
+ # Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964
+ - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
+ - task: UseDotNet@2
+ displayName: Install .NET 9.0 SDK for ESRP CLI Workaround
+ inputs:
+ packageType: sdk
+ version: 9.0.x
+ installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
+ workingDirectory: ${{ parameters.microBuildOutputFolder }}
+ condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+
+ - task: PowerShell@2
+ displayName: Workaround for ESRP CLI on Linux
+ inputs:
+ targetType: 'inline'
+ script: |
+ Write-Host "Copying Linux Path"
+ $MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
+ $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
+ $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
+ $MBSIGN_APPFOLDER | Write-Host
+ $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
+ Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force
+ condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
diff --git a/eng/common/cross/armel/armel.jessie.patch b/eng/common/cross/armel/armel.jessie.patch
deleted file mode 100644
index 2d2615619351fc..00000000000000
--- a/eng/common/cross/armel/armel.jessie.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
---- a/usr/include/urcu/uatomic/generic.h 2014-10-22 15:00:58.000000000 -0700
-+++ b/usr/include/urcu/uatomic/generic.h 2020-10-30 21:38:28.550000000 -0700
-@@ -69,10 +69,10 @@
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- case 2:
-- return __sync_val_compare_and_swap_2(addr, old, _new);
-+ return __sync_val_compare_and_swap_2((uint16_t*) addr, old, _new);
- #endif
- case 4:
-- return __sync_val_compare_and_swap_4(addr, old, _new);
-+ return __sync_val_compare_and_swap_4((uint32_t*) addr, old, _new);
- #if (CAA_BITS_PER_LONG == 64)
- case 8:
- return __sync_val_compare_and_swap_8(addr, old, _new);
-@@ -109,7 +109,7 @@
- return;
- #endif
- case 4:
-- __sync_and_and_fetch_4(addr, val);
-+ __sync_and_and_fetch_4((uint32_t*) addr, val);
- return;
- #if (CAA_BITS_PER_LONG == 64)
- case 8:
-@@ -148,7 +148,7 @@
- return;
- #endif
- case 4:
-- __sync_or_and_fetch_4(addr, val);
-+ __sync_or_and_fetch_4((uint32_t*) addr, val);
- return;
- #if (CAA_BITS_PER_LONG == 64)
- case 8:
-@@ -187,7 +187,7 @@
- return __sync_add_and_fetch_2(addr, val);
- #endif
- case 4:
-- return __sync_add_and_fetch_4(addr, val);
-+ return __sync_add_and_fetch_4((uint32_t*) addr, val);
- #if (CAA_BITS_PER_LONG == 64)
- case 8:
- return __sync_add_and_fetch_8(addr, val);
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 74f399716ba861..d6f005b5dabea6 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -164,9 +164,13 @@ while :; do
armel)
__BuildArch=armel
__UbuntuArch=armel
- __UbuntuRepo="http://ftp.debian.org/debian/"
- __CodeName=jessie
+ __UbuntuRepo="http://archive.debian.org/debian/"
+ __CodeName=buster
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+ __LLDB_Package="liblldb-6.0-dev"
+ __UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
+ __UbuntuPackages="${__UbuntuPackages// libomp5/}"
+ __UbuntuSuites=
;;
armv6)
__BuildArch=armv6
@@ -278,46 +282,23 @@ while :; do
;;
xenial) # Ubuntu 16.04
- if [[ "$__CodeName" != "jessie" ]]; then
- __CodeName=xenial
- fi
- ;;
- zesty) # Ubuntu 17.04
- if [[ "$__CodeName" != "jessie" ]]; then
- __CodeName=zesty
- fi
+ __CodeName=xenial
;;
bionic) # Ubuntu 18.04
- if [[ "$__CodeName" != "jessie" ]]; then
- __CodeName=bionic
- fi
+ __CodeName=bionic
;;
focal) # Ubuntu 20.04
- if [[ "$__CodeName" != "jessie" ]]; then
- __CodeName=focal
- fi
+ __CodeName=focal
;;
jammy) # Ubuntu 22.04
- if [[ "$__CodeName" != "jessie" ]]; then
- __CodeName=jammy
- fi
+ __CodeName=jammy
;;
noble) # Ubuntu 24.04
- if [[ "$__CodeName" != "jessie" ]]; then
- __CodeName=noble
- fi
+ __CodeName=noble
if [[ -n "$__LLDB_Package" ]]; then
__LLDB_Package="liblldb-18-dev"
fi
;;
- jessie) # Debian 8
- __CodeName=jessie
- __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
-
- if [[ -z "$__UbuntuRepo" ]]; then
- __UbuntuRepo="http://ftp.debian.org/debian/"
- fi
- ;;
stretch) # Debian 9
__CodeName=stretch
__LLDB_Package="liblldb-6.0-dev"
@@ -333,7 +314,7 @@ while :; do
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
if [[ -z "$__UbuntuRepo" ]]; then
- __UbuntuRepo="http://ftp.debian.org/debian/"
+ __UbuntuRepo="http://archive.debian.org/debian/"
fi
;;
bullseye) # Debian 11
@@ -473,10 +454,6 @@ if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
__AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
fi
-if [[ "$__BuildArch" == "armel" ]]; then
- __LLDB_Package="lldb-3.5-dev"
-fi
-
__UbuntuPackages+=" ${__LLDB_Package:-}"
if [[ -z "$__UbuntuRepo" ]]; then
@@ -850,12 +827,6 @@ EOF
if [[ "$__SkipUnmount" == "0" ]]; then
umount "$__RootfsDir"/* || true
fi
-
- if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
- pushd "$__RootfsDir"
- patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch"
- popd
- fi
elif [[ "$__Tizen" == "tizen" ]]; then
ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
else
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 817555505aa602..a8a94328745823 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -31,6 +31,7 @@ jobs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
condition: always()
+ retryCountOnTaskFailure: 10 # for any logs being locked
continueOnError: true
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
- output: pipelineArtifact
@@ -39,6 +40,7 @@ jobs:
displayName: 'Publish logs'
continueOnError: true
condition: always()
+ retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
@@ -46,7 +48,7 @@ jobs:
displayName: Publish Logs
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
publishLocation: Container
- ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
+ ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
continueOnError: true
condition: always()
sbomEnabled: false # we don't need SBOM for logs
diff --git a/eng/common/templates-official/steps/publish-build-artifacts.yml b/eng/common/templates-official/steps/publish-build-artifacts.yml
index 100a3fc98493cd..fcf6637b2ebccc 100644
--- a/eng/common/templates-official/steps/publish-build-artifacts.yml
+++ b/eng/common/templates-official/steps/publish-build-artifacts.yml
@@ -24,6 +24,10 @@ parameters:
- name: is1ESPipeline
type: boolean
default: true
+
+- name: retryCountOnTaskFailure
+ type: string
+ default: 10
steps:
- ${{ if ne(parameters.is1ESPipeline, true) }}:
@@ -38,4 +42,5 @@ steps:
PathtoPublish: ${{ parameters.pathToPublish }}
${{ if parameters.artifactName }}:
ArtifactName: ${{ parameters.artifactName }}
-
+ ${{ if parameters.retryCountOnTaskFailure }}:
+ retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index d1aeb92fcea519..7cbf668c22bc04 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -46,6 +46,7 @@ jobs:
artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
continueOnError: true
condition: always()
+ retryCountOnTaskFailure: 10 # for any logs being locked
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
@@ -56,6 +57,7 @@ jobs:
displayName: 'Publish logs'
continueOnError: true
condition: always()
+ retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
@@ -66,7 +68,7 @@ jobs:
displayName: Publish Logs
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
publishLocation: Container
- artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
+ artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
continueOnError: true
condition: always()
diff --git a/eng/common/templates/steps/publish-build-artifacts.yml b/eng/common/templates/steps/publish-build-artifacts.yml
index 6428a98dfef68e..605e602e94d136 100644
--- a/eng/common/templates/steps/publish-build-artifacts.yml
+++ b/eng/common/templates/steps/publish-build-artifacts.yml
@@ -25,6 +25,10 @@ parameters:
type: string
default: 'Container'
+- name: retryCountOnTaskFailure
+ type: string
+ default: 10
+
steps:
- ${{ if eq(parameters.is1ESPipeline, true) }}:
- 'eng/common/templates cannot be referenced from a 1ES managed template': error
@@ -37,4 +41,6 @@ steps:
PublishLocation: ${{ parameters.publishLocation }}
PathtoPublish: ${{ parameters.pathToPublish }}
${{ if parameters.artifactName }}:
- ArtifactName: ${{ parameters.artifactName }}
\ No newline at end of file
+ ArtifactName: ${{ parameters.artifactName }}
+ ${{ if parameters.retryCountOnTaskFailure }}:
+ retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 95ccdf82e4bbca..7373e5305465d7 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
- $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
+ $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
Retry({
Write-Host "GET $uri"
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 4a5fa99478d146..d51f300c772007 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -295,7 +295,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
- local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"
+ local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
diff --git a/global.json b/global.json
index 6f65a48f308166..cbeeffb6b07484 100644
--- a/global.json
+++ b/global.json
@@ -1,16 +1,16 @@
{
"sdk": {
- "version": "10.0.100-preview.3.25125.5",
+ "version": "10.0.100-preview.3.25167.3",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "10.0.100-preview.3.25125.5"
+ "dotnet": "10.0.100-preview.3.25167.3"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25157.1",
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25175.2",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25175.2",
+ "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25175.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25152.4"