Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #45353

Closed
wants to merge 17 commits into from
Closed

[main] Update dependencies from dotnet/arcade #45353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
91a9571
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 6, 2024
043eb0b
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 7, 2024
1274a9f
Delete src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and …
ViktorHofer Dec 10, 2024
c5e5b00
Merge branch 'main' into darc-main-6c820a58-5e5b-495b-8cdd-ecf3c55e964d
ViktorHofer Dec 10, 2024
19c2f82
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 10, 2024
18652f2
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 11, 2024
09aef35
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 12, 2024
bd616f0
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 13, 2024
56b2788
Merge branch 'main' into darc-main-6c820a58-5e5b-495b-8cdd-ecf3c55e964d
ViktorHofer Dec 13, 2024
993053e
Add roslyn patch
ViktorHofer Dec 13, 2024
7e87e1a
update patch
ViktorHofer Dec 13, 2024
915348d
update patch again
ViktorHofer Dec 13, 2024
845ad5a
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 14, 2024
6fed762
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 17, 2024
563f20e
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 18, 2024
785d87c
Delete src/SourceBuild/patches/roslyn/0002-update-roslyn-tfms.patch
ViktorHofer Dec 18, 2024
2bb1ebb
Merge branch 'main' into darc-main-6c820a58-5e5b-495b-8cdd-ecf3c55e964d
ViktorHofer Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,34 +559,34 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24617.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24617.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24617.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24617.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24617.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24617.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24617.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24617.1">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24604.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24604.4</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24604.4</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24604.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24617.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24617.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24617.2</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24617.2</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
11 changes: 1 addition & 10 deletions eng/common/core-templates/steps/get-delegation-sas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,7 @@ steps:
# Calculate the expiration of the SAS token and convert to UTC
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")

# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
$sas = ""
do {
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
exit 1
}
} while($sas.IndexOf('/') -ne -1)
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv

if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ steps:
portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
fi
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
Expand Down
22 changes: 7 additions & 15 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks"
__UbuntuPackages+=" libicu-dev"
__UbuntuPackages+=" liblttng-ust-dev"
__UbuntuPackages+=" libunwind8-dev"
__UbuntuPackages+=" libnuma-dev"

__AlpinePackages+=" gettext-dev"
__AlpinePackages+=" icu-dev"
__AlpinePackages+=" libunwind-dev"
__AlpinePackages+=" lttng-ust-dev"
__AlpinePackages+=" compiler-rt"
__AlpinePackages+=" numactl-dev"

# runtime libraries' dependencies
__UbuntuPackages+=" libcurl4-openssl-dev"
Expand All @@ -73,8 +71,8 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="13.3-RELEASE"
__FreeBSDPkg="1.17.0"
__FreeBSDBase="13.4-RELEASE"
__FreeBSDPkg="1.21.3"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
Expand Down Expand Up @@ -371,7 +369,7 @@ while :; do
;;
freebsd14)
__CodeName=freebsd
__FreeBSDBase="14.0-RELEASE"
__FreeBSDBase="14.2-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
Expand Down Expand Up @@ -424,13 +422,12 @@ case "$__AlpineVersion" in
elif [[ "$__AlpineArch" == "riscv64" ]]; then
__AlpineLlvmLibsLookup=1
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
elif [[ -n "$__AlpineMajorVersion" ]]; then
# use whichever alpine version is provided and select the latest toolchain libs
__AlpineLlvmLibsLookup=1
else
__AlpineVersion=3.13 # 3.13 to maximize compatibility
__AlpinePackages+=" llvm10-libs"

if [[ "$__AlpineArch" == "armv7" ]]; then
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
fi
fi
esac

Expand All @@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then
__LLDB_Package="lldb-3.5-dev"
fi

if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then
# libnuma-dev is not available on armhf for xenial
__UbuntuPackages="${__UbuntuPackages//libnuma-dev/}"
fi

__UbuntuPackages+=" ${__LLDB_Package:-}"

if [[ -z "$__UbuntuRepo" ]]; then
Expand Down Expand Up @@ -574,7 +566,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
fi
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
mkdir -p "$__RootfsDir"/tmp
# get and build package manager
if [[ "$__hasWget" == 1 ]]; then
Expand Down
Loading
Loading