-
Notifications
You must be signed in to change notification settings - Fork 446
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.
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
Enable Windows Build in the VMR #18214
Conversation
4dbb656
to
5a1ff89
Compare
5a1ff89
to
6b31f20
Compare
... and simplify the Arcade Build.props extension point. Move the build.proj source build logic into an extra targets file so that infrastructure can be conditioned and then imported once.
... and set default properties that are true for source-build.
…to Versions.props
…ization) ... in Directory.Build.props and Directory.Build.targets in the repo root and under repo-projects
6b31f20
to
3f980aa
Compare
Co-authored-by: Matt Thalman <[email protected]>
Co-authored-by: Matt Thalman <[email protected]>
... and make the Windows build use the same package cache as build.sh
... the orchestrator ones are usually stale
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lots of nice clean-up - thanks. IMO it would have been a lot easier to review and you would get better feedback had this been split apart into more incremental PRs.
My main feedback/question is the use of previous source-build artifacts in non-source-only builds. IMO we should be building with the previous artifacts all of the time.
Have you validated an offline build? After seeing the changes, I feel like this is warranted.
|
||
<Target Name="UnpackTarballs" | ||
Condition="'$(DotNetBuildFromSource)' == 'true'" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why run this (and others like ExtractToolPackage) only running in source only builds? I was of the opinion all builds should be building with n-1. This helps ensure consistency across the build types.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I talked about this with @mmitche offline. We believe that this requires a separate discussion as we don't see this as a goal for the UB effort right now. We don't have a separate "previously built from the VMR" registry aside from nuget.org and the SDK and it's not clear to us why we would want one. Condition this logic out for non source built is the tactical fix here to make progress on the non source built lanes. Let's have this discussion in our next sync meeting.
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildFromSource)' == 'true'">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'ArcadeBootstrapPackage'))</ArcadeBootstrapPackageDir> | ||
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildFromSource)' != 'true'">$(NuGetPackageRoot)</ArcadeBootstrapPackageDir> | ||
|
||
<!-- Collapsed output and intermediate path folders that are architecture and configuration specific. --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't get the meaning of collapsed here. Can you help me understand?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe "flat" better transports the meaning? Collapsed here means that multiple projects/repos write into this folder. In msbuild, intermediate output and output paths exist and are isolated per project.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the explanation. flat
doesn't help much IMO. Would shared
make sense?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No major issues here. Some comments but nothing blocking
Thanks for the review and the points that you bring up. I will submit a follow-up to clean the things up that you and others mentioned and file issues for items that require more discussion or are entirely unrelated to this PR. I tried to submit as many separate PRs as possible during the Windows PoC work (remember the random 10+ PRs that went into installer over the last weeks). Still, at some point I had to rely on previously established work from the PoC that wasn't easy to bring over without a large amount of work on my side (untangling those changes would have been very hard as we pushed ~200 commits). That said, I'm quite happy with the review that I got and feel that the changes are well tested and reviewed.
Yes I did a stage 1 and stage 2 built and both of those were offline builds. As I didn't see any blocking feedback I'm going to merge this PR in now and will submit a follow-up change with clean-up and open tracking issues for other things that came up. Thanks everyone for the feedback. |
Contributes to dotnet/source-build#3706, dotnet/source-build#3786, dotnet/source-build#2974
Fixes dotnet/source-build#3677, dotnet/source-build#3682, dotnet/source-build#3783
Code comes from dotnet/dotnet#46. I didn't port all commits over as many of those don't make sense anymore and cleaning them up would have been too much work. Instead I brought the changes over and then grouped them into logical units.
Validation: CI & locally (Stage 1 and stage 2 builds succeeded locally on Ubuntu 22.04 with node 20.x installed)
Important for reviewers: The following changes are really hard to review and I suggest to skip them:
To summarize changes in those files:
BuildOS
,HostOS
,TargetOS
,BuildArchitecture
,HostArchitecture
andTargetArchitecture
.Kudos to @mmitche who is the co-author of these changes.