Skip to content

Commit 37e7a08

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250423.1 (#61638)
[main] Update dependencies from dotnet/arcade
1 parent a183c94 commit 37e7a08

File tree

6 files changed

+29
-34
lines changed

6 files changed

+29
-34
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -396,39 +396,39 @@
396396
<Uri>https://github.com/dotnet/runtime</Uri>
397397
<Sha>31289efa35151a4e60dcd2e6471c51f620f78c28</Sha>
398398
</Dependency>
399-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
399+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25223.1">
400400
<Uri>https://github.com/dotnet/arcade</Uri>
401-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
401+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
402402
</Dependency>
403403
<!-- Intermediate is necessary for source build. -->
404-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25217.1">
404+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25223.1">
405405
<Uri>https://github.com/dotnet/arcade</Uri>
406-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
406+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
407407
<SourceBuild RepoName="arcade" ManagedOnly="true" />
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25217.1">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25223.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
411+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25217.1">
413+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25223.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
415+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25217.1">
417+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25223.1">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
419+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25217.1">
421+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25223.1">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
423+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25217.1">
425+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25223.1">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
427+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25217.1">
429+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25223.1">
430430
<Uri>https://github.com/dotnet/arcade</Uri>
431-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
431+
<Sha>36f91467d150caf4f8ca0008f039d746bc03017b</Sha>
432432
</Dependency>
433433
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.5.0-preview.1.25211.2">
434434
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@
168168
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
169169
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
170170
<!-- Packages from dotnet/arcade -->
171-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksArchivesVersion>
172-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksInstallersVersion>
173-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksTemplatingVersion>
174-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25217.1</MicrosoftDotNetRemoteExecutorVersion>
175-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25217.1</MicrosoftSourceBuildIntermediatearcadeVersion>
171+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25223.1</MicrosoftDotNetBuildTasksArchivesVersion>
172+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25223.1</MicrosoftDotNetBuildTasksInstallersVersion>
173+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25223.1</MicrosoftDotNetBuildTasksTemplatingVersion>
174+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25223.1</MicrosoftDotNetRemoteExecutorVersion>
175+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25223.1</MicrosoftSourceBuildIntermediatearcadeVersion>
176176
<!-- Packages from dotnet/source-build-externals -->
177177
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.621401</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
178178
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
${{ parameter.key }}: ${{ parameter.value }}
9797

9898
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
99-
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
99+
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
100100
- template: ../job/publish-build-assets.yml
101101
parameters:
102102
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -112,7 +112,7 @@ jobs:
112112
- Source_Build_Complete
113113

114114
runAsPublic: ${{ parameters.runAsPublic }}
115-
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
115+
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
116116
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
117117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

‎eng/common/cross/arm64/tizen/tizen.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
55
Use the shared library, but some functions are only in
66
the static library, so try that secondarily. */
77
OUTPUT_FORMAT(elf64-littleaarch64)
8-
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) )
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
99
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )

‎eng/common/cross/tizen-fetch.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,8 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159-
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160-
BASE="Tizen-Base-RISCV"
161-
UNIFIED="Tizen-Unified-RISCV"
162-
else
163-
BASE="Tizen-Base"
164-
UNIFIED="Tizen-Unified"
165-
fi
159+
BASE="Tizen-Base"
160+
UNIFIED="Tizen-Unified"
166161

167162
Inform "Initialize ${TIZEN_ARCH} base"
168163
fetch_tizen_pkgs_init standard $BASE

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25217.1",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.1",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25223.1",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)