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.

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

Use asset manifests exclusively to produce/consume previously source built artifacts #40745

Merged
merged 10 commits into from
May 8, 2024

Conversation

jkoritzinsky
Copy link
Member

Update the consumption of the previously source-built artifacts and the production of the PackageVersions.props to insert into the bootstrap tarball to both be produced from asset manifests.
 
This allows us to remove the split in the logic between either using the asset manifests or cracking open NuGet packages.

This is a rebased/cleaned up version of dotnet/installer#19585

@@ -153,7 +157,7 @@

<!-- Repack tarball with new bootstrap name -->
<Message Text=" Repacking tarball to $(NewTarballName)" Importance="High" />
<Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
<Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props *.xml SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
Copy link
Member

Choose a reason for hiding this comment

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

Should the .xml glob also be more specific?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wanted to follow the existing pattern, so I did the same thing we do with PackageVersions.props (use a glob). I'd rather leave it that way and clean up both in the future than have one do one thing and another do something different.

@ViktorHofer
Copy link
Member

The sdk-unified-build test failure is unrelated and will go away when you update your branch to target latest main.

@ViktorHofer
Copy link
Member

Filed dotnet/source-build#4390 for the sdk-unified-build failure

@jkoritzinsky jkoritzinsky requested a review from a team as a code owner May 8, 2024 17:19
@jkoritzinsky jkoritzinsky merged commit a8fc576 into dotnet:main May 8, 2024
24 checks passed
@jkoritzinsky jkoritzinsky deleted the sb-prev branch May 8, 2024 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants