[Xamarin.Android.Build.Tasks] Fix Removal of Non Duplicate elements #856
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
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=59473 Commit d079a42 went a bit too far when removing duplicates. It removed ANY duplicate entry that appeared anywhere in the document. What we really wanted to remove full duplicates that exist at the same level as the current element in the document. For example ```xml <foo> <bar name="bar1"> <bar2 /> </bar> <bar name="bar2"> <bar2 /> </bar> <dupe/> <dupe/> </foo> ``` `bar2` should NOT be removed but one of the `dupe` values should. So this commit reworks the RemoveDuplicates code to handle the correct logic. It also adds a unit test for this exact senario.
|
build |
jonpryor
reviewed
Sep 14, 2017
| [IntentFilter (new[]{Intent.ActionMain}, Categories = new[]{ ""com.xamarin.sample"" })] | ||
| public class TestActivity1 : FragmentActivity { | ||
| } | ||
| ", |
There was a problem hiding this comment.
Aside: these lines full of whitespace are weird.
jonpryor
reviewed
Sep 14, 2017
| foreach (var e in elements) | ||
| foreach (var d in ResolveDuplicates (e.Elements ())) | ||
| yield return d; | ||
| foreach (var d in elements.GroupBy (x => x.ToFullString ()).SelectMany (x => x.Skip (1))) |
There was a problem hiding this comment.
I don't understand how this method works. :-(
This part appears to be identical to what's being removed, i.e. this fragment is "buggy" (hence it needing to be fixed in the first place). Presumably then, the above foreach (var e in elements) loop fixes the bug, but I don't understand how these separate loops interact.
Assuming that the foreach (var e in elements) ultimately yield 0 elements, we'd still have this loop, which is known to be buggy. If the foreach (var e in elements) does yield elements, that's just more elements to remove!
How's this work? It's blowing my mind. :-(
There was a problem hiding this comment.
The previous method used Descendants() which gets every single child element not just those that are immediate children. So given
<foo>
<bar>
<bug/>
</bar>
<dar>
<bug/>
</dar>
<too/>
<too/>
</foo>In the previous method both bug elements would be removed because Descendants() gets every element including all children. Elements() gets the elements that are children for this exact parent. So the new system will remove duplicates which exist at the same level and ONLY those that exist at the same level. So in the sample above the bug will be left as they are as they have different parent elements. But the too items will be removed as they have the same parent.
jonpryor
pushed a commit
that referenced
this pull request
Sep 14, 2017
…856) Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59473 Commit d079a42 went a bit too far when removing duplicates. It removed *any* duplicate entry that appeared anywhere in the document. What we really wanted to remove full duplicates that exist at the same level as the current element in the document. For example: ```xml <foo> <bar name="bar1"> <bar2 /> </bar> <bar name="bar2"> <bar2 /> </bar> <dupe/> <dupe/> </foo> ``` `<bar2/>` should *not* be removed but one of the `<dupe/>` values should. This commit reworks `RemoveDuplicates()` code to handle the correct logic. It also adds a unit test for this exact senario.
jonpryor
pushed a commit
to jonpryor/xamarin-android
that referenced
this pull request
Sep 14, 2017
…otnet#856) Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59473 Commit d079a42 went a bit too far when removing duplicates. It removed *any* duplicate entry that appeared anywhere in the document. What we really wanted to remove full duplicates that exist at the same level as the current element in the document. For example: ```xml <foo> <bar name="bar1"> <bar2 /> </bar> <bar name="bar2"> <bar2 /> </bar> <dupe/> <dupe/> </foo> ``` `<bar2/>` should *not* be removed but one of the `<dupe/>` values should. This commit reworks `RemoveDuplicates()` code to handle the correct logic. It also adds a unit test for this exact senario.
jonpryor
pushed a commit
that referenced
this pull request
Jul 21, 2021
Fixes: dotnet/java-interop#854 Changes: dotnet/installer@e8b3b6b...9c46371 % git diff --shortstat e8b3b6be...9c463710 103 files changed, 2301 insertions(+), 2757 deletions(-) Changes: dotnet/linker@a07cab7...460dd6d % git diff --shortstat a07cab7b...460dd6dd 84 files changed, 2403 insertions(+), 258 deletions(-) Changes: dotnet/runtime@02f70d0...96ce6b3 % git diff --shortstat 02f70d0b90...96ce6b3535 2586 files changed, 123677 insertions(+), 34433 deletions(-) Changes: dotnet/java-interop@a5ed891...4fb7c14 * dotnet/java-interop@4fb7c147: [build] set $(DisableImplicitNamespaceImports) by default (#859) * dotnet/java-interop@855ecfa3: [generator] Don't generate unexpected NRT types like `void?` (#856) * dotnet/java-interop@4a02bc32: Revert "[Xamarin.Android.Tools.Bytecode] hide nested types (#827)" (#855) * dotnet/java-interop@95c9b79d: [generator] Avoid 'error (…):' construct in diagnostic messages (#851) * dotnet/java-interop@7c4f7db0: [build] Bump to Mono with MSBuild 16.10 (#848) * dotnet/java-interop@0227cdae: [generator] Gracefully handle BindingGeneratorException. (#845) * dotnet/java-interop@ce1750fd: Add SECURITY.md (#846) Context: dotnet/runtime#55384 Context: dotnet/sdk#18639 Updates: * Microsoft.Dotnet.Sdk.Internal: from 6.0.100-preview.7.21327.2 to 6.0.100-rc.1.21369.3 * Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21322.1 to 6.0.100-preview.6.21366.2 * Microsoft.NETCore.App.Ref: from 6.0.0-preview.7.21326.8 to 6.0.0-rc.1.21368.1 dotnet/runtime#55384 broke how .NET 6 interacts with `AndroidClientHandler`. Fix this by introducing a new `Xamarin.Android.Net.AndroidMessageHandler` type for use on .NET 6, and update the .NET 6 `AndroidClientHandler` to delegate to `AndroidMessageHandler`. `AndroidMessageHandler` doesn't exist on Legacy. Update `.apkdesc` files: * `BuildReleaseArm64SimpleDotNet` is ~37KB smaller * `BuildReleaseArm64XFormsDotNet` is ~62KB larger. Update `tests/api-compatibility/api-compat-exclude-attributes.txt` so that `T:System.Runtime.CompilerServices.CompilerGeneratedAttribute` is ignored. `[CompilerGeneratedAttribute]` is emitted as part of C# 3 "auto-props": public T Property { get; set; } Converting this into a "real" property: T value; public T Property { get => value; set => this.value = value; } results in the `_CheckApiCompatibility` target complaining about an API break. We don't care; ignore `[CompilerGeneratedAttribute]`. Remove `$(SelfContained)` property: early on in .NET 5 (yes 5) development, the Xamarin.Android SDK needed to specify `$(SelfContained)` by default in order to produce `.apk` files. After we became a proper workload, setting the value became unnecessary. It also didn't actually do anything because dotnet/sdk overwrote the value. Starting in dotnet/sdk#18639, `Microsoft.NET.RuntimeIdentifierInference.targets` is now being imported *after* a workload, which meant that dotnet/sdk no longer overwrote our `$(SelfContained)` value, which broke things: error NETSDK1031: It is not supported to build or publish a self-contained application without specifying a RuntimeIdentifier. You must either specify a RuntimeIdentifier or set SelfContained to false. We can simply remove `$(SelfContained)` now, and rely on dotnet/sdk to set this value. Co-authored-by: Jonathan Peppers <[email protected]> Co-authored-by: Steve Pfister <[email protected]>
jonpryor
pushed a commit
that referenced
this pull request
Jul 21, 2021
Fixes: dotnet/java-interop#854 Changes: dotnet/installer@e8b3b6b...808795c % git diff --shortstat e8b3b6be...808795cc 102 files changed, 2218 insertions(+), 2674 deletions(-) Changes: dotnet/linker@a07cab7...9ecf5bd % git diff --shortstat a07cab7b...9ecf5bd2 81 files changed, 2122 insertions(+), 246 deletions(-) Changes: dotnet/runtime@02f70d0...8d3afa3 % git diff --shortstat 02f70d0b...8d3afa3a 2518 files changed, 122843 insertions(+), 33676 deletions(-) Changes: dotnet/java-interop@a5ed891...4fb7c14 * dotnet/java-interop@4fb7c147: [build] set $(DisableImplicitNamespaceImports) by default (#859) * dotnet/java-interop@855ecfa3: [generator] Don't generate unexpected NRT types like `void?` (#856) * dotnet/java-interop@4a02bc32: Revert "[Xamarin.Android.Tools.Bytecode] hide nested types (#827)" (#855) * dotnet/java-interop@95c9b79d: [generator] Avoid 'error (…):' construct in diagnostic messages (#851) * dotnet/java-interop@7c4f7db0: [build] Bump to Mono with MSBuild 16.10 (#848) * dotnet/java-interop@0227cdae: [generator] Gracefully handle BindingGeneratorException. (#845) * dotnet/java-interop@ce1750fd: Add SECURITY.md (#846) Context: dotnet/runtime#55384 Context: dotnet/sdk#18639 Updates: * Microsoft.Dotnet.Sdk.Internal: from 6.0.100-preview.7.21327.2 to 6.0.100-preview.7.21369.5 * Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21322.1 to 6.0.100-preview.6.21365.1 * Microsoft.NETCore.App.Ref: from 6.0.0-preview.7.21326.8 to 6.0.0-preview.7.21368.2 dotnet/runtime#55384 broke how .NET 6 interacts with `AndroidClientHandler`. Fix this by introducing a new `Xamarin.Android.Net.AndroidMessageHandler` type for use on .NET 6, and update the .NET 6 `AndroidClientHandler` to delegate to `AndroidMessageHandler`. `AndroidMessageHandler` doesn't exist on Legacy. Update `.apkdesc` files: * `BuildReleaseArm64SimpleDotNet` is ~37KB smaller * `BuildReleaseArm64XFormsDotNet` is ~62KB larger. Update `tests/api-compatibility/api-compat-exclude-attributes.txt` so that `T:System.Runtime.CompilerServices.CompilerGeneratedAttribute` is ignored. `[CompilerGeneratedAttribute]` is emitted as part of C# 3 "auto-props": public T Property { get; set; } Converting this into a "real" property: T value; public T Property { get => value; set => this.value = value; } results in the `_CheckApiCompatibility` target complaining about an API break. We don't care; ignore `[CompilerGeneratedAttribute]`. Remove `$(SelfContained)` property: early on in .NET 5 (yes 5) development, the Xamarin.Android SDK needed to specify `$(SelfContained)` by default in order to produce `.apk` files. After we became a proper workload, setting the value became unnecessary. It also didn't actually do anything because dotnet/sdk overwrote the value. Starting in dotnet/sdk#18639, `Microsoft.NET.RuntimeIdentifierInference.targets` is now being imported *after* a workload, which meant that dotnet/sdk no longer overwrote our `$(SelfContained)` value, which broke things: error NETSDK1031: It is not supported to build or publish a self-contained application without specifying a RuntimeIdentifier. You must either specify a RuntimeIdentifier or set SelfContained to false. We can simply remove `$(SelfContained)` now, and rely on dotnet/sdk to set this value. Co-authored-by: Jonathan Peppers <[email protected]> Co-authored-by: Steve Pfister <[email protected]>
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 https://bugzilla.xamarin.com/show_bug.cgi?id=59473
Commit d079a42 went a bit too far when removing duplicates.
It removed ANY duplicate entry that appeared anywhere in the
document. What we really wanted to remove full duplicates that
exist at the same level as the current element in the document.
For example
bar2should NOT be removed but one of thedupevalues should.So this commit reworks the RemoveDuplicates code to handle the
correct logic. It also adds a unit test for this exact senario.