diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 146372ecde6..81ed2d6f698 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/Version.Details.xml b/eng/Version.Details.xml index 612b8e5a32f..df0bcdfd89f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/source-build-reference-packages diff --git a/eng/build.sh b/eng/build.sh index 53de7fda4c9..62a6a5193ac 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