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

Merged
merged 2 commits into from
Jan 9, 2025
Merged

[main] Update dependencies from dotnet/arcade #111220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
386ee91
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 9, 2025
e1398fc
Merge branch 'main' into darc-main-ffe9de4d-cda9-4626-820a-37730cbfb600
ViktorHofer Jan 9, 2025
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
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,87 +84,87 @@
</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.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</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.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</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.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</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.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25057.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -348,9 +348,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3119edb6d70fb252e6128b0c7e45d3fc2f49f249</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24622.2</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25056.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25056.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25056.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25056.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25058.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25058.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25058.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25058.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25058.4</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
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
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "10.0.100-alpha.1.24610.7"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25058.4",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24"
Expand Down
Loading