8000 [main] Source code updates from dotnet/dotnet (#475) · dotnet/source-build-externals@37a16c7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 37a16c7

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Source code updates from dotnet/dotnet (#475)
* Update dependencies from https://github.com/dotnet/dotnet * Update dependencies from https://github.com/dotnet/dotnet * Update dependencies from https://github.com/dotnet/dotnet * Update dependencies from https://github.com/dotnet/dotnet * Update dependencies from https://github.com/dotnet/dotnet * Remove SB intermediates and baseline --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent f5a9c8b commit 37a16c7

File tree

8 files changed

+13
-47
lines changed

8 files changed

+13
-47
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml

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

< 8000 code>‎eng/Version.Details.xml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-externals" Sha="721dc7a2a59416b21fc49447d264009d708d6000" BarId="265489" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-externals" Sha="efbfb137a317fb339a6b7be36af7188cc508dc95" BarId="266095" />
44
<ToolsetDependencies>
55
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-24619-01">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
77
<Sha>e9b99f554a3c298e1106ea171f5a0462780af2c5</Sha>
88
</Dependency>
9-
<!-- Intermediate is necessary for source build. -->
10-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-24619-01">
11-
<Uri>https://github.com/dotnet/msbuild</Uri>
12-
<Sha>e9b99f554a3c298e1106ea171f5a0462780af2c5</Sha>
13-
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
14-
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25223.119">
9+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25228.104">
1610
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
18-
</Dependency>
19-
<!-- Intermediate is necessary for source build. -->
20-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25222.2">
21-
<Uri>https://github.com/dotnet/arcade</Uri>
22-
<Sha>80d7b4ee29c31c0886b139ad02d85da48b543cd6</Sha>
23-
<SourceBuild RepoName="arcade" ManagedOnly="true" />
24-
</Dependency>
25-
<!-- Intermediate is necessary for source build. -->
26-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.621801">
27-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
28-
<Sha>2228b4511efb4aca61317883c615208cd13b66a7</Sha>
29-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
11+
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
3012
</Dependency>
3113
</ToolsetDependencies>
3214
</Dependencies>

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

Lines changed: 2 additions & 3 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 \
@@ -93,9 +94,7 @@ steps:
9394
$portableBuildArgs \
9495
/p:DotNetBuildSourceOnly=true \
9596
/p:DotNetBuildRepo=true \
96-
/p:AssetManifestFileName=$assetManifestFileName \
97-
/p:SetUpSourceBuildIntermediateNupkgCache=false \
98-
/p:ReportPrebuiltUsage=false
97+
/p:AssetManifestFileName=$assetManifestFileName
9998
displayName: Build
10099

101100
# Upload build logs for diagnosis.

‎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/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>$(NetCurrent)</TargetFramework>
55
<OutputPath>$(XPlatTasksBinDir)</OutputPath>
66
</PropertyGroup>
77

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.104"
77
}
88
}

0 commit comments

Comments
 (0)
0