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

[wasm] Fix trimming errors for library tests, to help building with AOT #50885

Closed
wants to merge 32 commits into from
Closed

[wasm] Fix trimming errors for library tests, to help building with AOT #50885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d108790
[wasm] Fix build errors due to trimming in System.Reflection.Metadata…
radical Apr 15, 2021
96766b4
[wasm] Disable broken test System.Data.Tests.XmlDataReaderTest.XmlLoa…
radical Apr 16, 2021
e55e78a
[wasm] Fix trimming errors for System.ComponentModel.TypeConverter
radical Apr 9, 2021
d751418
[wasm] Reduce verbosity level for debug message
radical Apr 8, 2021
ab05604
[wasm] Fix trimming errors for System.Runtime.Serialization.Json.Tests
radical Apr 8, 2021
72eb51e
[wasm] Fix trimming errors for System.Runtime.Serialization.Xml.Refle…
radical Apr 8, 2021
743f9fe
Re-enable Serialization tests, from https://github.com/dotnet/runtime…
radical Apr 8, 2021
9160bcd
[wasm] Fix trimming errors for System.Runtime.Caching.Tests
radical Apr 8, 2021
989d1e1
[wasm] Reenable tests that are working with EAT now
radical Apr 8, 2021
d3061e1
[wasm] Fix trimming errors for System.Runtime tests
radical Apr 8, 2021
aa5a2d4
[wasm] Fix trimming errors for System.Tests.ActivatorTests
radical Apr 9, 2021
11c2901
[wasm] Fix trimming errors for Microsoft.Extensions.Logging.Tests
radical Apr 9, 2021
c1cbd0e
Merge linker descriptors for Castle, and Moq
radical Apr 9, 2021
7c9dca6
[wasm] Fix trimming errors for Microsoft.Extensions.Logging.Test.Trac…
radical Apr 9, 2021
1d511cf
[wasm] Fix trimming errors in `System.Xml.RW*` tests
radical Apr 10, 2021
86b2aad
[wasm] Fix trimming errors for System.Runtime.Serialization.Xml tests
radical Apr 10, 2021
4547709
[wasm] Fix trimming errors for System.Xml.XmlSerializer*
radical Apr 10, 2021
bebd9b9
[wasm] Fix trimming errors for System.Reflection.Tests
radical Apr 10, 2021
85d48fc
[wasm] Fix trimming errors for System.Reflection.Tests
radical Apr 10, 2021
19c01a0
[wasm] Fix trimming errors in System.Reflection.Tests
radical Apr 10, 2021
ff4241f
[wasm] Fix build
radical Apr 10, 2021
ff0fab9
Fix copying pdbs, and dependent assemblies
radical Apr 11, 2021
722d988
[wasm] Fix trimming errors for System.Runtime.Extensions.Tests
radical Apr 11, 2021
6560bc5
[wasm] DebuggerSupport=true for tests, as many library tests depend o…
radical Apr 12, 2021
dbfa7ac
[wasm] fix build error for System.Reflection.Tests
radical Apr 13, 2021
77781b1
[wasm] Rename ILLink.Descriptor.xml -> *Descriptors.xml
radical Apr 14, 2021
e7043c5
Cleanup trimmer descriptors for System.ComponentModel.TypeConverter.T…
radical Apr 16, 2021
e2cdeb0
il descriptors cleanup
radical Apr 16, 2021
066cb1e
[wasm][tests] Fix path to System.Text.Json.Tests for excluding from t…
radical Apr 21, 2021
875c07a
[wasm] Disable failing test in System.Xml.Xsl.XslCompiledTransformApi…
radical Apr 22, 2021
e8cb433
Re-enable System.Xml.Xsl.XslCompiledTransformApi.Tests
radical Apr 22, 2021
404ed1f
Merge remote-tracking branch 'origin/main' into build-wasm-aot-helix-…
radical Apr 23, 2021
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
0 ...sting/ILLink.Descriptor.TestUtilities.xml → ...ting/ILLink.Descriptors.TestUtilities.xml
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions eng/testing/ildescriptors/ILLink.Descriptors.Castle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<linker>
<assembly fullname="Castle.Core">
<namespace fullname="Castle.DynamicProxy" />
<type fullname="Castle.DynamicProxy.Internal.CompositionInvocation" />
<type fullname="Castle.DynamicProxy.Internal.AbstractInvocation" />
<type fullname="Castle.DynamicProxy.Internal.InheritanceInvocation" />
</assembly>
<assembly fullname="Moq">
<type fullname="Moq.Internals.InterfaceProxy">
<method signature="System.Void .ctor()" />
</type>
</assembly>
</linker>
7 changes: 7 additions & 0 deletions eng/testing/ildescriptors/ILLink.Descriptors.ModuleCore.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<linker>
<assembly fullname="ModuleCore">
<type fullname="OLEDB.Test.ModuleCore.XmlInlineDataDiscoverer">
<method signature="System.Void .ctor()" />
</type>
</assembly>
</linker>
10 changes: 10 additions & 0 deletions eng/testing/ildescriptors/ILLink.Descriptors.Serialization.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<linker>
<assembly fullname="System.Private.DataContractSerialization">
<type fullname="System.Runtime.Serialization.KeyValue`2" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these still necessary on the latest main? @joperezr addressed the ILLink warnings in this assembly, so these might be fixed.

If they aren't fixed, we should open a bug to make sure we don't have a product bug here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DCS is annotated now but most of it was annotated as unsafe. It would be good to understand who actually needs this so that we can check why is the type not being preserved and to find out if it is expected or not

<type fullname="System.Runtime.Serialization.DateTimeOffsetAdapter" />
<type fullname="System.Runtime.Serialization.KeyValuePairAdapter`2" />
</assembly>
<assembly fullname="System.Private.Xml.Linq">
<type fullname="System.Xml.Linq.XElement" />
</assembly>
</linker>
2 changes: 1 addition & 1 deletion eng/testing/tests.mobile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@

<ItemGroup>
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xunit.xml" Condition="'$(SkipXunitTrimmerDescriptor)' != 'true'" />
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.TestUtilities.xml" Condition="'$(SkipTestUtilitiesReference)' != 'true'" />
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.TestUtilities.xml" Condition="'$(SkipTestUtilitiesReference)' != 'true'" />
</ItemGroup>
</Target>

Expand Down
1 change: 1 addition & 0 deletions eng/testing/tests.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<TestDependsOn Condition="'$(TestNoBuild)' != 'true' and '$(BuildAllProjects)' != 'true'">Build</TestDependsOn>
<TestDependsOn>$(TestDependsOn);GenerateRunScript;RunTests</TestDependsOn>
<VSTestNoLogo>true</VSTestNoLogo>
<ILDescriptorsPath>$(MSBuildThisFileDirectory)ildescriptors\</ILDescriptorsPath>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a better name. How about?

<ILLinkDescriptorsPath>$(MSBuildThisFileDirectory)ILLinkDescriptors\</ILLinkDescriptorsPath>

</PropertyGroup>

<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion eng/testing/tests.wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!-- We need to set this in order to get extensibility on xunit category traits and other arguments we pass down to xunit via MSBuild properties -->
<PropertyGroup>
<BundleTestAppTargets>$(BundleTestAppTargets);BundleTestWasmApp</BundleTestAppTargets>

<!-- many library tests depend on debugger attributes -->
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(Configuration)' == 'Debug'">true</DebuggerSupport>
<!-- Some tests expect to load satellite assemblies by path, eg. System.Runtime.Loader.Tests,
so, just setting it true by default -->
Expand Down Expand Up @@ -186,7 +188,6 @@
<ItemGroup>
<_PdbFilesToCheck Include="$([System.IO.Path]::ChangeExtension('%(ResolvedFileToPublish.Identity)', '.pdb'))"
Condition="'%(ResolvedFileToPublish.Extension)' == '.dll'" />

<ResolvedFileToPublish Include="@(_PdbFilesToCheck)"
Condition="Exists(%(_PdbFilesToCheck.Identity))"
RelativePath="%(_PdbFilesToCheck.FileName)%(_PdbFilesToCheck.Extension)" />
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
-->
<Features>$(Features.Replace('strict', '')</Features>

<!-- tests depend on debugger attributes -->
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -43,4 +44,4 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>
</Project>
2 changes: 2 additions & 0 deletions ...ation.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

<ItemGroup>
<Compile Include="$(CommonTestPath)Extensions\ConfigurationRootTest.cs" Link="Common\Extensions\ConfigurationRootTest.cs" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions .../Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<Compile Include="Common/*.cs" />
<Compile Include="*.cs" />
<Compile Include="$(CommonTestPath)Extensions\ConfigurationRootTest.cs" Link="Common\Extensions\ConfigurationRootTest.cs" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions ...s.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Composite\src\Microsoft.Extensions.FileProviders.Composite.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
</ItemGroup>

</Project>
7 changes: 7 additions & 0 deletions src/libraries/Microsoft.Extensions.Logging/tests/Common/ILLink.Descriptors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<linker>
<assembly fullname="System.Diagnostics.TraceSource">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is a bit unexpected, do you know where is it used?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed - this shouldn't be necessary because all the ILLink warnings are fixed in this assembly. This might be a product bug somewhere.

<type fullname="System.Diagnostics.TraceListener">
<method signature="System.Void .ctor()" />
</type>
</assembly>
</linker>
3 changes: 3 additions & 0 deletions ...aries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
Link="tests\DI.Common\Common\src\TestLogger.cs" />
<Compile Include="..\DI.Common\Common\src\TestLoggerFactory.cs"
Link="tests\DI.Common\Common\src\TestLoggerFactory.cs" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions ...raries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<ItemGroup>
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<ProjectReference Include="..\src\Microsoft.Extensions.Primitives.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
</ItemGroup>

</Project>
19 changes: 0 additions & 19 deletions src/libraries/System.ComponentModel.TypeConverter/tests/ILLink.Descriptors.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ystem.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/libraries/System.Data.Common/tests/System/Data/XmlDataReaderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ namespace System.Data.Tests
public class XmlDataReaderTest
{
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51369", TestPlatforms.Browser)]
public void XmlLoadTest()
{
var ds = new DataSet();
Expand Down
4 changes: 3 additions & 1 deletion ...rivate.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...ies/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...s/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,7 @@
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...s/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...s/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@
<ItemGroup>
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,7 @@
<ItemGroup>
<ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.ModuleCore.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...l/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
<Compile Include="$(TestSourceFolder)..\..\..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.RuntimeOnly.cs" />
<Compile Include="$(TestSourceFolder)..\XmlSerializerTests.cs" />
<Compile Include="$(TestSourceFolder)..\XmlSerializerTests.RuntimeOnly.cs" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Serialization.xml" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
<Compile Include="$(TestSourceFolder)XmlSerializerTests.cs" />
<Compile Include="$(TestSourceFolder)XmlSerializerTests.Internal.cs" />
<Compile Include="$(TestSourceFolder)XmlSerializerTests.RuntimeOnly.cs" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Serialization.xml" />
</ItemGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3331,6 +3331,7 @@ public CTransformRegressionTest(ITestOutputHelper output) : base(output)
}

//[Variation("Bug398968 - Globalization is broken for document() function")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51244", TestPlatforms.Browser)]
[InlineData(XslInputType.URI, ReaderType.XmlValidatingReader, OutputType.Stream, NavType.XPathDocument)]
[Theory]
public void RegressionTest1(XslInputType xslInputType, ReaderType readerType, OutputType outputType, NavType navType)
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<linker>
<assembly fullname="mscorlib" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still necessary with the latest linker? We had a few fixes that went in to preserve facade assemblies.

</linker>
2 changes: 2 additions & 0 deletions ...m.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,7 @@
<WasmFilesToIncludeFromPublishDir Include="System.Private.CoreLib.dll" />
<WasmFilesToIncludeFromPublishDir Include="System.Reflection.MetadataLoadContext.Tests.dll" />
<WasmFilesToIncludeFromPublishDir Include="mscorlib.dll" />

<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TestExe\System.Reflection.TestExe.csproj" />

<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\ILLink.Descriptors.CoreCLR.xml" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this ILLink.Descriptors.CoreCLR.xml file move next to the .csproj that needs it?

</ItemGroup>
</Project>
</Project>
3 changes: 3 additions & 0 deletions src/libraries/System.Reflection/tests/ILLink.Descriptors.CoreCLR.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<linker>
<assembly fullname="System.Reflection.TestExe" />
</linker>
7 changes: 7 additions & 0 deletions src/libraries/System.Reflection/tests/ILLink.Descriptors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<linker>
<assembly fullname="System.Private.CoreLib">
<type fullname="System.Collections.ArrayList" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is suprising. Why is this necessary?

</assembly>
<assembly fullname="ForwardedTypesAssembly" />
<assembly fullname="UnloadableAssembly" />
</linker>
8 changes: 7 additions & 1 deletion src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<GenerateDependencyFile>false</GenerateDependencyFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn),SYSLIB0013</NoWarn>

<!-- these tests depend on the pdb files -->
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonTestPath)System\Reflection\MockParameterInfo.cs"
Expand Down Expand Up @@ -69,10 +72,13 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<WasmFilesToIncludeFromPublishDir Include="$(AssemblyName).dll" />
<WasmFilesToIncludeFromPublishDir Include="$(AssemblyName).pdb" />
<WasmFilesToIncludeFromPublishDir Include="$(AssemblyName).pdb" SkipIfNotFound="true" />
</ItemGroup>
<ItemGroup>
<!-- Assemblies that should be excluded from the bundle -->
<__ExcludeFromBundle Include="TestAssembly.dll" />

<TrimmerRootAssembly Include="TestAssembly" />
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
</ItemGroup>
</Project>
7 changes: 7 additions & 0 deletions src/libraries/System.Runtime.Caching/tests/ILLink.Descriptors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<linker>
<assembly fullname="System.Configuration.ConfigurationManager">
<type fullname="System.Configuration.ClientConfigurationHost">
<method signature="System.Void .ctor()" />
</type>
</assembly>
</linker>
2 changes: 2 additions & 0 deletions src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<Compile Include="System.Runtime.Caching\HostFileChangeMonitorTest.cs" />
<Compile Include="System.Runtime.Caching\ObjectCacheTest.cs" />
<Compile Include="System.Runtime.Caching\MemoryCacheTest.cs" />

<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))">
<ProjectReference Include="..\src\System.Runtime.Caching.csproj" />
Expand Down
8 changes: 7 additions & 1 deletion src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,11 @@
<ProjectReference Include="VoidMainWithExitCodeApp\VoidMainWithExitCodeApp.csproj" />
<ProjectReference Include="TestApp\TestApp.csproj" />
<ProjectReference Include="TargetFrameworkNameTestApp\TargetFrameworkNameTestApp.csproj" />

<TrimmerRootAssembly Include="AssemblyResolveTestApp" />
<TrimmerRootAssembly Include="TestAppOutsideOfTPA" />
<TrimmerRootAssembly Include="VoidMainWithExitCodeApp" />
<TrimmerRootAssembly Include="TestApp" />
<TrimmerRootAssembly Include="TargetFrameworkNameTestApp" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion ...n.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@
<Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.cs" />
<Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.RuntimeOnly.cs" />
<Compile Include="$(TestSourceFolder)..\DataContractJsonSerializer.cs" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Serialization.xml" />
</ItemGroup>
</Project>
</Project>
Loading