Make System.Transactions.Local trimmable on Windows #75176
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
eerhardt
requested review from
roji,
jkotas,
vitek-karas and
AaronRobinsonMSFT
jkotas
reviewed
Sep 7, 2022
...raries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
Outdated
Show resolved
Hide resolved
eerhardt
commented
Sep 7, 2022
...raries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
Outdated
Show resolved
Hide resolved
jkotas
approved these changes
Sep 7, 2022
roji
approved these changes
Sep 7, 2022
roji
reviewed
Sep 7, 2022
...raries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
Outdated
Show resolved
Hide resolved
Add the necessary DynamicDependency attributes to System.Transaction.Local in order for it to work with trimming on Windows. Also fix the UnconditionalSuppressMessage attribute to have a valid justification for suppressing, now that we are preserving the necessary interfaces for COM Interop. Fix dotnet#75031
…warning that Distributed transactions don't work with trimming.
…s/DtcProxyShim/DtcProxyShimFactory.cs
- Complete the list of all transaction interfaces - Sort the DynamicDependencies - Update the trim warning message
This gives a better message to users that distributed transactions don't work with trimming.
|
@vitek-karas @jkurdek - how do I fix the trimming error? Don't I need a |
|
It's because of this: if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
{
throw new PlatformNotSupportedException(SR.DistributedNotSupportOn32Bits);
}The constant prop/branch removal will effectively remove the rest of the method on X86, and thus the suppression is considered redundant because the code it relates to isn't there anymore. This is a known limitation of the redundant suppression detection - it doesn't work correctly with branch removal (it sees the code after branch removal). There were 2 or 3 other places where we hit this in the runtime. The workaround is to extract the rest of the method after the if into a separate method and point the suppression to that. On X86 that new method will be completely removed and there won't be any warnings (the redundant suppression detection doesn't trigger on unmarked methods at all). |
…tely trimmed on x86.
|
Test failure is #490. |
eerhardt
added a commit
to eerhardt/runtime
that referenced
this pull request
Sep 9, 2022
* Make System.Transactions.Local trimmable on Windows Remove `IsTrimmable=false` from the project, so this assembly is still trimmed with `partial` trimming on Windows. Add a "LibraryBuild" ILLink warning, so when the distributed transaction code is not trimmed, the app developer gets a warning that it is not guaranteed to work. Fix dotnet#75031 * Fix x86 build. Move the ILLink suppression to a method that is completely trimmed on x86.
carlossanlop
pushed a commit
that referenced
this pull request
Sep 12, 2022
* Make System.Transactions.Local trimmable on Windows Remove `IsTrimmable=false` from the project, so this assembly is still trimmed with `partial` trimming on Windows. Add a "LibraryBuild" ILLink warning, so when the distributed transaction code is not trimmed, the app developer gets a warning that it is not guaranteed to work. Fix #75031 * Fix x86 build. Move the ILLink suppression to a method that is completely trimmed on x86.
ghost
locked as resolved and limited conversation to collaborators
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.
Remove
IsTrimmable=falsefrom the project, so this assembly is still trimmed withpartialtrimming on Windows.Add a "LibraryBuild" ILLink warning, so when the distributed transaction code is not trimmed, the app developer gets a warning that it is not guaranteed to work.
Fix #75031
The full, correct fix here would be to use COMWrappers. However, #75031 (comment) indicates that level of investment isn't justified at this time. So using a temporary approach for now.