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

Jump to bottom

Fix relative path for .dlls in publish directory #12434

Closed
wants to merge 1 commit into from
Closed

Fix relative path for .dlls in publish directory #12434

wants to merge 1 commit into from

Conversation

filipnavara
Copy link
Contributor

Fixes #12386 (and likely #12418)

@mandel-macaque
Copy link
Member

/azp run

@mandel-macaque mandel-macaque added the community Community contribution ❤ label Aug 13, 2021
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [PR Build] Tests passed on Build. ✅

Tests passed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

✅ API Diff (from PR only) (no change)
✅ Generator Diff (only version changes)

GitHub pages

Results can be found in the following github pages (it might take some time to publish):

🎉 All 129 tests passed 🎉

Pipeline on Agent XAMBOT-1104.BigSur'
Merge ae287b9 into 706f180

spouliot
spouliot reviewed Aug 16, 2021
View reviewed changes
Copy link
Contributor

@spouliot spouliot left a comment

Choose a reason for hiding this comment

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

seems incomplete
and we'll need some tests

dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -973,7 +973,7 @@
<!-- include .dll, .exe and, for debugging only, .pdb files inside the .app -->
<ResolvedFileToPublish
Update="@(ResolvedFileToPublish)"
RelativePath="$(_AssemblyPublishDir)\%(ResolvedFileToPublish.DestinationSubDirectory)\%(Filename)%(Extension)"
RelativePath="$(_AssemblyPublishDir)\%(ResolvedFileToPublish.RelativePath)"
Copy link
Contributor

Choose a reason for hiding this comment

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

c.c. @rolfbjarne

https://github.com/xamarin/xamarin-macios/pull/12333/files#diff-2e24f1b6f44df7580244d00f106fa1a9e2257536fbca9d7bbdc74571549324a9L952

I'm surprised this did not trigger any of our existing tests.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, this has been discussed a bit here: #12386 (comment)

For normal project references our logic works just fine, but the test case is setting CopyToOutputDirectory=PreserveNewest on None items, which is something we don't have tests for.

@rolfbjarne rolfbjarne added the do-not-merge Do not merge this pull request label Aug 16, 2021
@rolfbjarne
Copy link
Member

Adding the do-not-merge flag until we've figured out how we want to solve this issue (see #12386 for more info).

@filipnavara
Copy link
Contributor Author

Closing in favor of https://github.com/rolfbjarne/xamarin-macios/commits/issue-12386-bundlestructure-bundleresource-content

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spouliot spouliot spouliot left review comments

@rolfbjarne rolfbjarne Awaiting requested review from rolfbjarne

Assignees
No one assigned
Labels
community Community contribution ❤ do-not-merge Do not merge this pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[.NET 6] Files copies into MonoBundle get folder structure flattened
5 participants
@filipnavara @mandel-macaque @vs-mobiletools-engineering-service2 @rolfbjarne @spouliot