Make CharacterReader internal.
#19123
Merged
Conversation
This file contains hidden or 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
And by extension, make the static classes which define extension methods on it internal. To do this, I had to make Avalonia.Base's internals visible to Avalonia.Designer.HostApp, as that has a dependency on it, and exclude `StringCompatibilityExtensions` from there as the one from Avalonia.Base is now visible.
Exposing Avalonia.Base's internals to Avalonia.Designer.HostApp caused an issue with the dependency on `StringCompatibilityExtensions` - because the hostapp is loaded into the target app and `StringCompatibilityExtensions` is conditionally compiled, you ended up with it being loaded into an app which does not have `StringCompatibilityExtensions`. Instead, add `string` overloads of the internal APIs which take a `CharacterReader` so that they can be called even when `CharacterReader` isn't available.
|
You can test this PR using the following package version. |
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.
What does the pull request do?
Makes
Avalonia.Utilities.CharacterReaderinternal for v12 as theTODO12comment there suggests. By extension, make the static classes which define extension methods on it internal.To do this, I had to make Avalonia.Base's internals visible toAvalonia.Designer.HostApp, as that has a dependency on it, and excludeStringCompatibilityExtensionsfrom there as the one from Avalonia.Base is now visibleTo do this I had to add
stringoverloads to a few internal APIs which took aCharacterReaderinAvalonia.MarkupandAvalonia.Markup.Xaml- these assemblies have their internals exposed toAvalonia.Markup.Xaml.Loader.What is the current behavior?
There is a
TODO12comment onCharacterReadersaying to make it not public.What is the updated/expected behavior with this PR?
It is now not public.
Breaking changes
Code depending on
CharacterReaderor one of its extension methods will now fail to compile.