Skip to content

Commit 493a1d2

Browse files
[main] Update dependencies from dotnet/arcade (#2557)
* Update dependencies from https://github.com/dotnet/arcade build 20250425.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25225.6 * Update dependencies from https://github.com/dotnet/arcade build 20250505.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25255.5 * Disable prebuilt detection Fixes dotnet/source-build#5082 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent c07f759 commit 493a1d2

File tree

7 files changed

+12
-27
lines changed

7 files changed

+12
-27
lines changed

eng/DotNetBuild.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
22
<Project>
33

4+
<!-- TODO: Remove this file when command-line-api upgrades to Arcade 10 -->
45
<PropertyGroup>
56
<GitHubRepositoryName>command-line-api</GitHubRepositoryName>
67
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
8+
<ReportPrebuiltUsage Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DotNetBuildOrchestrator)</ReportPrebuiltUsage>
9+
<SetUpSourceBuildIntermediateNupkgCache>false</SetUpSourceBuildIntermediateNupkgCache>
10+
<CreateIntermediatePackage>false</CreateIntermediatePackage>
711
</PropertyGroup>
812

913
</Project>

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

eng/Version.Details.xml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,11 @@
22
<Dependencies>
33
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="721dc7a2a59416b21fc49447d264009d708d6000" BarId="265489" />
44
<ProductDependencies>
5-
<!-- Intermediate is necessary for source build. -->
6-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25209.1">
7-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
8-
<Sha>7dbf5deea5bdccf513df73cba179c4c0ad106010</Sha>
9-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
10-
</Dependency>
115
</ProductDependencies>
126
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25208.6">
14-
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
16-
</Dependency>
17-
<!-- Intermediate is necessary for source build. -->
18-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25208.6">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
198
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
21-
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
2210
</Dependency>
2311
</ToolsetDependencies>
2412
</Dependencies>

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

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

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ steps:
7979
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8080
--configuration $buildConfig \
8181
--restore --build --pack $publishArgs -bl \
82+
${{ parameters.platform.buildArguments }} \
8283
$officialBuildArgs \
8384
$internalRuntimeDownloadArgs \
8485
$internalRestoreArgs \

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6"
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5"
1212
}
1313
}

0 commit comments

Comments
 (0)