From fbbe7817258ac01787543a83505e8766d460bee1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 13:08:23 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20230227.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23123.2 -> To Version 8.0.0-beta.23127.1 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e688f35afc0e..ee4abee3033dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,73 +100,73 @@ - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 https://github.com/dotnet/runtime-assets @@ -296,9 +296,9 @@ https://github.com/dotnet/xharness 8d789cbeecb6c89bf470fdc7727a8f501724fc8a - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4c349fc88b82e..03938143dacac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 2.5.1-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 - 8.0.0-beta.23123.2 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 2.5.1-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 + 8.0.0-beta.23127.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 70bdc0cfb8fdc..75247f52dc30a 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.1.23115.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23123.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23123.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23127.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23127.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23127.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-preview.2.23112.4" From 7a106fe6a429120ee9806a1c0ac85bea5d6bb8e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Mar 2023 13:09:15 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20230228.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23123.2 -> To Version 8.0.0-beta.23128.1 --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 30 ++++---- .../templates/job/source-index-stage1.yml | 2 +- global.json | 6 +- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee4abee3033dd..10087af101131 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,73 +100,73 @@ - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 https://github.com/dotnet/runtime-assets @@ -296,9 +296,9 @@ https://github.com/dotnet/xharness 8d789cbeecb6c89bf470fdc7727a8f501724fc8a - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 03938143dacac..ace9d8b635ab1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 2.5.1-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 - 8.0.0-beta.23127.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 2.5.1-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 + 8.0.0-beta.23128.1 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 71b66aeb8a5c5..b98202aa02d82 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20221220.2 + sourceIndexPackageVersion: 1.0.1-20230228.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/global.json b/global.json index 75247f52dc30a..2608008d0f663 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.1.23115.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23127.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23127.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23127.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23128.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23128.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23128.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-preview.2.23112.4" From 48c3815df0c05807969f32cb1968c9ca664c11cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Mar 2023 13:08:52 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20230301.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23123.2 -> To Version 8.0.0-beta.23151.4 --- eng/Version.Details.xml | 72 ++++++++++++------------ eng/Versions.props | 30 +++++----- eng/common/cross/build-rootfs.sh | 95 ++++++++++++++++---------------- global.json | 6 +- 4 files changed, 101 insertions(+), 102 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10087af101131..b87635c743561 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,73 +100,73 @@ - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b https://github.com/dotnet/runtime-assets @@ -296,9 +296,9 @@ https://github.com/dotnet/xharness 8d789cbeecb6c89bf470fdc7727a8f501724fc8a - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ace9d8b635ab1..4832371e7904e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 2.5.1-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 - 8.0.0-beta.23128.1 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 2.5.1-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 + 8.0.0-beta.23151.4 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index f027af7597872..ff113f7335329 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -55,7 +55,7 @@ __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" -__AlpinePackages+=" compiler-rt-static" +__AlpinePackages+=" compiler-rt" __AlpinePackages+=" numactl-dev" # runtime libraries' dependencies @@ -150,7 +150,6 @@ while :; do __BuildArch=riscv64 __AlpineArch=riscv64 __AlpinePackages="${__AlpinePackages// lldb-dev/}" - __AlpinePackages="${__AlpinePackages// compiler-rt-static/}" __QEMUArch=riscv64 __UbuntuArch=riscv64 __UbuntuRepo="http://deb.debian.org/debian-ports" @@ -160,10 +159,6 @@ while :; do if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" fi - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - fi ;; ppc64le) __BuildArch=ppc64le @@ -175,10 +170,6 @@ while :; do __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - fi ;; s390x) __BuildArch=s390x @@ -190,10 +181,6 @@ while :; do __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - fi ;; x64) __BuildArch=x64 @@ -206,6 +193,7 @@ while :; do x86) __BuildArch=x86 __UbuntuArch=i386 + __AlpineArch=x86 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; lldb*) @@ -311,29 +299,8 @@ while :; do parts=(${version//./ }) __AlpineMajorVersion="${parts[0]}" __AlpineMinoVersion="${parts[1]}" - - if [[ -z "$__AlpineVersion" ]]; then - __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" - fi + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" fi - - case "$__AlpineVersion" in - 3.14) __AlpinePackages+=" llvm11-libs" ;; - 3.15) __AlpinePackages+=" llvm12-libs" ;; - 3.16) __AlpinePackages+=" llvm13-libs" ;; - 3.17) __AlpinePackages+=" llvm15-libs" ;; - edge) __AlpineLlvmLibsLookup=1 ;; - *) - if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - __AlpinePackages+=" llvm12-libs" - elif [[ "$__AlpineArch" == "riscv64" ]]; then - __AlpineLlvmLibsLookup=1 - __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - else - __AlpineVersion=3.13 # 3.13 to maximize compatibility - fi - esac ;; freebsd12) __CodeName=freebsd @@ -376,10 +343,41 @@ while :; do shift done +case "$__AlpineVersion" in + 3.14) __AlpinePackages+=" llvm11-libs" ;; + 3.15) __AlpinePackages+=" llvm12-libs" ;; + 3.16) __AlpinePackages+=" llvm13-libs" ;; + 3.17) __AlpinePackages+=" llvm15-libs" ;; + edge) __AlpineLlvmLibsLookup=1 ;; + *) + if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then + echo boo + __AlpineVersion=3.15 # minimum version that supports lldb-dev + __AlpinePackages+=" llvm12-libs" + elif [[ "$__AlpineArch" == "x86" ]]; then + __AlpineVersion=3.17 # minimum version that supports lldb-dev + __AlpinePackages+=" llvm15-libs" + elif [[ "$__AlpineArch" == "riscv64" ]]; then + __AlpineLlvmLibsLookup=1 + __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + else + __AlpineVersion=3.13 # 3.13 to maximize compatibility + __AlpinePackages+=" llvm10-libs" + + if [[ "$__AlpineArch" == "armv7" ]]; then + __AlpinePackages="${__AlpinePackages//numactl-dev/}" + fi + fi +esac + +if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then + # compiler-rt--static was merged in compiler-rt package in alpine 3.16 + # for older versions, we need compiler-rt--static, so replace the name + __AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}" +fi + if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" -elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then - __AlpinePackages="${__AlpinePackages//numactl-dev/}" fi __UbuntuPackages+=" ${__LLDB_Package:-}" @@ -422,26 +420,27 @@ if [[ "$__CodeName" == "alpine" ]]; then version="v$__AlpineVersion" fi + # initialize DB "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ - add $__AlpinePackages + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then - "$__ApkToolsDir/apk.static" \ + __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do - "$__ApkToolsDir/apk.static" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ - add "$name-libs" - done + search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" fi + # install all packages in one go + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + add $__AlpinePackages + rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc diff --git a/global.json b/global.json index 2608008d0f663..8b12c3b2d8d43 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.1.23115.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23128.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23128.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23128.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23151.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23151.4", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23151.4", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-preview.2.23112.4" From 4186acd32563cdbc12b8d2df0596c98e79907b23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 13:08:39 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20230302.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23123.2 -> To Version 8.0.0-beta.23152.1 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b87635c743561..bc038fc1c473b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,73 +100,73 @@ - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 https://github.com/dotnet/runtime-assets @@ -296,9 +296,9 @@ https://github.com/dotnet/xharness 8d789cbeecb6c89bf470fdc7727a8f501724fc8a - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4832371e7904e..09258e0ef8c60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 2.5.1-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 - 8.0.0-beta.23151.4 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 2.5.1-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 + 8.0.0-beta.23152.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 8b12c3b2d8d43..5e2a5d149433e 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.1.23115.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23151.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23151.4", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23151.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23152.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23152.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23152.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-preview.2.23112.4"