mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#18779)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2024-02-27 20:02:54 +00:00 committed by GitHub
parent 25ffb671b3
commit 998d6ecb6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 65 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -243,17 +243,17 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24114.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5b02a4900c4d521cb48b8f0d7e3f28175268f7c</Sha> <Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24114.1"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5b02a4900c4d521cb48b8f0d7e3f28175268f7c</Sha> <Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24114.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5b02a4900c4d521cb48b8f0d7e3f28175268f7c</Sha> <Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24112.3"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24112.3">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -263,14 +263,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>c041bcdab75f5447be8bd11ddcfbe8e639f13f32</Sha> <Sha>c041bcdab75f5447be8bd11ddcfbe8e639f13f32</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24114.1"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5b02a4900c4d521cb48b8f0d7e3f28175268f7c</Sha> <Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24114.1"> <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5b02a4900c4d521cb48b8f0d7e3f28175268f7c</Sha> <Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

2
eng/Versions.props
View file

@ -44,7 +44,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24114.1</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->

66
eng/common/native/init-distro-rid.sh
View file

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# getNonPortableDistroRid # getNonPortableDistroRid
# #
@ -11,21 +11,20 @@
# non-portable rid # non-portable rid
getNonPortableDistroRid() getNonPortableDistroRid()
{ {
local targetOs="$1" targetOs="$1"
local targetArch="$2" targetArch="$2"
local rootfsDir="$3" rootfsDir="$3"
local nonPortableRid="" nonPortableRid=""
if [ "$targetOs" = "linux" ]; then if [ "$targetOs" = "linux" ]; then
# shellcheck disable=SC1091
if [ -e "${rootfsDir}/etc/os-release" ]; then if [ -e "${rootfsDir}/etc/os-release" ]; then
source "${rootfsDir}/etc/os-release" . "${rootfsDir}/etc/os-release"
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
# remove the last version digit
VERSION_ID="${VERSION_ID%.*}"
fi fi
if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
else else
# Rolling release distros either do not set VERSION_ID, set it as blank or # Rolling release distros either do not set VERSION_ID, set it as blank or
@ -33,45 +32,45 @@ getNonPortableDistroRid()
# so omit it here to be consistent with everything else. # so omit it here to be consistent with everything else.
nonPortableRid="${ID}-${targetArch}" nonPortableRid="${ID}-${targetArch}"
fi fi
elif [ -e "${rootfsDir}/android_platform" ]; then elif [ -e "${rootfsDir}/android_platform" ]; then
source "$rootfsDir"/android_platform # shellcheck disable=SC1091
. "${rootfsDir}/android_platform"
nonPortableRid="$RID" nonPortableRid="$RID"
fi fi
fi fi
if [ "$targetOs" = "freebsd" ]; then if [ "$targetOs" = "freebsd" ]; then
# $rootfsDir can be empty. freebsd-version is shell script and it should always work. # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
__freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; }) __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
__android_sdk_version=$(getprop ro.build.version.sdk) __android_sdk_version=$(getprop ro.build.version.sdk)
nonPortableRid="android.$__android_sdk_version-${targetArch}" nonPortableRid="android.$__android_sdk_version-${targetArch}"
elif [ "$targetOs" = "illumos" ]; then elif [ "$targetOs" = "illumos" ]; then
__uname_version=$(uname -v) __uname_version=$(uname -v)
case "$__uname_version" in case "$__uname_version" in
omnios-*) omnios-*)
__omnios_major_version=$(echo "${__uname_version:8:2}") __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
nonPortableRid=omnios."$__omnios_major_version"-"$targetArch" nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;; ;;
joyent_*) joyent_*)
__smartos_major_version=$(echo "${__uname_version:7:4}") __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
nonPortableRid=smartos."$__smartos_major_version"-"$targetArch" nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;; ;;
illumos_*) *)
nonPortableRid=openindiana-"$targetArch" nonPortableRid="illumos-${targetArch}"
;; ;;
esac esac
elif [ "$targetOs" = "solaris" ]; then elif [ "$targetOs" = "solaris" ]; then
__uname_version=$(uname -v) __uname_version=$(uname -v)
__solaris_major_version=$(echo "${__uname_version%.*}") __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
nonPortableRid=solaris."$__solaris_major_version"-"$targetArch" nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
elif [ "$targetOs" = "haiku" ]; then elif [ "$targetOs" = "haiku" ]; then
__uname_release=$(uname -r) __uname_release="$(uname -r)"
nonPortableRid=haiku.r"$__uname_release"-"$targetArch" nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
fi fi
echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')" echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
} }
# initDistroRidGlobal # initDistroRidGlobal
@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None # None
# #
# Notes: # Notes:
#
# It is important to note that the function does not return anything, but it # It is important to note that the function does not return anything, but it
# exports the following variables on success: # exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform. # __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. # __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
initDistroRidGlobal() initDistroRidGlobal()
{ {
local targetOs="$1" targetOs="$1"
local targetArch="$2" targetArch="$2"
local rootfsDir="" rootfsDir=""
if [ "$#" -ge 3 ]; then if [ $# -ge 3 ]; then
rootfsDir="$3" rootfsDir="$3"
fi fi
if [ -n "${rootfsDir}" ]; then if [ -n "${rootfsDir}" ]; then
# We may have a cross build. Check for the existence of the rootfsDir # We may have a cross build. Check for the existence of the rootfsDir
if [ ! -e "${rootfsDir}" ]; then if [ ! -e "${rootfsDir}" ]; then
echo "Error rootfsDir has been passed, but the location is not valid." echo "Error: rootfsDir has been passed, but the location is not valid."
exit 1 exit 1
fi fi
fi fi
@ -119,7 +115,7 @@ initDistroRidGlobal()
STRINGS="$(command -v llvm-strings || true)" STRINGS="$(command -v llvm-strings || true)"
fi fi
# Check for musl-based distros (e.g Alpine Linux, Void Linux). # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
__PortableTargetOS="linux-musl" __PortableTargetOS="linux-musl"

3
eng/common/native/init-os-and-arch.sh
View file

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# Use uname to determine what the OS is. # Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]') OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
@ -54,6 +54,7 @@ case "$CPUName" in
;; ;;
armv7l|armv8l) armv7l|armv8l)
# shellcheck disable=SC1091
if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
arch=armel arch=armel
else else

6
eng/common/tools.ps1
View file

@ -65,6 +65,9 @@ $ErrorActionPreference = 'Stop'
# Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed
[string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null }
# True if the build is a product build
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
function Create-Directory ([string[]] $path) { function Create-Directory ([string[]] $path) {
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
} }
@ -850,7 +853,8 @@ function MSBuild-Core() {
} }
# When running on Azure Pipelines, override the returned exit code to avoid double logging. # When running on Azure Pipelines, override the returned exit code to avoid double logging.
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) { # Skip this when the build is a child of the VMR orchestrator build.
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and $properties -notlike "*DotNetBuildRepo=true*") {
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

8
eng/common/tools.sh
View file

@ -68,6 +68,9 @@ fi
runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed=${runtime_source_feed:-''}
runtime_source_feed_key=${runtime_source_feed_key:-''} runtime_source_feed_key=${runtime_source_feed_key:-''}
# True if the build is a product build
product_build=${product_build:-false}
# Resolve any symlinks in the given path. # Resolve any symlinks in the given path.
function ResolvePath { function ResolvePath {
local path=$1 local path=$1
@ -141,7 +144,7 @@ function InitializeDotNetCli {
if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
dotnet_root="$DOTNET_INSTALL_DIR" dotnet_root="$DOTNET_INSTALL_DIR"
else else
dotnet_root="$repo_root/.dotnet" dotnet_root="${repo_root}.dotnet"
export DOTNET_INSTALL_DIR="$dotnet_root" export DOTNET_INSTALL_DIR="$dotnet_root"
@ -503,7 +506,8 @@ function MSBuild-Core {
echo "Build failed with exit code $exit_code. Check errors above." echo "Build failed with exit code $exit_code. Check errors above."
# When running on Azure Pipelines, override the returned exit code to avoid double logging. # When running on Azure Pipelines, override the returned exit code to avoid double logging.
if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then # Skip this when the build is a child of the VMR orchestrator build.
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && $properties != *"DotNetBuildRepo=true"* ]]; then
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

6
global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "9.0.100-alpha.1.23615.4", "dotnet": "9.0.100-preview.1.24101.2",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "latest" "cmake": "latest"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24114.1", "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.4",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24114.1" "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24127.4"
} }
} }

22
src/SourceBuild/patches/arcade/0001-Ignore-standard-error-warning-format-in-SB-inner-com.patch
View file

@ -1,22 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 14:05:54 -0600
Subject: [PATCH] Ignore standard error warning format in SB inner command
Backport: https://github.com/dotnet/arcade/pull/14496
---
.../tools/SourceBuild/SourceBuildArcadeBuild.targets | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets
index 6ef44082..72b9c688 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets
@@ -214,6 +214,7 @@
<Exec
Command="$(BaseInnerSourceBuildCommand) $(InnerBuildArgs)"
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
+ IgnoreStandardErrorWarningFormat="true"
EnvironmentVariables="@(InnerBuildEnv)" />
</Target>