From 2eecce9a5a2913a064d287aa7fcd8290784f461e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 13:32:43 +0000 Subject: [PATCH 01/20] Update dependencies from https://github.com/dotnet/arcade build 20230207.1 (#1536) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40665ec2..ab0f115a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + b31c4466a49800c2f019690e81182c7ffd584dda - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + b31c4466a49800c2f019690e81182c7ffd584dda - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + b31c4466a49800c2f019690e81182c7ffd584dda - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + b31c4466a49800c2f019690e81182c7ffd584dda - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + b31c4466a49800c2f019690e81182c7ffd584dda https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 092cdd5e..efbfc77b 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23106.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23107.1" } } From 72593d96e9f8b089ea4c460df962db386bd44ebd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 13:27:40 +0000 Subject: [PATCH 02/20] Update dependencies from https://github.com/dotnet/arcade build 20230209.5 (#1537) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/init-tools-native.ps1 | 9 +++------ eng/common/templates/job/job.yml | 6 +++--- global.json | 2 +- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab0f115a..d945c815 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 https://github.com/dotnet/arcade-services diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index fbc67eff..27ccdb9e 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -83,7 +83,8 @@ try { Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { if ($PathPromotion -eq $True) { - if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" + if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value @@ -93,11 +94,6 @@ try { if ($ToolVersion -eq "latest") { $ToolVersion = "" } - $ArcadeToolsDirectory = "C:\arcade-tools" - if (-not (Test-Path $ArcadeToolsDirectory)) { - Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." - exit 1 - } $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) if ($ToolDirectories -eq $null) { Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." @@ -125,6 +121,7 @@ try { if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." } } exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index f0af425d..61914a1f 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,7 +134,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 inputs: buildType: current @@ -171,7 +171,7 @@ jobs: TeamName: $(_TeamName) - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - task: CopyFiles@2 displayName: Gather binaries for publish to artifacts inputs: @@ -192,7 +192,7 @@ jobs: ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() - - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - publish: artifacts/log artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} displayName: Publish logs diff --git a/global.json b/global.json index efbfc77b..24176c7b 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23107.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23109.5" } } From 5b070d55ead4a8cacd58a4f0dfffadffce2fa5b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:29:06 +0000 Subject: [PATCH 03/20] Update dependencies from https://github.com/dotnet/arcade build 20230210.3 (#1538) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d945c815..dc77b763 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - b888df17a4acb65630c1e9ad5e94f22a33b62ab0 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 - + https://github.com/dotnet/arcade - b888df17a4acb65630c1e9ad5e94f22a33b62ab0 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 - + https://github.com/dotnet/arcade - b888df17a4acb65630c1e9ad5e94f22a33b62ab0 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 - + https://github.com/dotnet/arcade - b888df17a4acb65630c1e9ad5e94f22a33b62ab0 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 - + https://github.com/dotnet/arcade - b888df17a4acb65630c1e9ad5e94f22a33b62ab0 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 24176c7b..93722284 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23109.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3" } } From 0a1035aa58e3d7b3985001ef523d47068b6eff30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:35:52 +0000 Subject: [PATCH 04/20] Update dependencies from https://github.com/dotnet/arcade build 20230213.1 (#1539) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc77b763..41f5ff89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 96d8be74c39a4765ec919ff9bebf9e0c875fc195 + 7b0fb0ad52d106185432b8437b9defefa1cca9d4 - + https://github.com/dotnet/arcade - 96d8be74c39a4765ec919ff9bebf9e0c875fc195 + 7b0fb0ad52d106185432b8437b9defefa1cca9d4 - + https://github.com/dotnet/arcade - 96d8be74c39a4765ec919ff9bebf9e0c875fc195 + 7b0fb0ad52d106185432b8437b9defefa1cca9d4 - + https://github.com/dotnet/arcade - 96d8be74c39a4765ec919ff9bebf9e0c875fc195 + 7b0fb0ad52d106185432b8437b9defefa1cca9d4 - + https://github.com/dotnet/arcade - 96d8be74c39a4765ec919ff9bebf9e0c875fc195 + 7b0fb0ad52d106185432b8437b9defefa1cca9d4 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 93722284..404be224 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23113.1" } } From 5236452584f4bf9d143c633599968f8962c0894d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:28:53 +0000 Subject: [PATCH 05/20] Update dependencies from https://github.com/dotnet/arcade build 20230215.1 (#1540) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41f5ff89..df7fb193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 7b0fb0ad52d106185432b8437b9defefa1cca9d4 + 83284ab08840fe5f429ecd9fa935e81527023553 - + https://github.com/dotnet/arcade - 7b0fb0ad52d106185432b8437b9defefa1cca9d4 + 83284ab08840fe5f429ecd9fa935e81527023553 - + https://github.com/dotnet/arcade - 7b0fb0ad52d106185432b8437b9defefa1cca9d4 + 83284ab08840fe5f429ecd9fa935e81527023553 - + https://github.com/dotnet/arcade - 7b0fb0ad52d106185432b8437b9defefa1cca9d4 + 83284ab08840fe5f429ecd9fa935e81527023553 - + https://github.com/dotnet/arcade - 7b0fb0ad52d106185432b8437b9defefa1cca9d4 + 83284ab08840fe5f429ecd9fa935e81527023553 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 404be224..b6d42a32 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23113.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23115.1" } } From 99845449913c82160dd0948dae64328785233351 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Feb 2023 13:29:41 +0000 Subject: [PATCH 06/20] Update dependencies from https://github.com/dotnet/arcade build 20230217.2 (#1541) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/generate-locproject.ps1 | 9 +++++++-- global.json | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df7fb193..dd8e59f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 83284ab08840fe5f429ecd9fa935e81527023553 + 53902aeb8989149b43592475fbb143b6bfe5297f - + https://github.com/dotnet/arcade - 83284ab08840fe5f429ecd9fa935e81527023553 + 53902aeb8989149b43592475fbb143b6bfe5297f - + https://github.com/dotnet/arcade - 83284ab08840fe5f429ecd9fa935e81527023553 + 53902aeb8989149b43592475fbb143b6bfe5297f - + https://github.com/dotnet/arcade - 83284ab08840fe5f429ecd9fa935e81527023553 + 53902aeb8989149b43592475fbb143b6bfe5297f - + https://github.com/dotnet/arcade - 83284ab08840fe5f429ecd9fa935e81527023553 + 53902aeb8989149b43592475fbb143b6bfe5297f https://github.com/dotnet/arcade-services diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bcb579e3..524aaa57 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -45,7 +45,7 @@ if (-not $wxlFiles) { } } -$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files $macosHtmlFiles = @() if ($macosHtmlEnFiles) { $macosHtmlEnFiles | ForEach-Object { @@ -148,12 +148,17 @@ $locJson = @{ } } $sourceFile = ($_.FullName | Resolve-Path -Relative) + $lciFile = $sourceFile + ".lci" if ($continue) { - return @{ + $result = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath } + if (Test-Path $lciFile -PathType Leaf) { + $result["LciFile"] = $lciFile + } + return $result } } ) diff --git a/global.json b/global.json index b6d42a32..7ea2f475 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23115.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23117.2" } } From db228943f2cf5154e4012954f34cb5e51c409ea5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 19 Feb 2023 13:29:33 +0000 Subject: [PATCH 07/20] Update dependencies from https://github.com/dotnet/arcade build 20230218.1 (#1542) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd8e59f3..596bb2b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 53902aeb8989149b43592475fbb143b6bfe5297f + 38d3196e1596eb525367ec8d65fcc1f30a58261c - + https://github.com/dotnet/arcade - 53902aeb8989149b43592475fbb143b6bfe5297f + 38d3196e1596eb525367ec8d65fcc1f30a58261c - + https://github.com/dotnet/arcade - 53902aeb8989149b43592475fbb143b6bfe5297f + 38d3196e1596eb525367ec8d65fcc1f30a58261c - + https://github.com/dotnet/arcade - 53902aeb8989149b43592475fbb143b6bfe5297f + 38d3196e1596eb525367ec8d65fcc1f30a58261c - + https://github.com/dotnet/arcade - 53902aeb8989149b43592475fbb143b6bfe5297f + 38d3196e1596eb525367ec8d65fcc1f30a58261c https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 7ea2f475..4f47cbfb 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23117.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23118.1" } } From dbcc9c3c1fc41fb9cdb751069bca59b2c3c51315 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 13:33:13 +0000 Subject: [PATCH 08/20] Update dependencies from https://github.com/dotnet/arcade build 20230220.1 (#1543) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++--- eng/common/cross/build-rootfs.sh | 135 ++++++++++++++++++++++++------- global.json | 2 +- 3 files changed, 115 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 596bb2b5..8119945f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 38d3196e1596eb525367ec8d65fcc1f30a58261c + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 38d3196e1596eb525367ec8d65fcc1f30a58261c + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 38d3196e1596eb525367ec8d65fcc1f30a58261c + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 38d3196e1596eb525367ec8d65fcc1f30a58261c + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 38d3196e1596eb525367ec8d65fcc1f30a58261c + c4a85adbff520f62bfade7a6132f471506c3d35a https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 1ebf454f..ffaa88eb 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -6,10 +6,11 @@ usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" - echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo " for FreeBSD can be: freebsd12, freebsd13" - echo " for illumos can be: illumos" - echo " for Haiku can be: haiku." + echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" + echo " for alpine can be specified with version: alpineX.YY or alpineedge" + echo " for FreeBSD can be: freebsd12, freebsd13" + echo " for illumos can be: illumos" + echo " for Haiku can be: haiku." 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 "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." @@ -145,35 +146,54 @@ while :; do __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" fi ;; - ppc64le) - __BuildArch=ppc64le - __UbuntuArch=ppc64el - __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" - __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" - __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" - __UbuntuPackages="${__UbuntuPackages// libomp5/}" - unset __LLDB_Package - ;; riscv64) __BuildArch=riscv64 + __AlpineArch=riscv64 + __AlpinePackages="${__AlpinePackages// lldb-dev/}" + __AlpinePackages="${__AlpinePackages// compiler-rt-static/}" + __QEMUArch=riscv64 __UbuntuArch=riscv64 __UbuntuRepo="http://deb.debian.org/debian-ports" - __CodeName=sid __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package 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 + __AlpineArch=ppc64le + __QEMUArch=ppc64le + __UbuntuArch=ppc64el + __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" + __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" + __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 + __AlpineArch=s390x + __QEMUArch=s390x __UbuntuArch=s390x __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" __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 @@ -252,22 +272,53 @@ while :; do __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" ;; + bullseye) # Debian 11 + __CodeName=bullseye + __UbuntuRepo="http://ftp.debian.org/debian/" + ;; + sid) # Debian sid + __CodeName=sid + __UbuntuRepo="http://ftp.debian.org/debian/" + ;; tizen) __CodeName= __UbuntuRepo= __Tizen=tizen ;; - alpine|alpine3.13) + alpine*) __CodeName=alpine __UbuntuRepo= - __AlpineVersion=3.13 - __AlpinePackages+=" llvm10-libs" - ;; - alpine3.14) - __CodeName=alpine - __UbuntuRepo= - __AlpineVersion=3.14 - __AlpinePackages+=" llvm11-libs" + version="${lowerI/alpine/}" + + if [[ "$version" == "edge" ]]; then + __AlpineVersion=edge + else + parts=(${version//./ }) + __AlpineMajorVersion="${parts[0]}" + __AlpineMinoVersion="${parts[1]}" + + if [[ -z "$__AlpineVersion" ]]; then + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" + fi + 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 @@ -341,18 +392,40 @@ mkdir -p "$__RootfsDir" __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then - __ApkToolsVersion=2.9.1 + __ApkToolsVersion=2.12.11 __ApkToolsDir="$(mktemp -d)" - wget "https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -P "$__ApkToolsDir" - tar -xf "$__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -C "$__ApkToolsDir" + + wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + chmod +x "$__ApkToolsDir/apk.static" + 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" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ - add $__AlpinePackages + if [[ "$__AlpineVersion" == "edge" ]]; then + version=edge + else + version="v$__AlpineVersion" + fi + + "$__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 + + if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then + "$__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 + fi rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then diff --git a/global.json b/global.json index 4f47cbfb..021fa7aa 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23118.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1" } } From f3e8bacb851ae170683a29251054ac09fd90ed86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 13:29:50 +0000 Subject: [PATCH 09/20] Update dependencies from https://github.com/dotnet/arcade build 20230223.2 (#1546) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/build-rootfs.sh | 25 ++++++++++++++++++++----- eng/common/templates/job/job.yml | 2 +- global.json | 4 ++-- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8119945f..d19fdcf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ffaa88eb..f027af75 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -260,25 +260,40 @@ while :; do ;; jessie) # Debian 8 __CodeName=jessie - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; stretch) # Debian 9 __CodeName=stretch - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; buster) # Debian 10 __CodeName=buster - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; bullseye) # Debian 11 __CodeName=bullseye - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; sid) # Debian sid __CodeName=sid - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; tizen) __CodeName= diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 61914a1f..b214a31d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -101,7 +101,7 @@ jobs: # handle key-value variable syntax. # example: # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - ${{ each pair in variable }}: - name: ${{ pair.key }} value: ${{ pair.value }} diff --git a/global.json b/global.json index 021fa7aa..63c53875 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-alpha.1.23061.8", + "dotnet": "8.0.100-preview.1.23115.2", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2" } } From b3de29cdf017195f8a828a6691e840a6ae9fa086 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 13:29:53 +0000 Subject: [PATCH 10/20] Update dependencies from https://github.com/dotnet/arcade build 20230227.1 (#1549) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d19fdcf3..0e518155 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + 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-services diff --git a/global.json b/global.json index 63c53875..d493bb96 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23127.1" } } From ea222f23c93a17c9e7823e6146425879ec93aa0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 13:36:01 +0000 Subject: [PATCH 11/20] Update dependencies from https://github.com/dotnet/arcade build 20230228.1 (#1550) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- .../templates/job/source-index-stage1.yml | 2 +- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e518155..7008fffc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + 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-services diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 71b66aeb..b98202aa 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 d493bb96..1fc2b889 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23127.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23128.1" } } From 1a159ae89f2c1fc4e66c75dcb6b510e8c3f5893c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 13:26:03 +0000 Subject: [PATCH 12/20] Update dependencies from https://github.com/dotnet/arcade build 20230301.4 (#1551) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++---- eng/common/cross/build-rootfs.sh | 95 ++++++++++++++++---------------- global.json | 2 +- 3 files changed, 58 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7008fffc..785202e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + 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-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index f027af75..ff113f73 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 1fc2b889..f2822638 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23128.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23151.4" } } From 85a88318c9b77e05e38125cb8fc485371f60fb5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 13:25:26 +0000 Subject: [PATCH 13/20] Update dependencies from https://github.com/dotnet/arcade build 20230302.1 (#1552) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 785202e2..536374a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + 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-services diff --git a/global.json b/global.json index f2822638..ac34a96a 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23151.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23152.1" } } From 0291531a78ffc3939dd2825aed940cac7950cc68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 4 Mar 2023 13:27:22 +0000 Subject: [PATCH 14/20] Update dependencies from https://github.com/dotnet/arcade build 20230303.1 (#1553) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 536374a4..50b14e4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index ac34a96a..d54710d5 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23152.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23153.1" } } From 8f9f3718654dc3cbf7af9e44be17fcc8cd91e59b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 13:25:45 +0000 Subject: [PATCH 15/20] Update dependencies from https://github.com/dotnet/arcade build 20230306.4 (#1554) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50b14e4f..3093e28f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index d54710d5..62ca142e 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23153.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23156.4" } } From 2a8dfe06303145dc0cf6c1dd2cd93a812b356428 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 13:29:04 +0000 Subject: [PATCH 16/20] Update dependencies from https://github.com/dotnet/arcade build 20230309.1 (#1555) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3093e28f..ce2637a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + cb64095ec45ac34378a1a26db9932a3b561f9e4e - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + cb64095ec45ac34378a1a26db9932a3b561f9e4e - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + cb64095ec45ac34378a1a26db9932a3b561f9e4e - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + cb64095ec45ac34378a1a26db9932a3b561f9e4e - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + cb64095ec45ac34378a1a26db9932a3b561f9e4e https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 62ca142e..148490f0 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23156.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23159.1" } } From c6821dc9d7c55e35b6f46fbb933cca9c429b7d52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 12:26:16 +0000 Subject: [PATCH 17/20] Update dependencies from https://github.com/dotnet/arcade build 20230313.1 (#1556) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce2637a7..ef9b9bb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - cb64095ec45ac34378a1a26db9932a3b561f9e4e + a0a9c59876ae267d27d64c9b157337681208c1bc - + https://github.com/dotnet/arcade - cb64095ec45ac34378a1a26db9932a3b561f9e4e + a0a9c59876ae267d27d64c9b157337681208c1bc - + https://github.com/dotnet/arcade - cb64095ec45ac34378a1a26db9932a3b561f9e4e + a0a9c59876ae267d27d64c9b157337681208c1bc - + https://github.com/dotnet/arcade - cb64095ec45ac34378a1a26db9932a3b561f9e4e + a0a9c59876ae267d27d64c9b157337681208c1bc - + https://github.com/dotnet/arcade - cb64095ec45ac34378a1a26db9932a3b561f9e4e + a0a9c59876ae267d27d64c9b157337681208c1bc https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 148490f0..7ae8d430 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23159.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23163.1" } } From ad88a79712800861c26d32e815479ad23d2fe948 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 12:31:08 +0000 Subject: [PATCH 18/20] Update dependencies from https://github.com/dotnet/arcade build 20230314.2 (#1557) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef9b9bb5..1c331bba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 7ae8d430..0c9833e7 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23163.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23164.2" } } From 01c81d5fa2e525ea26e4f1e4c7899ea36d43b347 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 12:27:39 +0000 Subject: [PATCH 19/20] Update dependencies from https://github.com/dotnet/arcade build 20230316.5 (#1558) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.ps1 | 14 ++++++++------ global.json | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c331bba..4faea9fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7caacc6d..8ad03be3 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -913,11 +913,13 @@ if (!$disableConfigureToolsetImport) { function Enable-Nuget-EnhancedRetry() { if ($ci) { Write-Host "Setting NUGET enhanced retry environment variables" - $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' - $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 - $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 - Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + $env:NUGET_ENABLE_ENHANCED_HTTP_RETRY = 'true' + $env:NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT = 6 + $env:NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 + $env:NUGET_RETRY_HTTP_429 = 'true' + Write-PipelineSetVariable -Name 'NUGET_ENABLE_ENHANCED_HTTP_RETRY' -Value 'true' + Write-PipelineSetVariable -Name 'NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT' -Value '6' + Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } } diff --git a/global.json b/global.json index 0c9833e7..72cb796c 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23164.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23166.5" } } From b4a07ec58a24e05052dbc201ed552a9783cb3da9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 12:29:25 +0000 Subject: [PATCH 20/20] Update dependencies from https://github.com/dotnet/arcade build 20230318.1 (#1559) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4faea9fa..022724dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 72cb796c..f3cfc534 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23166.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23168.1" } }