[Xamarin.MacDev] Fix computing DTSDKBuild. Fixes #xamarin/xamarin-macios@19733. #116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ios@19733. We were accidentally getting the ProductBuildVersion value (which is used for DTSDKBuild) from the system, not from the SDK used during the build. This happened because we were trying to Path.Combine two rooted paths - in which case Path.Combine returns the second path, without combining anything. The fix is to compute the path of the plist where the ProductBuildVersion value is located correctly. Fixing the Path.Combine issue also revealed that the first path passed to Path.Combine was wrong, so that got fixed too. And finally make sure we don't Path.Combine two rooted paths anywhere else - in all other cases we're supposed to just use the second path without prepending the first, so just remove the Path.Combine call completely in those cases. Fixes xamarin/xamarin-macios#19733.
dalexsoto
approved these changes
Jan 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We were accidentally getting the ProductBuildVersion value (which is used for
DTSDKBuild) from the system, not from the SDK used during the build.
This happened because we were trying to Path.Combine two rooted paths - in
which case Path.Combine returns the second path, without combining anything.
The fix is to compute the path of the plist where the ProductBuildVersion
value is located correctly.
Fixing the Path.Combine issue also revealed that the first path passed to
Path.Combine was wrong, so that got fixed too.
And finally make sure we don't Path.Combine two rooted paths anywhere else -
in all other cases we're supposed to just use the second path without
prepending the first, so just remove the Path.Combine call completely in those
cases.
Fixes xamarin/xamarin-macios#19733.