Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make System.Transactions.Local trimmable on Windows #75176

Merged
merged 7 commits into from
Sep 9, 2022
Merged

Make System.Transactions.Local trimmable on Windows #75176

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f7ce68
Make System.Transactions.Local trimmable on Windows
eerhardt Sep 7, 2022
1a577f7
Leave the ILLink warning in the product code so app developers get a …
eerhardt Sep 7, 2022
5e7e286
Update src/libraries/System.Transactions.Local/src/System/Transaction…
eerhardt Sep 7, 2022
e8ee202
Add more DynamicDependencies to make trimming work
eerhardt Sep 7, 2022
b01ba13
PR feedback
eerhardt Sep 7, 2022
c909e17
Remove the DynamicDependencies attributes
eerhardt Sep 8, 2022
9dc116d
Fix x86 build. Move the ILLink suppression to a method that is comple…
eerhardt Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix x86 build. Move the ILLink suppression to a method that is comple… 
…tely trimmed on x86.
  • Loading branch information
@eerhardt
eerhardt committed Sep 9, 2022
commit 9dc116d70de757683ea8b72359a9cfa565bccb64
2 changes: 1 addition & 1 deletion src/libraries/System.Transactions.Local/src/ILLink/ILLink.Suppressions.LibraryBuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<argument>ILLink</argument>
<argument>IL2026</argument>
<property name="Scope">member</property>
<property name="Target">M:System.Transactions.DtcProxyShim.DtcProxyShimFactory.ConnectToProxy(System.String,System.Guid,System.Object,System.Boolean@,System.Byte[]@,System.Transactions.DtcProxyShim.ResourceManagerShim@)</property>
<property name="Target">M:System.Transactions.DtcProxyShim.DtcProxyShimFactory.ConnectToProxyCore(System.String,System.Guid,System.Object,System.Boolean@,System.Byte[]@,System.Transactions.DtcProxyShim.ResourceManagerShim@)</property>
<property name="Justification">This warning is left in the product so developers get an ILLink warning when trimming an app using this transaction support</property>
</attribute>
</assembly>
Expand Down
11 changes: 11 additions & 0 deletions ...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ public void ConnectToProxy(
throw new PlatformNotSupportedException(SR.DistributedNotSupportOn32Bits);
}

ConnectToProxyCore(nodeName, resourceManagerIdentifier, managedIdentifier, out nodeNameMatches, out whereabouts, out resourceManagerShim);
}

private void ConnectToProxyCore(
string? nodeName,
Guid resourceManagerIdentifier,
object managedIdentifier,
out bool nodeNameMatches,
out byte[] whereabouts,
out ResourceManagerShim resourceManagerShim)
{
lock (_proxyInitLock)
{
#pragma warning disable IL2026 // This warning is left in the product so developers get an ILLink warning when trimming an app using this transaction support
Expand Down