[One .NET] fix $(ApplicationId) and //manifest@package at the same time #6304
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
jonathanpeppers
requested review from
dellis1972 and
jonpryor
as code owners
dellis1972
approved these changes
Sep 17, 2021
jonpryor
reviewed
Sep 17, 2021
| using var stream = File.OpenRead (ManifestFile); | ||
| using var reader = XmlReader.Create (stream); | ||
| if (reader.MoveToContent () == XmlNodeType.Element) { | ||
| var package = reader.GetAttribute ("package"); | ||
| if (!string.IsNullOrEmpty (package)) { | ||
| package = ManifestDocument.ReplacePlaceholders (ManifestPlaceholders, package); | ||
| PackageName = AndroidAppManifest.CanonicalizePackageName (package); | ||
| } else if (!string.IsNullOrEmpty (PackageName)) { |
There was a problem hiding this comment.
Instead of this else if here, and the "duplicate" PackageName = … statement between the two blocks, why not remove this else if, and turn the else if on line 64 into an if?
There was a problem hiding this comment.
I moved it around, should be better now. I removed a CanonicalizePackageName() call as well, so it isn't called twice.
Fixes: xamarin#6302 If you try to use both `$(ApplicationId)` and `@package` in `AndroidManifest.xml` at the same time, you hit errors during deployment: Xamarin.Android.Common.Debugging.targets(611,5): error XA0132: The package was not installed. Please check you do not have it installed under any other user. If the package does show up on the device, try manually uninstalling it then try again. You should be able to uninstall the app via the Settings app on the device. From the spec, the `AndroidManifest.xml` is *supposed* to be preferred. I found the `<GetAndroidPackageName/>` MSBuild task is accidentally preferring the `$(ApplicationId)` MSBuild property. I reordered the logic and only use the property when no value is found in the `AndroidManifest.xml`. I could reproduce the issue in a test, which now passes.
jonathanpeppers
force-pushed
the
applicationid-and-androidmanifest
branch
from
32a7f5c
to
1095a3e
Compare
jonpryor
pushed a commit
that referenced
this pull request
Sep 22, 2021
Fixes: #6302 If you try to use both the `$(ApplicationId)` MSBuild property and the `/manifest/@package` attribute within `AndroidManifest.xml` at the same time, you hit errors during deployment: Xamarin.Android.Common.Debugging.targets(611,5): error XA0132: The package was not installed. Please check you do not have it installed under any other user. If the package does show up on the device, try manually uninstalling it then try again. You should be able to uninstall the app via the Settings app on the device. From the spec, the `AndroidManifest.xml` value is *supposed* to be preferred. I found that the `<GetAndroidPackageName/>` MSBuild task is accidentally preferring the `$(ApplicationId)` MSBuild property. I reordered the logic and only use the property when no value is found in the `AndroidManifest.xml`. I could reproduce the issue in a test, which now passes.
jonathanpeppers
added a commit
that referenced
this pull request
Sep 22, 2021
Fixes: #6302 If you try to use both the `$(ApplicationId)` MSBuild property and the `/manifest/@package` attribute within `AndroidManifest.xml` at the same time, you hit errors during deployment: Xamarin.Android.Common.Debugging.targets(611,5): error XA0132: The package was not installed. Please check you do not have it installed under any other user. If the package does show up on the device, try manually uninstalling it then try again. You should be able to uninstall the app via the Settings app on the device. From the spec, the `AndroidManifest.xml` value is *supposed* to be preferred. I found that the `<GetAndroidPackageName/>` MSBuild task is accidentally preferring the `$(ApplicationId)` MSBuild property. I reordered the logic and only use the property when no value is found in the `AndroidManifest.xml`. I could reproduce the issue in a test, which now passes.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes: #6302
If you try to use both
$(ApplicationId)and@packageinAndroidManifest.xmlat the same time, you hit errors duringdeployment:
From the spec, the
AndroidManifest.xmlis supposed to be preferred.I found the
<GetAndroidPackageName/>MSBuild task is accidentallypreferring the
$(ApplicationId)MSBuild property. I reordered thelogic and only use the property when no value is found in the
AndroidManifest.xml.I could reproduce the issue in a test, which now passes.