Skip to content

Commit e57af36

Browse files
kotlarmilosCopilot
andauthored
[clr-ios] Preserve inherited MemberData statics on maccatalyst CoreCLR (#128409)
## Description On maccatalyst-arm64 `AllSubsets_CoreCLR`, ILLink strips the inherited `ReadWrite_Success_MemberData` and `CopyToAsync_AllDataCopied_MemberData` statics on `ConnectedStreamConformanceTests`, so xUnit's `[MemberData]` lookup fails for `CryptoStreamTests.ReadWrite_Success` and `NetworkStreamTest.CopyToAsync_AllDataCopied`. Adds a `[DynamicDependency]` on each derived override to root the base statics, and restores the `IsMultithreadingSupported` guard on `CopyToAsync_AllDataCopied`. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: kotlarmilos <kotlarmilos@users.noreply.github.com>
1 parent 98d5787 commit e57af36

4 files changed

Lines changed: 8 additions & 0 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<linker>
2+
<assembly fullname="StreamConformanceTests" />
3+
</linker>

src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,6 @@
114114
</ItemGroup>
115115
<ItemGroup>
116116
<ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
117+
<TrimmerRootDescriptor Condition="'$(TargetsAppleMobile)' == 'true' and '$(EnableAggressiveTrimming)' == 'true' and '$(UseNativeAotRuntime)' != 'true'" Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
117118
</ItemGroup>
118119
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<linker>
2+
<assembly fullname="StreamConformanceTests" />
3+
</linker>

src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,7 @@
872872
</ItemGroup>
873873
<ItemGroup>
874874
<ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
875+
<TrimmerRootDescriptor Condition="'$(TargetsAppleMobile)' == 'true' and '$(EnableAggressiveTrimming)' == 'true' and '$(UseNativeAotRuntime)' != 'true'" Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
875876
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj" />
876877
<PackageReference Include="System.Security.Cryptography.X509Certificates.TestData" Version="$(SystemSecurityCryptographyX509CertificatesTestDataVersion)" />
877878
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->

0 commit comments

Comments
 (0)