Skip to content

Commit 327d96c

Browse files
authored
source-build: don't use PublishReadyToRun on Mono-builds. (#17300)
Crossgen2 is not built with Mono-based .NET SDKs.
1 parent c41720f commit 327d96c

File tree

8 files changed

+14
-7
lines changed

8 files changed

+14
-7
lines changed

Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
<OtherFlags Condition="'$(BuildNoRealsig)' != 'true'">$(OtherFlags) --realsig+</OtherFlags>
3535
</PropertyGroup>
3636

37+
<PropertyGroup>
38+
<!-- Set PublishReadyToRun to speed up the build. -->
39+
<EnablePublishReadyToRun>true</EnablePublishReadyToRun>
40+
<!-- Crossgen2 is not built with source-built Mono-based .NET SDKs. -->
41+
<EnablePublishReadyToRun Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">false</EnablePublishReadyToRun>
42+
</PropertyGroup>
43+
3744
<Import Project="$(RepoRoot)/Directory.Build.props.user" Condition="Exists('$(RepoRoot)/Directory.Build.props.user')" />
3845

3946
<PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">

buildtools/AssemblyCheck/AssemblyCheck.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<PropertyGroup>
10-
<PublishReadyToRun>true</PublishReadyToRun>
10+
<PublishReadyToRun>$(EnablePublishReadyToRun)</PublishReadyToRun>
1111
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
1212
</PropertyGroup>
1313

buildtools/fslex/fslex.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<PublishReadyToRun>true</PublishReadyToRun>
11+
<PublishReadyToRun>$(EnablePublishReadyToRun)</PublishReadyToRun>
1212
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
1313
</PropertyGroup>
1414

buildtools/fsyacc/fsyacc.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<PublishReadyToRun>true</PublishReadyToRun>
11+
<PublishReadyToRun>$(EnablePublishReadyToRun)</PublishReadyToRun>
1212
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
1313
</PropertyGroup>
1414

eng/SourceBuild.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
-bl enables the binlogs for the tools and Proto builds, which make debugging failures here easier
4141
-->
4242
<Exec
43-
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg)"
43+
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime)"
4444
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
4545
EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" />
4646
</Target>

eng/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ function BuildSolution {
279279
fi
280280

281281
BuildMessage="Error building tools"
282-
local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto /p:ArcadeBuildFromSource=$source_build"
282+
local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto /p:ArcadeBuildFromSource=$source_build $properties"
283283
echo $args
284284
"$DOTNET_INSTALL_DIR/dotnet" $args #$args || exit $?
285285
fi

src/fsc/fscProject/fsc.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<PropertyGroup Condition="'$(Configuration)' == 'Proto'">
1212
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
13-
<PublishReadyToRun>true</PublishReadyToRun>
13+
<PublishReadyToRun>$(EnablePublishReadyToRun)</PublishReadyToRun>
1414
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
1515
</PropertyGroup>
1616

src/fsi/fsiProject/fsi.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<PropertyGroup Condition="'$(Configuration)' == 'Proto'">
1212
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
13-
<PublishReadyToRun>true</PublishReadyToRun>
13+
<PublishReadyToRun>$(EnablePublishReadyToRun)</PublishReadyToRun>
1414
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
1515
</PropertyGroup>
1616

0 commit comments

Comments
 (0)