Skip to content

Commit c4d36d6

Browse files
mmitchevzarytovskiipsfinaki0101
authored
Pass restore config file arg to bootstrap build (#18260)
* Versioning for 17.14 and 9.0.300 (#18222) * Pass restore config file arg to bootstrap build --------- Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: Petr <[email protected]> Co-authored-by: Petr Pokorny <[email protected]>
1 parent 2d6b138 commit c4d36d6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

eng/DotNetBuild.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<PropertyGroup>
3232
<SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
3333
<DotNetBuildUseMonoRuntime Condition="'$(DotNetBuildUseMonoRuntime)' == ''">false</DotNetBuildUseMonoRuntime>
34+
<SourceBuildBootstrapRestoreConfigFileArg Condition="'$(RestoreConfigFile)' != ''" >/p:RestoreConfigFile=$(RestoreConfigFile)</SourceBuildBootstrapRestoreConfigFileArg>
3435
</PropertyGroup>
3536

3637
<!-- this runs the source-build bootstrap path as described in https://github.com/dotnet/fsharp/blob/95df49e380ea8dbf33653fa4209f89dba29413f5/eng/build.sh#L247
@@ -41,7 +42,7 @@
4142
-bl enables the binlogs for the tools and Proto builds, which make debugging failures here easier
4243
-->
4344
<Exec
44-
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=$(DotNetBuildOrchestrator)"
45+
Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) $(SourceBuildBootstrapRestoreConfigFileArg) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=$(DotNetBuildOrchestrator)"
4546
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
4647
EnvironmentVariables="@(InnerBuildEnv)" />
4748
</Target>

0 commit comments

Comments
 (0)