Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass restore config file arg to bootstrap build #18260

Merged
merged 8 commits into from
Jan 23, 2025
+2 −1
Merged

Pass restore config file arg to bootstrap build #18260

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4710e3
Versioning for 17.14 and 9.0.300 (#18222)
vzarytovskii Jan 9, 2025
a4aacd7
Merge branch 'release/dev17.14' into merges/main-to-release/dev17.14
psfinaki Jan 20, 2025
3981d81
Merge pull request #18244 from dotnet/merges/main-to-release/dev17.14
psfinaki Jan 20, 2025
f759d6d
Merge pull request #18249 from dotnet/merges/main-to-release/dev17.14
psfinaki Jan 20, 2025
60e8032
Merge branch 'release/dev17.14' into merges/main-to-release/dev17.14
vzarytovskii Jan 20, 2025
4c4ddfd
Merge pull request #18251 from dotnet/merges/main-to-release/dev17.14
0101 Jan 21, 2025
7abe97c
Merge pull request #18258 from dotnet/merges/main-to-release/dev17.14
psfinaki Jan 22, 2025
47ea34d
Pass restore config file arg to bootstrap build
mmitche Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<PropertyGroup>
<SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
<DotNetBuildUseMonoRuntime Condition="'$(DotNetBuildUseMonoRuntime)' == ''">false</DotNetBuildUseMonoRuntime>
<SourceBuildBootstrapRestoreConfigFileArg Condition="'$(RestoreConfigFile)' != ''" >/p:RestoreConfigFile=$(RestoreConfigFile)</SourceBuildBootstrapRestoreConfigFileArg>
</PropertyGroup>

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