Skip to content

Commit 79ced2b

Browse files
T-Grodotnet-maestro[bot]ViktorHofer
authored
[release/dev18.0] Source code updates from dotnet/dotnet (#18604)
* [VMR] Codeflow 13ad646-13ad646 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 269418 No dependency updates to commit * 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) * 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) * Update DotNetBuild.props * [VMR] Codeflow f5705c8-b53264c [[ commit created by automation ]] * 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) * 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) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
2 parents ed442a6 + b385d09 commit 79ced2b

File tree

7 files changed

+21
-12
lines changed

7 files changed

+21
-12
lines changed

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
99
<FSharpNetCoreProductDefaultTargetFramework>net9.0</FSharpNetCoreProductDefaultTargetFramework>
1010
<IgnoreMibc Condition="'$(IgnoreMibc)' == ''">$(DotNetBuildSourceOnly)</IgnoreMibc>
11-
<!-- When building in the VMR, we never need to publish Windows PDBs. Any conversion to Windows PDBs will be done during staging if necessary. -->
12-
<PublishWindowsPdb Condition="'$(DotNetBuildOrchestrator)' == 'true'">false</PublishWindowsPdb>
11+
<!-- When building the .NET product, there's no need to publish Windows PDBs. Any conversion to Windows PDBs will be done during staging, if necessary. -->
12+
<PublishWindowsPdb Condition="'$(DotNetBuild)' == 'true'">false</PublishWindowsPdb>
1313
</PropertyGroup>
1414

1515
<!--
@@ -74,7 +74,7 @@
7474
we should also support $(NetPrevious) for all releases.
7575
This will likely include FCS and FSharp.Core as well as shipped products.
7676
Right now, it only covers products we ship (FSC and FSI), not NuGet packages. -->
77-
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' == 'true'">
77+
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' == 'true'">
7878
<PropertyGroup>
7979
<FSharpNetCoreProductTargetFramework>$(NetCurrent)</FSharpNetCoreProductTargetFramework>
8080
</PropertyGroup>

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414

1515
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
16-
time "$scriptroot/eng/build.sh" --build --restore $@
16+
time "$scriptroot/eng/build.sh" --build --restore "$@"

eng/Build.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ param (
6969
[string]$officialSkipTests = "false",
7070
[switch]$noVisualStudio,
7171
[switch][Alias('pb')]$productBuild,
72+
[switch]$fromVMR,
7273
[switch]$skipBuild,
7374
[switch]$compressAllMetadata,
7475
[switch]$buildnorealsig = $true,
@@ -134,6 +135,7 @@ function Print-Usage() {
134135
Write-Host " -dontUseGlobalNuGetCache Do not use the global NuGet cache"
135136
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
136137
Write-Host " -productBuild Build the repository in product-build mode."
138+
Write-Host " -fromVMR Set when building from within the VMR."
137139
Write-Host " -skipbuild Skip building product"
138140
Write-Host " -compressAllMetadata Build product with compressed metadata"
139141
Write-Host " -buildnorealsig Build product with realsig- (default use realsig+, where necessary)"
@@ -304,6 +306,7 @@ function BuildSolution([string] $solutionName, $packSolution) {
304306
/p:Build=$build `
305307
/p:DotNetBuildRepo=$productBuild `
306308
/p:DotNetBuild=$productBuild `
309+
/p:DotNetBuildFromVMR=$fromVMR `
307310
/p:Rebuild=$rebuild `
308311
/p:Pack=$pack `
309312
/p:Sign=$sign `

eng/DotNetBuild.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
-bl enables the binlogs for the tools and Proto builds, which make debugging failures here easier
2929
-->
3030
<Exec
31-
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) $(SourceBuildBootstrapRestoreConfigFileArg) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=$(DotNetBuildOrchestrator)"
31+
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) $(SourceBuildBootstrapRestoreConfigFileArg) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true"
3232
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
3333
EnvironmentVariables="@(InnerBuildEnv)" />
3434
</Target>

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="a4d6fdc935d5da12efb00a0b3b693ff1439e0b41" BarId="269082" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d" BarId="269724" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25223.3">
66
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

eng/build.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ usage()
3737
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3838
echo " --sourceBuild Build the repository in source-only mode."
3939
echo " --productBuild Build the repository in product-build mode."
40+
echo " --fromVMR Set when building from within the VMR"
4041
echo " --buildnorealsig Build product with realsig- (default use realsig+ where necessary)"
4142
echo " --tfm Override the default target framework"
4243
echo ""
@@ -75,8 +76,9 @@ skip_build=false
7576
prepare_machine=false
7677
source_build=false
7778
product_build=false
79+
from_vmr=false
7880
buildnorealsig=true
79-
properties=""
81+
properties=()
8082

8183
docker=false
8284
args=""
@@ -170,6 +172,9 @@ while [[ $# > 0 ]]; do
170172
--productbuild|--product-build|-pb)
171173
product_build=true
172174
;;
175+
--fromvmr|--from-vmr)
176+
from_vmr=true
177+
;;
173178
--buildnorealsig)
174179
buildnorealsig=true
175180
;;
@@ -178,7 +183,7 @@ while [[ $# > 0 ]]; do
178183
shift
179184
;;
180185
/p:*)
181-
properties="$properties $1"
186+
properties+=("$1")
182187
;;
183188
*)
184189
echo "Invalid argument: $1"
@@ -290,9 +295,9 @@ function BuildSolution {
290295

291296
BuildMessage="Error building tools"
292297
# TODO: Remove DotNetBuildRepo property when fsharp is on Arcade 10
293-
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"
298+
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[@]}"})
294299
echo $args
295-
"$DOTNET_INSTALL_DIR/dotnet" $args #$args || exit $?
300+
"$DOTNET_INSTALL_DIR/dotnet" "${args[@]}" #$args || exit $?
296301
fi
297302

298303
if [[ "$skip_build" != true ]]; then
@@ -319,7 +324,8 @@ function BuildSolution {
319324
/p:DotNetBuildRepo=$product_build \
320325
/p:DotNetBuild=$product_build \
321326
/p:DotNetBuildSourceOnly=$source_build \
322-
$properties
327+
/p:DotNetBuildFromVMR=$from_vmr \
328+
${properties[@]+"${properties[@]}"}
323329
fi
324330
}
325331

proto.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
The project does not import Arcade targets so we only have the properties that were passed in, rather than
99
calculated properties like DotNetBuildPhase. -->
1010
<!-- TODO: Remove this condition when fsharp upgraded to Arcade 10 -->
11-
<ItemGroup Condition="'$(DotNetBuildOrchestrator)' == 'true' or '$(DotNetBuildSourceOnly)' != 'true' or '$(DotNetBuildInnerRepo)' == 'true'">
11+
<ItemGroup Condition="'$(DotNetBuildFromVMR)' == 'true' or '$(DotNetBuildSourceOnly)' != 'true' or '$(DotNetBuildInnerRepo)' == 'true'">
1212
<Projects Include="buildtools\fslex\fslex.fsproj" />
1313
<Projects Include="buildtools\fsyacc\fsyacc.fsproj" />
1414
<Projects Include="buildtools\AssemblyCheck\AssemblyCheck.fsproj" />

0 commit comments

Comments
 (0)