Support feature settings on descriptor files #1277
Merged
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
sbomer
force-pushed
the
featureDescriptors
branch
from
bc8dff0 to
7b81c4a
Compare
sbomer
force-pushed
the
featureDescriptors
branch
from
7b81c4a to
ae977ed
Compare
vitek-karas
approved these changes
Jun 17, 2020
test/Mono.Linker.Tests.Cases/FeatureSettings/Dependencies/ResourceFile.txt
Show resolved
Hide resolved
|
@tlakollo Could you please double check that we don't "return" from the attribute XML parser in places where we should "continue" instead? Also would be nice to add a test to validate at least one of those cases. |
Since they conflict with the --exclude-feature "feature" attributes in the descriptor XML.
marek-safar
approved these changes
Jun 17, 2020
This reverts commit 78c2f52.
To indicate that a substitution or descriptor should be applied in the absence of a feature setting. Note that this is restricted to still require the featurevalue attribute, to prevent the definition of default substitutions that are never applied for any feature settings. Also address PR feedback: - Move the feature checks into a separate class - #ifdef an implementation instead of callsites
vitek-karas
approved these changes
Jun 22, 2020
eerhardt
reviewed
Jun 22, 2020
marek-safar
approved these changes
Jun 22, 2020
Nothing interesting 😉 . Each element in the XML is independent. So if you want to have the same behavior between substitutions and descriptors, you'll need to specify the same thing twice. |
Sorry, I missed this question - thanks for answering it @vitek-karas |
Add comments about order of checking assemblyname and feature attributes, and make processing consistent in LinkAttributesStep.
tkapin
pushed a commit
to tkapin/runtime
that referenced
this pull request
Jan 31, 2023
* Support feature settings on descriptor files Fixes dotnet/linker#1268. * Disable feature descriptors for mono Since they conflict with the --exclude-feature "feature" attributes in the descriptor XML. * Revert "Disable feature descriptors for mono" This reverts commit dotnet/linker@78c2f52. * Support featuredefault="true" To indicate that a substitution or descriptor should be applied in the absence of a feature setting. Note that this is restricted to still require the featurevalue attribute, to prevent the definition of default substitutions that are never applied for any feature settings. Also address PR feedback: - Move the feature checks into a separate class - #ifdef an implementation instead of callsites * Fix signatures in tests * Update data format docs * Fix whitespace * PR feedback Add comments about order of checking assemblyname and feature attributes, and make processing consistent in LinkAttributesStep. * Clarify featuredefault behavior in documentation Commit migrated from dotnet/linker@f87cfa2
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.
Fixes #1268.