From c83c6e2091ec85cdbc5805a36b5dde9347e20f77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 May 2025 02:03:49 +0000 Subject: [PATCH 1/8] [VMR] Codeflow 13ad646-13ad646 [[ commit created by automation ]] --- Directory.Build.props | 6 +++--- build.sh | 2 +- eng/Build.ps1 | 5 +++++ eng/DotNetBuild.props | 2 +- eng/build.sh | 20 +++++++++++++++----- proto.proj | 2 +- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7d0c0c60b48..93391b5b776 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,8 +8,8 @@ true net9.0 $(DotNetBuildSourceOnly) - - false + + false - + $(NetCurrent) diff --git a/build.sh b/build.sh index ed7dcb1de39..a8c0c9d6a29 100755 --- a/build.sh +++ b/build.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -time "$scriptroot/eng/build.sh" --build --restore $@ +time "$scriptroot/eng/build.sh" --build --restore "$@" diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 146372ecde6..33028b8c788 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -69,6 +69,7 @@ param ( [string]$officialSkipTests = "false", [switch]$noVisualStudio, [switch][Alias('pb')]$productBuild, + [switch]$fromVMR, [switch]$skipBuild, [switch]$compressAllMetadata, [switch]$buildnorealsig = $true, @@ -134,6 +135,7 @@ function Print-Usage() { Write-Host " -dontUseGlobalNuGetCache Do not use the global NuGet cache" Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported." Write-Host " -productBuild Build the repository in product-build mode." + Write-Host " -fromVMR Set when building from within the VMR." Write-Host " -skipbuild Skip building product" Write-Host " -compressAllMetadata Build product with compressed metadata" Write-Host " -buildnorealsig Build product with realsig- (default use realsig+, where necessary)" @@ -294,6 +296,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 +305,8 @@ function BuildSolution([string] $solutionName, $packSolution) { /p:Restore=$restore ` /p:Build=$build ` /p:DotNetBuildRepo=$productBuild ` + /p:DotNetBuild=$productBuild ` + /p:DotNetBuildFromVMR=$fromVMR ` /p:Rebuild=$rebuild ` /p:Pack=$pack ` /p:Sign=$sign ` diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index 78286b23bab..4c243eff3e8 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -28,7 +28,7 @@ -bl enables the binlogs for the tools and Proto builds, which make debugging failures here easier --> diff --git a/eng/build.sh b/eng/build.sh index 53de7fda4c9..7d7214bffab 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -37,6 +37,7 @@ usage() echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo " --sourceBuild Build the repository in source-only mode." echo " --productBuild Build the repository in product-build mode." + echo " --fromVMR Set when building from within the VMR" echo " --buildnorealsig Build product with realsig- (default use realsig+ where necessary)" echo " --tfm Override the default target framework" echo "" @@ -75,8 +76,9 @@ skip_build=false prepare_machine=false source_build=false product_build=false +from_vmr=false buildnorealsig=true -properties="" +properties=() docker=false args="" @@ -170,6 +172,9 @@ while [[ $# > 0 ]]; do --productbuild|--product-build|-pb) product_build=true ;; + --fromvmr|--from-vmr) + from_vmr=true + ;; --buildnorealsig) buildnorealsig=true ;; @@ -178,7 +183,7 @@ while [[ $# > 0 ]]; do shift ;; /p:*) - properties="$properties $1" + properties+=("$1") ;; *) echo "Invalid argument: $1" @@ -289,14 +294,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" "/p:DotNetBuildFromVMR=$from_vmr" "${properties[@]}") echo $args - "$DOTNET_INSTALL_DIR/dotnet" $args #$args || exit $? + "$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 \ @@ -314,8 +322,10 @@ function BuildSolution { /p:QuietRestoreBinaryLog="$binary_log" \ /p:BuildNoRealsig=$buildnorealsig \ /p:DotNetBuildRepo=$product_build \ + /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ - $properties + /p:DotNetBuildFromVMR=$from_vmr \ + "${properties[@]}" fi } diff --git a/proto.proj b/proto.proj index 69497f54883..d3355d8ae96 100644 --- a/proto.proj +++ b/proto.proj @@ -8,7 +8,7 @@ The project does not import Arcade targets so we only have the properties that were passed in, rather than calculated properties like DotNetBuildPhase. --> - + From 66f3cd7c33e3961ad1fdf55a4900768ec1a1e5d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 May 2025 02:03:49 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/dotnet build 269418 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 612b8e5a32f..524a4b40605 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages From 84185e9d8355239262add97a0441b158e8c27061 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 May 2025 02:02:27 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/dotnet build 269499 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 524a4b40605..c181982a787 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages From b30db0be2b4ef2348bc57626048899db47032d88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 May 2025 02:03:39 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/dotnet build 269610 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 c181982a787..c385c487198 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages From c342e82a02d57a5f60cac0ce54ae282882ec2960 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 27 May 2025 12:22:39 +0200 Subject: [PATCH 5/8] Update DotNetBuild.props --- eng/DotNetBuild.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index 4c243eff3e8..b78d9712948 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -28,7 +28,7 @@ -bl enables the binlogs for the tools and Proto builds, which make debugging failures here easier --> From b1f6a489953e519d7500a8ed513261944dfb9ee9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 May 2025 12:19:58 +0000 Subject: [PATCH 6/8] [VMR] Codeflow f5705c8-b53264c [[ commit created by automation ]] --- eng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index 7d7214bffab..f919619ff88 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -295,7 +295,7 @@ function BuildSolution { BuildMessage="Error building tools" # 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" "/p:DotNetBuildFromVMR=$from_vmr" "${properties[@]}") + local args=("publish" "$repo_root/proto.proj" "$blrestore" "$bltools" "/p:Configuration=Proto" "/p:DotNetBuildRepo=$product_build" "/p:DotNetBuild=$product_build" "/p:DotNetBuildSourceOnly=$source_build" "/p:DotNetBuildFromVMR=$from_vmr" ${properties[@]+"${properties[@]}"}) echo $args "$DOTNET_INSTALL_DIR/dotnet" "${args[@]}" #$args || exit $? fi @@ -325,7 +325,7 @@ function BuildSolution { /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ /p:DotNetBuildFromVMR=$from_vmr \ - "${properties[@]}" + ${properties[@]+"${properties[@]}"} fi } From a76dbcdaa5b0c4b44639471d02c054f57cd32898 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 May 2025 12:19:58 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/dotnet build 269628 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 c385c487198..0394fdc9750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages From b385d098d1bb31b612a0c5a93071098119f337d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 May 2025 02:05:44 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/dotnet build 269724 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 0394fdc9750..f68624a4cd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages