diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4c8799a14..de58f66146 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/arcade - 7dad90156e9d69e991ad499ece9cf805cabcf506 + 7663bc91853be9540495d9e502f1b29a02b8be83 - + https://github.com/dotnet/arcade - 7dad90156e9d69e991ad499ece9cf805cabcf506 + 7663bc91853be9540495d9e502f1b29a02b8be83 - + https://github.com/dotnet/arcade - 7dad90156e9d69e991ad499ece9cf805cabcf506 + 7663bc91853be9540495d9e502f1b29a02b8be83 - + https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage - f758d3725063db472ed0353c4e0eeec86df5145d + b5b0f1c467af054ef1714934a4249da6a6796eaa - + https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage - f758d3725063db472ed0353c4e0eeec86df5145d + b5b0f1c467af054ef1714934a4249da6a6796eaa https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index ebd337c254..8735c4a553 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,9 +7,9 @@ preview - 12.0.0-beta.26509.4 - 18.13.0-preview.26519.2 - 18.13.0-preview.26519.2 + 12.0.0-beta.26523.11 + 18.13.0-preview.26524.1 + 18.13.0-preview.26524.1 4.6.0-preview.26519.1 2.6.0-preview.26519.1 diff --git a/eng/common/build.sh b/eng/common/build.sh index f48ed97762..f65b048aa8 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -85,7 +85,7 @@ clean=false warn_as_error=true warn_not_as_error='' -# Empty means "not specified"; tools.sh defaults both options on locally, and msbuild_multi_threaded on (node_reuse off) on CI. +# Empty means "not specified"; tools.sh defaults these to on for local builds and off on CI. node_reuse='' msbuild_multi_threaded='' build_check=false diff --git a/eng/common/msbuild.sh b/eng/common/msbuild.sh index ad1757f0ec..a40c101237 100644 --- a/eng/common/msbuild.sh +++ b/eng/common/msbuild.sh @@ -14,7 +14,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" verbosity='minimal' warn_as_error=true -# Empty means "not specified"; tools.sh defaults both options on locally, and msbuild_multi_threaded on (node_reuse off) on CI. +# Empty means "not specified"; tools.sh defaults these to on for local builds and off on CI. node_reuse='' msbuild_multi_threaded='' prepare_machine=false diff --git a/eng/common/native/NativeAotSupported.props b/eng/common/native/NativeAotSupported.props index cdff9ef036..c8931ef3aa 100644 --- a/eng/common/native/NativeAotSupported.props +++ b/eng/common/native/NativeAotSupported.props @@ -3,7 +3,6 @@ <_NativeAotSupportedOS Condition=" - '$(TargetOS)' != 'browser' and '$(TargetOS)' != 'haiku' and '$(TargetOS)' != 'illumos' and '$(TargetOS)' != 'netbsd' and @@ -12,7 +11,6 @@ <_NativeAotSupportedArch Condition=" - '$(TargetArchitecture)' != 'wasm' and '$(TargetArchitecture)' != 's390x' and '$(TargetArchitecture)' != 'ppc64le' and ('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows') diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index aff839fa09..be405fd62e 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -26,7 +26,7 @@ case "$os" in apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ libssl-dev libkrb5-dev pigz cpio ninja-build file - localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 + localedef -i en_US -c -f UTF-8 en_US.UTF-8 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build file diff --git a/global.json b/global.json index d02a1015ab..dc93a1baca 100644 --- a/global.json +++ b/global.json @@ -70,7 +70,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26509.4", + "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26523.11", "MSBuild.Sdk.Extras": "3.0.44" } }