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 #45777

Merged
merged 1 commit into from
Jan 9, 2025
Merged

[main] Update dependencies from dotnet/arcade #45777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.25056.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.25052.4">
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.25056.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25056.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25056.1</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25057.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25057.5</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25057.5</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25057.5</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
15 changes: 6 additions & 9 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ __QEMUArch=arm
__UbuntuArch=armhf
__UbuntuRepo=
__UbuntuSuites="updates security backports"
__DebianSuites=
__LLDB_Package="liblldb-3.9-dev"
__SkipUnmount=0

Expand Down Expand Up @@ -188,8 +187,7 @@ while :; do
__AlpineArch=loongarch64
__QEMUArch=loongarch64
__UbuntuArch=loong64
__UbuntuSuites=
__DebianSuites=unreleased
__UbuntuSuites=unreleased
__LLDB_Package="liblldb-19-dev"

if [[ "$__CodeName" == "sid" ]]; then
Expand Down Expand Up @@ -782,6 +780,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then
popd
rm -rf "$__RootfsDir/tmp"
elif [[ -n "$__CodeName" ]]; then
__Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"

if [[ "$__SkipEmulation" == "1" ]]; then
if [[ -z "$AR" ]]; then
if command -v ar &>/dev/null; then
Expand All @@ -794,19 +794,16 @@ elif [[ -n "$__CodeName" ]]; then
fi
fi

# shellcheck disable=SC2086
suites="$__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")"

PYTHON=${PYTHON_EXECUTABLE:-python3}

# shellcheck disable=SC2086,SC2046
echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
$(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
$(for suite in $__Suites; do echo -n "--suite $suite "; done) \
$__UbuntuPackages

# shellcheck disable=SC2086,SC2046
"$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
$(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
$(for suite in $__Suites; do echo -n "--suite $suite "; done) \
$__UbuntuPackages

exit 0
Expand Down Expand Up @@ -837,7 +834,7 @@ elif [[ -n "$__CodeName" ]]; then
cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
Types: deb
URIs: $__UbuntuRepo
Suites: $__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")
Suites: $__Suites
Components: main universe
Signed-By: $__KeyringFile
EOF
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25057.5",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25057.5",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
Loading