8000 [main] Source code updates from dotnet/dotnet by dotnet-maestro[bot] · Pull Request #1240 · dotnet/source-build-reference-packages · GitHub
[go: up one dir, main page]
Skip to content

[main] Source code updates from dotnet/dotnet #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 29, 2025
Merged

[main] Source code updates from dotnet/dotnet #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3112563
Merging main into darc-main-e6bcd835-cc2d-4b2b-941a-615420068a67
dotnet-maestro[bot] Apr 25, 2025
963a5aa
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 25, 2025
ad5e05b
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 26, 2025
4bb1356
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 28, 2025
406ed02
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 29, 2025
a7e0f2f
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 29, 2025
0f0a6f5
Remove SB intermediates and baseline
ViktorHofer Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000 11 changes: 0 additions & 11 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop

This file was deleted.

22 changes: 5 additions & 17 deletions eng/Version.Details.xml
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="721dc7a2a59416b21fc49447d264009d708d6000" BarId="265489" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="efbfb137a317fb339a6b7be36af7188cc508dc95" BarId="266095" />
<ToolsetDependencies>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.621401">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>d64d8da45618323a39fb77860d1140bdbcd506ad</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25222.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80d7b4ee29c31c0886b139ad02d85da48b543cd6</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25223.119">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25228.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25223.119">
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25228.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer this version is out of sync with the one in Version.Details.xml and looks manually updated, should we remove it there?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that version used by the repo build?

Copy link
Member
@ViktorHofer ViktorHofer Apr 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should make them the same

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK this was already the case before the backflow changes. @MichaelSimons should those version get updated to something newer? A version closer to what the product uses with the PSB? Also, should there be toolset sub for it?

<!-- SDK dependencies -->
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25223.119</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25228.104</MicrosoftDotNetGenAPITaskPackageVersion>
<!-- xUnit dependencies -->
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ parameters:
# Specifies the build script to invoke to perform the build in the repo. The default
# './build.sh' should work for typical Arcade repositories, but this is customizable for
# difficult situations.
# buildArguments: ''
# Specifies additional build arguments to pass to the build script.
# jobProperties: {}
# A list of job properties to inject at the top level, for potential extensibility beyond
# container and pool.
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
${{ parameter.key }}: ${{ parameter.value }}

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

runAsPublic: ${{ parameters.runAsPublic }}
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down
5 changes: 2 additions & 3 deletions eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ steps:
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
${{ parameters.platform.buildArguments }} \
$officialBuildArgs \
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
Expand All @@ -93,9 +94,7 @@ steps:
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName \
/p:SetUpSourceBuildIntermediateNupkgCache=false \
/p:ReportPrebuiltUsage=false
/p:AssetManifestFileName=$assetManifestFileName
displayName: Build

# Upload build logs for diagnosis.
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/source-index-stage1-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
binlogPath: artifacts/log/Debug/Build.binlog

Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dotnet": "10.0.100-preview.3.25201.16"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.104",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
0