Skip to content

Commit 230dc86

Browse files
[main] Update dependencies from dotnet/arcade (#100725)
* Update dependencies from https://github.com/dotnet/arcade build 20240405.14 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 9.0.0-beta.24205.4 -> To Version 9.0.0-beta.24205.14 * Update dependencies from https://github.com/dotnet/arcade build 20240407.1 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 9.0.0-beta.24205.4 -> To Version 9.0.0-beta.24207.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 755b551 commit 230dc86

File tree

4 files changed

+70
-63
lines changed

4 files changed

+70
-63
lines changed

eng/Version.Details.xml

+42-42
Original file line numberDiff line numberDiff line change
@@ -92,87 +92,87 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24205.4">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24207.1">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
97+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24205.4">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24207.1">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
102+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24205.4">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24207.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
107+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24205.4">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24207.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
111+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24205.4">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24207.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
115+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24205.4">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24207.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
119+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24205.4">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24207.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
123+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24205.4">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24207.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
127+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24205.4">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24207.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
131+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24205.4">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24207.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
135+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24205.4">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24207.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
139+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24205.4">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24207.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
143+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24205.4">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24207.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
147+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24205.4">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24207.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
151+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24205.4">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24207.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
155+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24205.4">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24207.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
159+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24205.4">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24207.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
163+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24205.4">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24207.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
167+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24205.4">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24207.1">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
171+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24205.4">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24207.1">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
175+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
176176
</Dependency>
177177
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24205.1">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -332,9 +332,9 @@
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333333
<Sha>28af9496b0e260f7e66ec549b39f1410ee9743d1</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24205.4">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24207.1">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>541820fbd313f9bb82b756b66d258fe316d5e48b</Sha>
337+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
338338
</Dependency>
339339
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24106.4">
340340
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

+16-16
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@
8383
<!-- SDK dependencies -->
8484
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.4.24175.4</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
86-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24205.4</MicrosoftDotNetBuildTasksFeedVersion>
87-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24205.4</MicrosoftDotNetCodeAnalysisVersion>
88-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24205.4</MicrosoftDotNetGenAPIVersion>
89-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24205.4</MicrosoftDotNetGenFacadesVersion>
90-
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24205.4</MicrosoftDotNetXUnitAssertVersion>
91-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24205.4</MicrosoftDotNetXUnitExtensionsVersion>
92-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24205.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
93-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24205.4</MicrosoftDotNetBuildTasksArchivesVersion>
94-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24205.4</MicrosoftDotNetBuildTasksInstallersVersion>
95-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24205.4</MicrosoftDotNetBuildTasksPackagingVersion>
96-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24205.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24205.4</MicrosoftDotNetBuildTasksTemplatingVersion>
98-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24205.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24205.4</MicrosoftDotNetRemoteExecutorVersion>
100-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24205.4</MicrosoftDotNetVersionToolsTasksVersion>
101-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24205.4</MicrosoftDotNetPackageTestingVersion>
86+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24207.1</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24207.1</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24207.1</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24207.1</MicrosoftDotNetXUnitAssertVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24207.1</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24207.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24207.1</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24207.1</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24207.1</MicrosoftDotNetPackageTestingVersion>
102102
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
103103
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
104104
<!-- NuGet dependencies -->

eng/common/cross/build-rootfs.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -444,11 +444,18 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )"
444444

445445
if [[ "$__CodeName" == "alpine" ]]; then
446446
__ApkToolsVersion=2.12.11
447-
__ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33
448447
__ApkToolsDir="$(mktemp -d)"
449448
__ApkKeysDir="$(mktemp -d)"
450449

451-
wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir"
450+
arch="$(uname -m)"
451+
wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir"
452+
if [[ "$arch" == "x86_64" ]]; then
453+
__ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33"
454+
elif [[ "$arch" == "aarch64" ]]; then
455+
__ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0"
456+
else
457+
echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`"
458+
fi
452459
echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c
453460
chmod +x "$__ApkToolsDir/apk.static"
454461

global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "9.0.100-preview.1.24101.2"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.4",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.4",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24205.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24207.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24201.1"

0 commit comments

Comments
 (0)