diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20185379cb8450..25692acbd84093 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,61 +6,61 @@ - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 - + https://github.com/dotnet/arcade - fef373440d604c428950236fbc2b99ce0df368a9 + 54d096ee50a9bcf7ac6efd16a07d51af651d20a1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -82,41 +82,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d0bb63d2ec7060714e63ee4082fac48f2e57f3e2 - + https://github.com/microsoft/vstest - 0f37872348e43ad95df182489890e80ea0f2998a + df62aca07cacc5c018dc8e828f03a0cd79ee52da - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 - + https://github.com/dotnet/runtime-assets - 71b9284907ebc69e5f80b491a51084c75e0ef7d3 + 8140f0c2f4ae53563f0a03fe811590f6562068c0 https://github.com/dotnet/llvm-project @@ -170,13 +170,13 @@ https://github.com/dotnet/runtime 0375524a91a47ca4db3ee1be548f74bab7e26e76 - + https://github.com/mono/linker - bc442f7a56647d45bf306e969bdef6217ebac171 + 326ec6fafa0b60f707a9a6d06f10a9a5501fd5c7 - + https://github.com/dotnet/xharness - 513c09e1d5f22c00df1524ec6d71b0a35c2cfaeb + 323f5adb50a9f90692feb3a6f4ec9adc4635cb60 diff --git a/eng/Versions.props b/eng/Versions.props index d43f6c460aa87c..bd8775638f7892 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,16 +51,16 @@ - 5.0.0-beta.20280.1 - 5.0.0-beta.20280.1 - 5.0.0-beta.20280.1 - 5.0.0-beta.20280.1 - 5.0.0-beta.20280.1 - 5.0.0-beta.20280.1 - 2.5.1-beta.20280.1 - 5.0.0-beta.20280.1 - 5.0.0-beta.20308.5 - 5.0.0-beta.20280.1 + 5.0.0-beta.20309.1 + 5.0.0-beta.20309.1 + 5.0.0-beta.20309.1 + 5.0.0-beta.20309.1 + 5.0.0-beta.20309.1 + 5.0.0-beta.20309.1 + 2.5.1-beta.20309.1 + 5.0.0-beta.20309.1 + 5.0.0-beta.20309.1 + 5.0.0-beta.20309.1 5.0.0-preview.4.20202.18 5.0.0-preview.4.20202.18 @@ -73,14 +73,14 @@ 5.0.0-preview.4.20202.18 5.0.0-alpha.1.19563.3 - 5.0.0-beta.20258.1 - 5.0.0-beta.20258.1 - 5.0.0-beta.20258.1 - 5.0.0-beta.20258.1 - 5.0.0-beta.20258.1 - 5.0.0-beta.20258.1 - 5.0.0-beta.20258.1 - 5.0.0-beta.20258.1 + 5.0.0-beta.20310.1 + 5.0.0-beta.20310.1 + 5.0.0-beta.20310.1 + 5.0.0-beta.20310.1 + 5.0.0-beta.20310.1 + 5.0.0-beta.20310.1 + 5.0.0-beta.20310.1 + 5.0.0-beta.20310.1 2.2.0-prerelease.19564.1 @@ -105,8 +105,8 @@ 4.8.0 - 16.8.0-preview-20200610-06 - 1.0.0-prerelease.20309.4 + 16.7.0-release-20200612-02 + 1.0.0-prerelease.20311.3 2.4.1 2.4.2 1.3.0 @@ -116,7 +116,7 @@ 3.1.0-preview-20200129.1 - 5.0.0-preview.3.20309.3 + 5.0.0-preview.3.20311.3 9.0.1-alpha.1.20308.1 9.0.1-alpha.1.20308.1 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index d780fefb541432..d6ec94b73e0616 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -8,8 +8,10 @@ usage() echo "BuildArch can be: arm(default), armel, arm64, x86" echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd11 or freebsd12." + echo " for illumos can be: illumos." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD" echo "--skipunmount - optional, will skip the unmount of rootfs folder." + echo "--use-mirror - optional, use mirror URL to fetch resources, when available." exit 1 } @@ -67,6 +69,13 @@ __FreeBSDPackages+=" libinotify" __FreeBSDPackages+=" lttng-ust" __FreeBSDPackages+=" krb5" +__IllumosPackages="icu-64.2nb2" +__IllumosPackages+=" mit-krb5-1.16.2nb4" +__IllumosPackages+=" openssl-1.1.1e" +__IllumosPackages+=" zlib-1.2.11" + +__UseMirror=0 + __UnprocessedBuildArgs= while :; do if [ $# -le 0 ]; then @@ -179,6 +188,11 @@ while :; do __BuildArch=x64 __SkipUnmount=1 ;; + illumos) + __CodeName=illumos + __BuildArch=x64 + __SkipUnmount=1 + ;; --skipunmount) __SkipUnmount=1 ;; @@ -186,6 +200,9 @@ while :; do shift __RootfsDir=$1 ;; + --use-mirror) + __UseMirror=1 + ;; *) __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" ;; @@ -214,6 +231,9 @@ if [ -d "$__RootfsDir" ]; then rm -rf $__RootfsDir fi +mkdir -p $__RootfsDir +__RootfsDir="$( cd "$__RootfsDir" && pwd )" + if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.9.1 __AlpineVersion=3.9 @@ -257,6 +277,51 @@ elif [[ "$__CodeName" == "freebsd" ]]; then # install packages we need. INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages +elif [[ "$__CodeName" == "illumos" ]]; then + mkdir "$__RootfsDir/tmp" + pushd "$__RootfsDir/tmp" + JOBS="$(getconf _NPROCESSORS_ONLN)" + echo "Downloading sysroot." + wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + echo "Building binutils. Please wait.." + wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + mkdir build-binutils && cd build-binutils + ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" + make -j "$JOBS" && make install && cd .. + echo "Building gcc. Please wait.." + wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + CFLAGS="-fPIC" + CXXFLAGS="-fPIC" + CXXFLAGS_FOR_TARGET="-fPIC" + CFLAGS_FOR_TARGET="-fPIC" + export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET + mkdir build-gcc && cd build-gcc + ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ + --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ + --disable-libquadmath-support --disable-shared --enable-tls + make -j "$JOBS" && make install && cd .. + BaseUrl=https://pkgsrc.joyent.com + if [[ "$__UseMirror" == 1 ]]; then + BaseUrl=http://pkgsrc.smartos.skylime.net + fi + BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/x86_64/All + echo "Downloading dependencies." + read -ra array <<<"$__IllumosPackages" + for package in "${array[@]}"; do + echo "Installing $package..." + wget "$BaseUrl"/"$package".tgz + ar -x "$package".tgz + tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null + done + echo "Cleaning up temporary files." + popd + rm -rf "$__RootfsDir"/{tmp,+*} + mkdir -p "$__RootfsDir"/usr/include/net + mkdir -p "$__RootfsDir"/usr/include/netpacket + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h + wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h + wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h elif [[ -n $__CodeName ]]; then qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list @@ -275,7 +340,7 @@ elif [[ -n $__CodeName ]]; then patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch popd fi -elif [ "$__Tizen" == "tizen" ]; then +elif [[ "$__Tizen" == "tizen" ]]; then ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh else echo "Unsupported target platform." diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 534f1d19de6f96..ec512d012a1c57 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -3,6 +3,9 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) +elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc) + set(CMAKE_SYSTEM_NAME SunOS) + set(ILLUMOS 1) else() set(CMAKE_SYSTEM_NAME Linux) endif() @@ -34,6 +37,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(triple "x86_64-unknown-freebsd11") +elseif (ILLUMOS) + set(CMAKE_SYSTEM_PROCESSOR "x86_64") + set(TOOLCHAIN "x86_64-illumos") else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!") endif() @@ -67,12 +73,43 @@ if("$ENV{__DistroRid}" MATCHES "android.*") # include official NDK toolchain script include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) -elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") # we cross-compile by instructing clang set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER_TARGET ${triple}) set(CMAKE_ASM_COMPILER_TARGET ${triple}) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") +elseif(ILLUMOS) + set(CMAKE_SYSROOT "${CROSS_ROOTFS}") + + include_directories(SYSTEM ${CROSS_ROOTFS}/include) + + set(TOOLSET_PREFIX ${TOOLCHAIN}-) + function(locate_toolchain_exec exec var) + string(TOUPPER ${exec} EXEC_UPPERCASE) + if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") + set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) + return() + endif() + + find_program(EXEC_LOCATION_${exec} + NAMES + "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" + "${TOOLSET_PREFIX}${exec}") + + if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") + message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") + endif() + set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) + endfunction() + + set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + + locate_toolchain_exec(gcc CMAKE_C_COMPILER) + locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) + + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") else() set(CMAKE_SYSROOT "${CROSS_ROOTFS}") @@ -92,11 +129,14 @@ if(TARGET_ARCH_NAME STREQUAL "armel") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") add_link_options(-m32) +elseif(ILLUMOS) + add_link_options("-L${CROSS_ROOTFS}/lib/amd64") + add_link_options("-L${CROSS_ROOTFS}/usr/amd64/lib") endif() # Specify compile options -if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") +if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) @@ -155,7 +195,6 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") endif() 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/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj index 47d3ba00f3f21f..3f7315b741fb18 100644 --- a/eng/common/performance/perfhelixpublish.proj +++ b/eng/common/performance/perfhelixpublish.proj @@ -152,6 +152,10 @@ $(WorkItemDirectory)\ScenarioCorrelation $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + $(WorkItemDirectory)\ScenarioCorrelation + $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + \ No newline at end of file diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index cc9d059d04f3d1..cdd1bba4f2d6fe 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -196,6 +196,8 @@ function ValidateSourceLinkLinks { Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue } + $ValidationFailures = 0 + # Process each NuGet package in parallel Get-ChildItem "$InputPath\*.symbols.nupkg" | ForEach-Object { @@ -209,17 +211,20 @@ function ValidateSourceLinkLinks { } foreach ($Job in @(Get-Job -State 'Completed')) { - Receive-Job -Id $Job.Id + $jobResult = Receive-Job -Id $Job.Id + if ($jobResult -ne '0') { + $ValidationFailures++ + } Remove-Job -Id $Job.Id } } - $ValidationFailures = 0 foreach ($Job in @(Get-Job)) { $jobResult = Wait-Job -Id $Job.Id | Receive-Job if ($jobResult -ne '0') { $ValidationFailures++ } + Remove-Job -Id $Job.Id } if ($ValidationFailures -gt 0) { Write-PipelineTelemetryError -Category 'SourceLink' -Message "$ValidationFailures package(s) failed validation." diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index e108bf6c5f6895..bf7c15e79de1d7 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -189,7 +189,11 @@ function CheckSymbolsAvailable { } foreach ($Job in @(Get-Job -State 'Completed')) { - Receive-Job -Id $Job.Id + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + if ($jobResult -ne '0') { + $TotalFailures++ + } + Remove-Job -Id $Job.Id } Write-Host } diff --git a/global.json b/global.json index 27a399e5f66ccc..d47df871cf2711 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20308.5", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20280.1", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20280.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20280.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20309.1", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20309.1", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20309.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20309.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18", "Microsoft.Build.NoTargets": "1.0.53",