diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3829347c4f0..b2156718ab4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,17 +43,17 @@
-
+
https://github.com/dotnet/arcade
- 87b015b938e5400d6e57afd7650348c17a764b73
+ 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc
-
+
https://github.com/dotnet/arcade
- 87b015b938e5400d6e57afd7650348c17a764b73
+ 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc
-
+
https://github.com/dotnet/arcade
- 87b015b938e5400d6e57afd7650348c17a764b73
+ 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc
diff --git a/eng/Versions.props b/eng/Versions.props
index d8f546643c8..17035c533ae 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,7 +28,7 @@
9.0.0-preview.4.24215.1
- 9.0.0-beta.24212.4
+ 9.0.0-beta.24219.5
17.9.5
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 83e6d82e027..438f9920c43 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -19,7 +19,6 @@ Param(
[switch] $pack,
[switch] $publish,
[switch] $clean,
- [switch] $verticalBuild,
[switch][Alias('pb')]$productBuild,
[switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog,
@@ -60,7 +59,6 @@ function Print-Usage() {
Write-Host " -sign Sign build outputs"
Write-Host " -publish Publish artifacts (e.g. symbols)"
Write-Host " -clean Clean the solution"
- Write-Host " -verticalBuild Run in 'vertical build' infra mode."
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
Write-Host ""
@@ -124,7 +122,7 @@ function Build {
/p:Deploy=$deploy `
/p:Test=$test `
/p:Pack=$pack `
- /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
+ /p:DotNetBuildRepo=$productBuild `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `
/p:Sign=$sign `
diff --git a/eng/common/build.sh b/eng/common/build.sh
index d82ebf74280..ac1ee8620cd 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
restore=false
build=false
source_build=false
-vertical_build=false
product_build=false
rebuild=false
test=false
@@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do
restore=true
pack=true
;;
- -verticalbuild|-vb)
- build=true
- vertical_build=true
- product_build=true
- restore=true
- pack=true
- ;;
-test|-t)
test=true
;;
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 3762640fdcf..9a4e285a5ae 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -382,6 +382,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
endif()
endif()
+# Set C++ standard library options if specified
+set(CLR_CMAKE_CXX_STANDARD_LIBRARY "" CACHE STRING "Standard library flavor to link against. Only supported with the Clang compiler.")
+if (CLR_CMAKE_CXX_STANDARD_LIBRARY)
+ add_compile_options($<$:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
+ add_link_options($<$:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
+endif()
+
+option(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC "Statically link against the C++ standard library" OFF)
+if(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC)
+ add_link_options($<$:-static-libstdc++>)
+endif()
+
+set(CLR_CMAKE_CXX_ABI_LIBRARY "" CACHE STRING "C++ ABI implementation library to link against. Only supported with the Clang compiler.")
+if (CLR_CMAKE_CXX_ABI_LIBRARY)
+ # The user may specify the ABI library with the 'lib' prefix, like 'libstdc++'. Strip the prefix here so the linker finds the right library.
+ string(REGEX REPLACE "^lib(.+)" "\\1" CLR_CMAKE_CXX_ABI_LIBRARY ${CLR_CMAKE_CXX_ABI_LIBRARY})
+ # We need to specify this as a linker-backend option as Clang will filter this option out when linking to libc++.
+ add_link_options("LINKER:-l${CLR_CMAKE_CXX_ABI_LIBRARY}")
+endif()
+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index c63e17e863e..761acc5eb62 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -210,7 +210,7 @@ jobs:
- task: 1ES.PublishPipelineArtifact@1
inputs:
targetPath: 'artifacts/log'
- artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
+ artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }}
displayName: 'Publish logs'
continueOnError: true
condition: always()
diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml
index ba9ba493032..52b4d05d3f8 100644
--- a/eng/common/templates-official/job/onelocbuild.yml
+++ b/eng/common/templates-official/job/onelocbuild.yml
@@ -56,7 +56,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml
index c918720931f..2180e97a284 100644
--- a/eng/common/templates-official/job/source-build.yml
+++ b/eng/common/templates-official/job/source-build.yml
@@ -52,7 +52,7 @@ jobs:
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
- image: 1es-mariner-2-pt
+ image: 1es-mariner-2
os: linux
${{ if ne(parameters.platform.pool, '') }}:
diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml
index d286e956bdf..da1f40958b4 100644
--- a/eng/common/templates-official/post-build/post-build.yml
+++ b/eng/common/templates-official/post-build/post-build.yml
@@ -110,7 +110,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
@@ -150,7 +150,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml
index beab7d1bfba..1f308b24efc 100644
--- a/eng/common/templates-official/variables/pool-providers.yml
+++ b/eng/common/templates-official/variables/pool-providers.yml
@@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
-# image: 1es-windows-2022-pt
+# image: 1es-windows-2022
variables:
# Coalesce the target and source branches so we know when a PR targets a release branch
diff --git a/global.json b/global.json
index 3b77f021fdc..89c19b99181 100644
--- a/global.json
+++ b/global.json
@@ -8,7 +8,7 @@
"dotnet": "9.0.100-preview.3.24204.13"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24212.4"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.5"
}
}