Skip to content

Source build patches necessary for tarball build #35024

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

Jump to bottom
Merged
MichaelSimons merged 1 commit into from
Aug 5, 2021
Merged

Source build patches necessary for tarball build #35024

MichaelSimons merged 1 commit into from
Aug 5, 2021

Conversation

@MichaelSimons
Copy link
Member

@MichaelSimons MichaelSimons commented Aug 4, 2021

These are various changes needed while building aspnetcore within the source-build tarball. See dotnet/installer#11113 for context.

  1. Tweak CI to not build the RepoTasks in the "outer" build. This gets invoked within the "inner" source-build. This more accurately reflects how the source-build tarball build works. This will surface/catch more issues at the repo level.
  2. Capture the binaryLog while building RepoTasks for source-build.
  3. Update the RepoTasks' Microsoft.Extensions.DependencyModel reference to use the version specified in the versions.props file. This allows the RepoTasks to pickup the version that is source-built during source builds. This eliminates a pre-built.
  4. Refactor the GenerateFiles to run for source build. The generated props and target files are necessary for source build.

@MichaelSimons MichaelSimons requested a review from a team as a code owner August 4, 2021 01:41
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Aug 4, 2021
dseefeld
dseefeld reviewed Aug 4, 2021
View reviewed changes
eng/tools/GenerateFiles/GenerateFiles.csproj
<PropertyGroup>
<!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. -->
<TargetFramework>net5.0</TargetFramework>
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
Copy link

@dseefeld dseefeld Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this the default?

Copy link
Member Author

@MichaelSimons MichaelSimons Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, there is logic in the root Directory.Build.targets that sets this to true based on various conditions.

@MichaelSimons MichaelSimons merged commit 02dbcc0 into dotnet:main Aug 5, 2021
@ghost ghost added this to the 6.0-rc1 milestone Aug 5, 2021
@MichaelSimons MichaelSimons deleted the source-build-patches branch August 5, 2021 01:10
@MichaelSimons MichaelSimons mentioned this pull request Aug 5, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wtgodbe wtgodbe wtgodbe approved these changes

@JunTaoLuo JunTaoLuo Awaiting requested review from JunTaoLuo

+1 more reviewer

@dseefeld dseefeld dseefeld approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Milestone

6.0-rc1

Development

Successfully merging this pull request may close these issues.

3 participants

@MichaelSimons @dseefeld @wtgodbe