Skip to content

Commit b8ca0c6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#552)
* Update dependencies from https://github.com/dotnet/arcade build 20250425.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25217.1 -> To Version 10.0.0-beta.25225.4 * Update dependencies from https://github.com/dotnet/arcade build 20250503.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25217.1 -> To Version 10.0.0-beta.25253.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 05c422e commit b8ca0c6

File tree

10 files changed

+26
-39
lines changed

10 files changed

+26
-39
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25253.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
12+
<Sha>cdf9c563205c673b7df205e24564aa48dbc341c3</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25217.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25253.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
16+
<Sha>cdf9c563205c673b7df205e24564aa48dbc341c3</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25217.1">
18+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25253.1">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
20+
<Sha>cdf9c563205c673b7df205e24564aa48dbc341c3</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25217.1">
22+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25253.1">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
24+
<Sha>cdf9c563205c673b7df205e24564aa48dbc341c3</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25217.1">
26+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25253.1">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
28+
<Sha>cdf9c563205c673b7df205e24564aa48dbc341c3</Sha>
2929
</Dependency>
3030
</ToolsetDependencies>
3131
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
1414
<MicrosoftCodeAnalysisVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisVersion>
1515
<!-- arcade -->
16-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksTemplatingVersion>
17-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25217.1</MicrosoftDotNetRemoteExecutorVersion>
18-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25217.1</MicrosoftDotNetXUnitExtensionsVersion>
19-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25217.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
16+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25253.1</MicrosoftDotNetBuildTasksTemplatingVersion>
17+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25253.1</MicrosoftDotNetRemoteExecutorVersion>
18+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25253.1</MicrosoftDotNetXUnitExtensionsVersion>
19+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25253.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2020
<!--
2121
These are used as reference assemblies only, so they must not take a ProdCon/source-build
2222
version. Insert "RefOnly" to avoid assignment via PVP.

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ parameters:
2727
# Specifies the build script to invoke to perform the build in the repo. The default
2828
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2929
# difficult situations.
30+
# buildArguments: ''
31+
# Specifies additional build arguments to pass to the build script.
3032
# jobProperties: {}
3133
# A list of job properties to inject at the top level, for potential extensibility beyond
3234
# container and pool.

‎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/core-templates/jobs/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ steps:
8484
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8585
--configuration $buildConfig \
8686
--restore --build --pack $publishArgs -bl \
87+
${{ parameters.platform.buildArguments }} \
8788
$officialBuildArgs \
8889
$internalRuntimeDownloadArgs \
8990
$internalRestoreArgs \
@@ -120,14 +121,3 @@ steps:
120121
continueOnError: true
121122
condition: succeededOrFailed()
122123
sbomEnabled: false # we don't need SBOM for logs
123-
124-
# Manually inject component detection so that we can ignore the source build upstream cache, which contains
125-
# a nupkg cache of input packages (a local feed).
126-
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
127-
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
128-
- template: /eng/common/core-templates/steps/component-governance.yml
129-
parameters:
130-
displayName: Component Detection (Exclude upstream cache)
131-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
132-
componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
133-
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

‎eng/common/core-templates/steps/source-index-stage1-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
2+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25253.1",
77
"Microsoft.Build.Traversal": "3.4.0"
88
}
99
}

0 commit comments

Comments
 (0)