Skip to content

[release/dev18.0] Source code updates from dotnet/dotnet #18567

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
May 23, 2025
Merged

[release/dev18.0] Source code updates from dotnet/dotnet #18567

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
b70a439
[VMR] Codeflow ad85650-604dfc7
dotnet-maestro[bot] May 17, 2025
e3ddd6b
Update dependencies from https://github.com/dotnet/dotnet build 268651
dotnet-maestro[bot] May 17, 2025
5c2d804
Update dependencies from https://github.com/dotnet/dotnet build 268722
dotnet-maestro[bot] May 18, 2025
9b8d74b
[VMR] Codeflow 665b1f1-665b1f1
dotnet-maestro[bot] May 21, 2025
d76ad8f
Update dependencies from https://github.com/dotnet/dotnet build 268973
dotnet-maestro[bot] May 21, 2025
6de6ce2
Update dependencies from https://github.com/dotnet/dotnet build 269082
dotnet-maestro[bot] May 22, 2025
786bac1
Merge branch 'release/dev18.0' into darc-release/dev18.0-09f3a6a8-3f5…
T-Gro May 22, 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
2 changes: 2 additions & 0 deletions eng/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ function BuildSolution([string] $solutionName, $packSolution) {

$pack = if ($packSolution -eq $False) {""} else {$pack}

# TODO: Remove DotNetBuildRepo property when fsharp is on Arcade 10
MSBuild $toolsetBuildProj `
$bl `
/p:Configuration=$configuration `
Expand All @@ -302,6 +303,7 @@ function BuildSolution([string] $solutionName, $packSolution) {
/p:Restore=$restore `
/p:Build=$build `
/p:DotNetBuildRepo=$productBuild `
/p:DotNetBuild=$productBuild `
/p:Rebuild=$rebuild `
/p:Pack=$pack `
/p:Sign=$sign `
Expand Down
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="ad8565092bbfdd5c8b4a94a718d10b2d394f7aee" BarId="268384" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="a4d6fdc935d5da12efb00a0b3b693ff1439e0b41" BarId="269082" />
<ProductDependencies>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25223.3">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
Expand Down
6 changes: 5 additions & 1 deletion eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,17 @@ function BuildSolution {
fi

BuildMessage="Error building tools"
local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto /p:DotNetBuildRepo=$product_build /p:DotNetBuildSourceOnly=$source_build $properties"
# TODO: Remove DotNetBuildRepo property when fsharp is on Arcade 10
local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto /p:DotNetBuildRepo=$product_build /p:DotNetBuild=$product_build /p:DotNetBuildSourceOnly=$source_build $properties"
echo $args
"$DOTNET_INSTALL_DIR/dotnet" $args #$args || exit $?
fi

if [[ "$skip_build" != true ]]; then
# do real build
BuildMessage="Error building solution"

# TODO: Remove DotNetBuildRepo property when fsharp is on Arcade 10
MSBuild $toolset_build_proj \
$bl \
/p:Configuration=$configuration \
Expand All @@ -314,6 +317,7 @@ function BuildSolution {
/p:QuietRestoreBinaryLog="$binary_log" \
/p:BuildNoRealsig=$buildnorealsig \
/p:DotNetBuildRepo=$product_build \
/p:DotNetBuild=$product_build \
/p:DotNetBuildSourceOnly=$source_build \
$properties
fi
Expand Down
Loading