diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c0f44982fbec..176dba9fe1704 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,86 +1,86 @@ - + https://github.com/dotnet/icu - 662f7844f6abda0f24549679894d825c8cc247c2 + 5263e5a05ff3f9ba6cb061a97be83f5d8ad276be https://github.com/dotnet/msquic deb3a26c20315aa4c659079071b821e5d5230242 - + https://github.com/dotnet/emsdk - a4b73e3e43d8a23a467016f1ffb22ab4821da774 + ed9e9cb80e2f31ad23939f7065e766c130527f65 - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 7a04201a936a34bb070145302fa3f0af2a018508 + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c https://github.com/microsoft/vstest @@ -122,69 +122,69 @@ https://github.com/dotnet/runtime-assets 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 - + https://github.com/dotnet/llvm-project - 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc + 30296e71234ffb3eb8da789d36adf4db146e6602 https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - d90f6b6c86be7001dc839e147ab229dfd1c7d20d + 85441ce69b81dfd5bf57b9d00ba525440b7bb25d - + https://github.com/dotnet/runtime - d90f6b6c86be7001dc839e147ab229dfd1c7d20d + 85441ce69b81dfd5bf57b9d00ba525440b7bb25d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + 85441ce69b81dfd5bf57b9d00ba525440b7bb25d - + https://github.com/dotnet/runtime - d90f6b6c86be7001dc839e147ab229dfd1c7d20d + 85441ce69b81dfd5bf57b9d00ba525440b7bb25d - + https://github.com/dotnet/runtime - d90f6b6c86be7001dc839e147ab229dfd1c7d20d + 85441ce69b81dfd5bf57b9d00ba525440b7bb25d - + https://github.com/dotnet/runtime - d90f6b6c86be7001dc839e147ab229dfd1c7d20d + 85441ce69b81dfd5bf57b9d00ba525440b7bb25d - + https://github.com/dotnet/runtime - d90f6b6c86be7001dc839e147ab229dfd1c7d20d + 85441ce69b81dfd5bf57b9d00ba525440b7bb25d https://github.com/mono/linker @@ -198,37 +198,37 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab + 382667fff0b58c362855a42c3529ba294fd0514c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 60bf5650ba15cc46cec560bcee2bd45080873176 + 6d0a8be450504941a8e02f661c55bd14d67f791b - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 60bf5650ba15cc46cec560bcee2bd45080873176 + 6d0a8be450504941a8e02f661c55bd14d67f791b - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 60bf5650ba15cc46cec560bcee2bd45080873176 + 6d0a8be450504941a8e02f661c55bd14d67f791b - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 60bf5650ba15cc46cec560bcee2bd45080873176 + 6d0a8be450504941a8e02f661c55bd14d67f791b https://github.com/dotnet/hotreload-utils - 187d28ec14993a75eb7d2a72fc12f336efafe138 + 9b89820c3ec6d23f18c76c7420adcf324f90ee33 https://github.com/dotnet/runtime-assets 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/roslyn-analyzers - 92cc1339befaae2508da6480dcc7b29ebb1d5f67 + 6e158d2fd062bb5dbd6d4b0b55b8a027ab5f88ee diff --git a/eng/Versions.props b/eng/Versions.props index 8f33bb72f730c..77a2b7cc4d3a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,29 +54,29 @@ 1.0.0-rc.1.21404.21 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 2.5.1-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 - 6.0.0-beta.21405.3 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 2.5.1-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 6.0.0-preview.1.102 6.0.0-alpha.1.20612.4 - 6.0.0-rc.1.21401.3 - 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21411.3 + 6.0.0-rc.1.21411.3 3.1.0 - 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21411.3 5.0.0 4.3.0 @@ -110,11 +110,11 @@ 5.0.0 5.0.0 4.8.1 - 6.0.0-rc.1.21401.3 - 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21411.3 + 6.0.0-rc.1.21411.3 4.5.4 4.5.0 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21411.3 6.0.0-beta.21405.1 6.0.0-beta.21405.1 @@ -127,10 +127,10 @@ 6.0.0-beta.21405.1 6.0.0-beta.21405.1 - 1.0.0-prerelease.21379.4 - 1.0.0-prerelease.21379.4 - 1.0.0-prerelease.21379.4 - 1.0.0-prerelease.21379.4 + 1.0.0-prerelease.21410.2 + 1.0.0-prerelease.21410.2 + 1.0.0-prerelease.21410.2 + 1.0.0-prerelease.21410.2 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -171,20 +171,20 @@ 6.0.100-preview.6.21409.3 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rc.1.21402.1 + 6.0.0-rc.1.21410.2 6.0.0-preview.7.21379.5 - 11.1.0-alpha.1.21402.1 - 11.1.0-alpha.1.21402.1 - 11.1.0-alpha.1.21402.1 - 11.1.0-alpha.1.21402.1 - 11.1.0-alpha.1.21402.1 - 11.1.0-alpha.1.21402.1 - 11.1.0-alpha.1.21402.1 - 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21409.1 - 6.0.0-rc.1.21378.1 + 6.0.0-rc.1.21409.2 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda diff --git a/eng/common/cross/arm/sources.list.trusty b/eng/common/cross/arm/sources.list.trusty deleted file mode 100644 index 07d8f88d82e87..0000000000000 --- a/eng/common/cross/arm/sources.list.trusty +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file diff --git a/eng/common/cross/arm/trusty-lttng-2.4.patch b/eng/common/cross/arm/trusty-lttng-2.4.patch deleted file mode 100644 index 8e4dd7ae7191a..0000000000000 --- a/eng/common/cross/arm/trusty-lttng-2.4.patch +++ /dev/null @@ -1,71 +0,0 @@ -From e72c9d7ead60e3317bd6d1fade995c07021c947b Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 7 May 2015 13:25:04 -0400 -Subject: [PATCH] Fix: building probe providers with C++ compiler - -Robert Daniels wrote: -> > I'm attempting to use lttng userspace tracing with a C++ application -> > on an ARM platform. I'm using GCC 4.8.4 on Linux 3.14 with the 2.6 -> > release of lttng. I've compiled lttng-modules, lttng-ust, and -> > lttng-tools and have been able to get a simple test working with C -> > code. When I attempt to run the hello.cxx test on my target it will -> > segfault. -> -> -> I spent a little time digging into this issue and finally discovered the -> cause of my segfault with ARM C++ tracepoints. -> -> There is a struct called 'lttng_event' in ust-events.h which contains an -> empty union 'u'. This was the cause of my issue. Under C, this empty union -> compiles to a zero byte member while under C++ it compiles to a one byte -> member, and in my case was four-byte aligned which caused my C++ code to -> have the 'cds_list_head node' offset incorrectly by four bytes. This lead -> to an incorrect linked list structure which caused my issue. -> -> Since this union is empty, I simply removed it from the struct and everything -> worked correctly. -> -> I don't know the history or purpose behind this empty union so I'd like to -> know if this is a safe fix. If it is I can submit a patch with the union -> removed. - -That's a very nice catch! - -We do not support building tracepoint probe provider with -g++ yet, as stated in lttng-ust(3): - -"- Note for C++ support: although an application instrumented with - tracepoints can be compiled with g++, tracepoint probes should be - compiled with gcc (only tested with gcc so far)." - -However, if it works fine with this fix, then I'm tempted to take it, -especially because removing the empty union does not appear to affect -the layout of struct lttng_event as seen from liblttng-ust, which must -be compiled with a C compiler, and from probe providers compiled with -a C compiler. So all we are changing is the layout of a probe provider -compiled with a C++ compiler, which is anyway buggy at the moment, -because it is not compatible with the layout expected by liblttng-ust -compiled with a C compiler. - -Reported-by: Robert Daniels -Signed-off-by: Mathieu Desnoyers ---- - include/lttng/ust-events.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/usr/include/lttng/ust-events.h b/usr/include/lttng/ust-events.h -index 328a875..3d7a274 100644 ---- a/usr/include/lttng/ust-events.h -+++ b/usr/include/lttng/ust-events.h -@@ -407,8 +407,6 @@ struct lttng_event { - void *_deprecated1; - struct lttng_ctx *ctx; - enum lttng_ust_instrumentation instrumentation; -- union { -- } u; - struct cds_list_head node; /* Event list in session */ - struct cds_list_head _deprecated2; - void *_deprecated3; --- -2.7.4 - diff --git a/eng/common/cross/arm/trusty.patch b/eng/common/cross/arm/trusty.patch deleted file mode 100644 index 2f2972f8eb590..0000000000000 --- a/eng/common/cross/arm/trusty.patch +++ /dev/null @@ -1,97 +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-03-28 06:04:42.000000000 +0900 -+++ b/usr/include/urcu/uatomic/generic.h 2017-02-13 10:35:21.189927116 +0900 -@@ -65,17 +65,17 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- return __sync_val_compare_and_swap_1(addr, old, _new); -+ return __sync_val_compare_and_swap_1((uint8_t *) addr, old, _new); - #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); -+ return __sync_val_compare_and_swap_8((uint64_t *) addr, old, _new); - #endif - } - _uatomic_link_error(); -@@ -100,20 +100,20 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- __sync_and_and_fetch_1(addr, val); -+ __sync_and_and_fetch_1((uint8_t *) addr, val); - return; - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- __sync_and_and_fetch_2(addr, val); -+ __sync_and_and_fetch_2((uint16_t *) addr, val); - 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: -- __sync_and_and_fetch_8(addr, val); -+ __sync_and_and_fetch_8((uint64_t *) addr, val); - return; - #endif - } -@@ -139,20 +139,20 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- __sync_or_and_fetch_1(addr, val); -+ __sync_or_and_fetch_1((uint8_t *) addr, val); - return; - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- __sync_or_and_fetch_2(addr, val); -+ __sync_or_and_fetch_2((uint16_t *) addr, val); - 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: -- __sync_or_and_fetch_8(addr, val); -+ __sync_or_and_fetch_8((uint64_t *) addr, val); - return; - #endif - } -@@ -180,17 +180,17 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- return __sync_add_and_fetch_1(addr, val); -+ return __sync_add_and_fetch_1((uint8_t *) addr, val); - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- return __sync_add_and_fetch_2(addr, val); -+ return __sync_add_and_fetch_2((uint16_t *) 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); -+ return __sync_add_and_fetch_8((uint64_t *) addr, val); - #endif - } - _uatomic_link_error(); diff --git a/eng/common/cross/arm64/sources.list.trusty b/eng/common/cross/arm64/sources.list.trusty deleted file mode 100644 index 07d8f88d82e87..0000000000000 --- a/eng/common/cross/arm64/sources.list.trusty +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 59714ff5c3473..5c05b39f10197 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -6,7 +6,7 @@ usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" - echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." + echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd11, freebsd12, freebsd13" 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" @@ -146,11 +146,6 @@ while :; do no-lldb) unset __LLDB_Package ;; - trusty) # Ubuntu 14.04 - if [ "$__CodeName" != "jessie" ]; then - __CodeName=trusty - fi - ;; xenial) # Ubuntu 16.04 if [ "$__CodeName" != "jessie" ]; then __CodeName=xenial @@ -223,7 +218,7 @@ while :; do __FreeBSDABI="13" __BuildArch=x64 __SkipUnmount=1 - ;; + ;; illumos) __CodeName=illumos __BuildArch=x64 @@ -374,13 +369,6 @@ elif [[ -n $__CodeName ]]; then umount $__RootfsDir/* || true fi - if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then - pushd $__RootfsDir - patch -p1 < $__CrossDir/$__BuildArch/trusty.patch - patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch - popd - fi - if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then pushd $__RootfsDir patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch diff --git a/eng/common/cross/x86/sources.list.trusty b/eng/common/cross/x86/sources.list.trusty deleted file mode 100644 index 9b3085436e9a9..0000000000000 --- a/eng/common/cross/x86/sources.list.trusty +++ /dev/null @@ -1,11 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ trusty main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 2f333ccf5edf7..fe9dfdf720cf8 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -94,7 +94,7 @@ jobs: PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' PublishLocation: Container ArtifactName: ReleaseConfigs - + - task: powershell@2 displayName: Check if SymbolPublishingExclusionsFile.txt exists inputs: @@ -108,16 +108,17 @@ jobs: } else{ Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" } - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs - condition: (variables['SymbolExclusionFile'], 'true') - + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 705b7a1c847b9..ba40dc82f1411 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -18,6 +18,35 @@ steps: set -x df -h + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + $internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + fi + buildConfig=Release # Check if AzDO substitutes in a build config from a variable, and use it if so. if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then @@ -29,11 +58,6 @@ steps: officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' fi - internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' - fi - targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' @@ -49,6 +73,7 @@ steps: --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true diff --git a/global.json b/global.json index f7494b88c3036..ce35288f8268c 100644 --- a/global.json +++ b/global.json @@ -12,12 +12,12 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21405.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21405.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21407.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21405.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21406.6", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21406.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21406.6", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21406.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21401.3" + "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21411.3" } } diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj index 875277b02d31a..c70bc3417862e 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj @@ -5,6 +5,7 @@ InProcess Exe false + false diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj b/src/libraries/Common/tests/System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj index ba8a85a059c54..cdd05460ce759 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj +++ b/src/libraries/Common/tests/System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj @@ -4,6 +4,7 @@ $(AspNetCoreAppCurrent) InProcess Exe + false diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj index 80b4aa21b108b..1ab48e1af51f3 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj @@ -5,6 +5,7 @@ net6.0 preview enable + false diff --git a/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj b/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj index 66d0b287f7655..0859f141b97ac 100644 --- a/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj +++ b/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj @@ -1,6 +1,7 @@ + false $(AspNetCoreAppCurrent) true $(NoWarn),CA2007