Skip to content

Commit 9b0b075

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250108.4 (#111220)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25056.1 -> To Version 10.0.0-beta.25058.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 442e882 commit 9b0b075

File tree

4 files changed

+67
-70
lines changed

4 files changed

+67
-70
lines changed

eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25056.1">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25058.4">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
89+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25056.1">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25058.4">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
94+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25056.1">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25058.4">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
99+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25058.4">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
103+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25056.1">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25058.4">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
107+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25056.1">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25058.4">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
111+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25056.1">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25058.4">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
115+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25056.1">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25058.4">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
119+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25056.1">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25058.4">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
123+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25056.1">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25058.4">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
127+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25056.1">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25058.4">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
131+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25056.1">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25058.4">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
135+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25056.1">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25058.4">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
139+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25056.1">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25058.4">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
143+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25056.1">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25058.4">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
147+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25056.1">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25058.4">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
151+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25056.1">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25058.4">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
155+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25056.1">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25058.4">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
159+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25056.1">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25058.4">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
163+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25056.1">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25058.4">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
167+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25057.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>3119edb6d70fb252e6128b0c7e45d3fc2f49f249</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25056.1">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25058.4">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
353+
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24622.2</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25056.1</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25056.1</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25056.1</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25056.1</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25058.4</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25058.4</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25058.4</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25058.4</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25058.4</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->

eng/common/cross/build-rootfs.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ __QEMUArch=arm
3333
__UbuntuArch=armhf
3434
__UbuntuRepo=
3535
__UbuntuSuites="updates security backports"
36-
__DebianSuites=
3736
__LLDB_Package="liblldb-3.9-dev"
3837
__SkipUnmount=0
3938

@@ -188,8 +187,7 @@ while :; do
188187
__AlpineArch=loongarch64
189188
__QEMUArch=loongarch64
190189
__UbuntuArch=loong64
191-
__UbuntuSuites=
192-
__DebianSuites=unreleased
190+
__UbuntuSuites=unreleased
193191
__LLDB_Package="liblldb-19-dev"
194192

195193
if [[ "$__CodeName" == "sid" ]]; then
@@ -782,6 +780,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then
782780
popd
783781
rm -rf "$__RootfsDir/tmp"
784782
elif [[ -n "$__CodeName" ]]; then
783+
__Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"
784+
785785
if [[ "$__SkipEmulation" == "1" ]]; then
786786
if [[ -z "$AR" ]]; then
787787
if command -v ar &>/dev/null; then
@@ -794,19 +794,16 @@ elif [[ -n "$__CodeName" ]]; then
794794
fi
795795
fi
796796

797-
# shellcheck disable=SC2086
798-
suites="$__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")"
799-
800797
PYTHON=${PYTHON_EXECUTABLE:-python3}
801798

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

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

812809
exit 0
@@ -837,7 +834,7 @@ elif [[ -n "$__CodeName" ]]; then
837834
cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
838835
Types: deb
839836
URIs: $__UbuntuRepo
840-
Suites: $__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")
837+
Suites: $__Suites
841838
Components: main universe
842839
Signed-By: $__KeyringFile
843840
EOF

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "10.0.100-alpha.1.24610.7"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
12-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25056.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25058.4",
12+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25058.4",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25058.4",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24"

0 commit comments

Comments
 (0)