From 6cfbbef6e2bba3f94da0926f55afe3293bfaab04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 22:00:56 +0100 Subject: [PATCH] [master] Update dependencies from dotnet/arcade mono/linker Microsoft/vstest (#1804) * Update dependencies from https://github.com/dotnet/arcade build 20200115.5 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20065.5 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20065.5 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20065.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20065.5 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20065.5 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20065.5 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20065.5 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20065.5 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20065.5 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20065.5 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20065.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20065.5 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20065.5 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20065.5 * Update dependencies from https://github.com/dotnet/arcade build 20200116.1 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20066.1 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20066.1 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20066.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20066.1 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20066.1 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20066.1 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20066.1 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20066.1 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20066.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20066.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20066.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20066.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20066.1 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20066.1 * Update dependencies from https://github.com/microsoft/vstest build 20200116-01 - Microsoft.NET.Test.Sdk - 16.5.0-preview-20200116-01 * Update dependencies from https://github.com/dotnet/arcade build 20200117.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20067.2 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20067.2 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20067.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20067.2 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20067.2 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20067.2 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20067.2 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20067.2 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20067.2 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20067.2 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20067.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20067.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20067.2 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20067.2 * Update dependencies from https://github.com/dotnet/arcade build 20200118.1 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20068.1 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20068.1 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20068.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20068.1 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20068.1 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20068.1 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20068.1 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20068.1 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20068.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20068.1 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20068.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20068.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20068.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20068.1 * Update dependencies from https://github.com/microsoft/vstest build 20200120-01 - Microsoft.NET.Test.Sdk - 16.5.0-preview-20200120-01 * Update dependencies from https://github.com/dotnet/arcade build 20200121.3 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20071.3 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20071.3 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20071.3 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20071.3 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20071.3 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20071.3 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20071.3 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20071.3 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20071.3 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20071.3 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20071.3 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20071.3 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20071.3 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20071.3 --- eng/Version.Details.xml | 60 ++++++++++++++++---------------- eng/Versions.props | 22 ++++++------ eng/common/cross/build-rootfs.sh | 19 +++++++--- global.json | 8 ++--- 4 files changed, 60 insertions(+), 49 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04b91797c20..2d30271da0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,61 +46,61 @@ - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 - + https://github.com/dotnet/arcade - be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740 + e06e2807048b6bc7b3549b401a1833bed3bcd8c3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -114,9 +114,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d0bb63d2ec7060714e63ee4082fac48f2e57f3e2 - + https://github.com/microsoft/vstest - 8d0cd143dade719166811ecc21d4ed3d0b2d0ba6 + 51a2b03cadbcf0753d7be5b0e42f69828250280f https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index a7236af4e4b..a7068e5c450 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,16 +32,16 @@ - 5.0.0-beta.20063.2 - 5.0.0-beta.20063.2 - 5.0.0-beta.20063.2 - 5.0.0-beta.20063.2 - 5.0.0-beta.20063.2 - 5.0.0-beta.20063.2 - 2.5.1-beta.20063.2 - 5.0.0-beta.20063.2 - 5.0.0-beta.20063.2 - 5.0.0-beta.20063.2 + 5.0.0-beta.20071.3 + 5.0.0-beta.20071.3 + 5.0.0-beta.20071.3 + 5.0.0-beta.20071.3 + 5.0.0-beta.20071.3 + 5.0.0-beta.20071.3 + 2.5.1-beta.20071.3 + 5.0.0-beta.20071.3 + 5.0.0-beta.20071.3 + 5.0.0-beta.20071.3 5.0.0-alpha.1.19562.8 5.0.0-alpha.1.19563.6 @@ -86,7 +86,7 @@ 4.4.0 - 16.5.0-preview-20200113-03 + 16.5.0-preview-20200120-01 2.4.1 2.0.5 12.0.3 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 8d61377a871..a23f895ba1c 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -25,8 +25,9 @@ __UbuntuPackages="build-essential" __AlpinePackages="alpine-base" __AlpinePackages+=" build-base" __AlpinePackages+=" linux-headers" -__AlpinePackages+=" lldb-dev" -__AlpinePackages+=" llvm-dev" +__AlpinePackagesEdgeTesting=" lldb-dev" +__AlpinePackagesEdgeMain=" llvm9-libs" +__AlpinePackagesEdgeMain+=" python3" # symlinks fixer __UbuntuPackages+=" symlinks" @@ -199,13 +200,23 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir mkdir -p $__RootfsDir/usr/bin cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin + $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \ -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \ - -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ add $__AlpinePackages + + $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ + -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ + add $__AlpinePackagesEdgeMain + + $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ + add $__AlpinePackagesEdgeTesting + rm -r $__ApkToolsDir elif [[ -n $__LinuxCodeName ]]; then qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo diff --git a/global.json b/global.json index 326ac6d7b4f..bd6505846e3 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20063.2", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20063.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20063.2", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20063.2", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20071.3", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20071.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20071.3", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20071.3", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3", "Microsoft.Build.NoTargets": "1.0.53", -- GitLab