Skip to content

Commit a6ce135

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250425.4 (#2836)
[main] Update dependencies from dotnet/arcade
1 parent 95cafb5 commit a6ce135

File tree

8 files changed

+18
-20
lines changed

8 files changed

+18
-20
lines changed

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25225.4">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
8+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25217.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25225.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
12+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25217.1">
14+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25225.4">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
16+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1616
<MicrosoftAspNetCoreTestHostVersion>6.0.36</MicrosoftAspNetCoreTestHostVersion>
1717
<MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24576.2</MicrosoftCrankEventSourcesVersion>
18-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25217.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25225.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
1919
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
2020
<MoqVersion>4.18.4</MoqVersion>
2121
<AutofacVersion>4.9.4</AutofacVersion>

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

+2
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

+2-2
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/steps/source-build.yml

+1
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 \

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

+2-2
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/tizen-fetch.sh

+2-7
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
},
1818
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
20-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1"
19+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.4",
20+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25225.4"
2121
}
2222
}

0 commit comments

Comments
 (0)