Skip to content

Commit e49b91f

Browse files
authored
Rename SourceBuildUseMonoRuntime property, which is not SB specific (#17778)
This is a coordinated cross-repo change, and might break the build until all four PRs are merged. The other three are: Ref: dotnet/source-build#4165
1 parent 3159664 commit e49b91f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!-- Set PublishReadyToRun to speed up the build. -->
4545
<EnablePublishReadyToRun>true</EnablePublishReadyToRun>
4646
<!-- Crossgen2 is not built with source-built Mono-based .NET SDKs. -->
47-
<EnablePublishReadyToRun Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">false</EnablePublishReadyToRun>
47+
<EnablePublishReadyToRun Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</EnablePublishReadyToRun>
4848
</PropertyGroup>
4949

5050
<Import Project="$(RepoRoot)/Directory.Build.props.user" Condition="Exists('$(RepoRoot)/Directory.Build.props.user')" />

eng/DotNetBuild.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<PropertyGroup>
3232
<SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
33-
<SourceBuildUseMonoRuntime Condition="'$(SourceBuildUseMonoRuntime)' == ''">false</SourceBuildUseMonoRuntime>
33+
<DotNetBuildUseMonoRuntime Condition="'$(DotNetBuildUseMonoRuntime)' == ''">false</DotNetBuildUseMonoRuntime>
3434
</PropertyGroup>
3535

3636
<!-- this runs the source-build bootstrap path as described in https://github.com/dotnet/fsharp/blob/95df49e380ea8dbf33653fa4209f89dba29413f5/eng/build.sh#L247
@@ -41,7 +41,7 @@
4141
-bl enables the binlogs for the tools and Proto builds, which make debugging failures here easier
4242
-->
4343
<Exec
44-
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=$(DotNetBuildOrchestrator)"
44+
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=$(DotNetBuildOrchestrator)"
4545
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
4646
EnvironmentVariables="@(InnerBuildEnv)" />
4747
</Target>

0 commit comments

Comments
 (0)