From b70a4395e64401ca6b527d3d90b9c5e08a50ec5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 May 2025 02:04:15 +0000 Subject: [PATCH 1/6] [VMR] Codeflow ad85650-604dfc7 [[ commit created by automation ]] --- eng/Build.ps1 | 2 ++ eng/build.sh | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 146372ecde..81ed2d6f69 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -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 ` @@ -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 ` diff --git a/eng/build.sh b/eng/build.sh index 53de7fda4c..62a6a5193a 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -289,7 +289,8 @@ 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 @@ -297,6 +298,8 @@ function BuildSolution { 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 \ @@ -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 From e3ddd6bb2ec9c65340c5dba099c0ef601fafd972 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 May 2025 02:04:16 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/dotnet build 268651 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 612b8e5a32..78cfeba082 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages From 5c2d804044777c8b687bc5465448c0c97cbc60be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 18 May 2025 02:02:44 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/dotnet build 268722 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78cfeba082..3db0b3d703 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages From 9b8d74bf79a8e095f65eee83fd198562dd7093cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 May 2025 02:03:56 +0000 Subject: [PATCH 4/6] [VMR] Codeflow 665b1f1-665b1f1 [[ commit created by automation ]] From d76ad8ff1fc515e8581db35338cd2b41fc1a7d61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 May 2025 02:03:56 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/dotnet build 268973 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3db0b3d703..daa9fe3af1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages From 6de6ce2df884efa4005265b0b5b7d90a4a720600 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 May 2025 02:06:19 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/dotnet build 269082 Removed Dependencies: Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3) Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01) optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2) --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index daa9fe3af1..df0bcdfd89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages