Skip to content

[wasm][tests] Fix test failures due to trimming #51697

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

Merged
radical merged 53 commits into from
Apr 28, 2021
Merged

[wasm][tests] Fix test failures due to trimming #51697

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
acba56d
Enable all the tests with trimming issues
radical Apr 22, 2021
62e7c7a
[wasm] Disable tests that fail to build with trimming
radical Apr 22, 2021
1e1a74c
[wasm] Disable System.Linq.Expressions.Tests due to trimming errors
radical Apr 22, 2021
f285564
[wasm] Fix build errors due to trimming in System.Reflection.Metadata…
radical Apr 15, 2021
7f65c2b
[wasm] fix build error for System.Reflection.Tests
radical Apr 13, 2021
539048c
Merge remote-tracking branch 'origin/main' into test-trimming-for-aot
radical Apr 24, 2021
5bffdba
[wasm] Fix trimming errors for System.Runtime tests
radical Apr 8, 2021
10506d8
[wasm] Disable test failing with trimming - System.Reflection.Metadat…
radical Apr 24, 2021
d8451af
[wasm] Disable System.Runtime.InteropServices.Tests due to trimming
radical Apr 24, 2021
49c7e5a
[wasm] Fix trimming errors for Microsoft.Extensions.Logging.Tests
radical Apr 24, 2021
7e653a0
Disable tests for https://github.com/dotnet/runtime/issues/51211
radical Apr 25, 2021
1374c91
[wasm] Disable more tests failing with trimming
radical Apr 25, 2021
390e4e9
[wasm] Disable individual tests failing with trimming
radical Apr 25, 2021
362608f
[wasm] Fix trimming errors for System.Runtime.Extensions.Tests
radical Apr 11, 2021
12cf86b
[wasm] Fix System.Reflection.Tests failing due to trimming
radical Apr 25, 2021
7d31a83
Merge remote-tracking branch 'origin/main' into test-trimming-for-aot
radical Apr 26, 2021
59bb6c6
[wasm] Fix trimming errors for System.Runtime.Serialization.Json.Tests
radical Apr 26, 2021
62df596
[wasm] Fix trimming errors in System.Xml.RW.* tests
radical Apr 26, 2021
12cdcbd
[wasm] Fix trimming errors for System.Runtime.Caching.Tests
radical Apr 8, 2021
dcce073
[wasm] Fix trimming errors for System.Tests.ActivatorTests
radical Apr 9, 2021
a92333e
[wasm] Fix trimming errors for Microsoft.Extensions.Logging.Test.Trac…
radical Apr 9, 2021
f3b0d74
[wasm][eat] Disable failing test System.Data.Tests.XmlDataReaderTest.…
radical Apr 26, 2021
e89323c
[wasm] Fix trimming errors for System.Reflection.Tests
radical Apr 26, 2021
e09cad4
[wasm] Fix trimming errors for System.Reflection.Tests
radical Apr 26, 2021
2b10631
[wasm] Fix trimming errors in System.Reflection.Tests
radical Apr 26, 2021
189a79d
[wasm[eat] Fix test failures due to missing type
radical Apr 26, 2021
437d614
[wasm][eat] Fix System.Text.Json.Tests.DebuggerTests caused by trimming
radical Apr 26, 2021
b0274a4
[wasm] Fix test failing due to trimming
radical Apr 26, 2021
f579f8b
[wasm][eat] Disable System.Text.Json tests failing due to trimming
radical Apr 26, 2021
999426f
Disable test failing due to trimming in System.Reflection.Tests
radical Apr 26, 2021
3a91a5d
Disable tests failing due to trimming in System.Runtime.Loader
radical Apr 26, 2021
6d44922
Use linker substitutions to set PlatformDetection.IsBuiltWithAggressi…
radical Apr 26, 2021
d3e215a
Use TestUtilities substitutions only if AggressiveTrimming is enabled
radical Apr 26, 2021
1ac21c3
Address review feedback - rename ILDescriptorsPath
radical Apr 26, 2021
b9bf835
Address review feedback, move CoreCLR linker file next to the project
radical Apr 26, 2021
0aee262
Address review feedback - move ModuleCore.xml closer to it's use
radical Apr 26, 2021
bf123ca
Address review feedback - Move root assembly references to descriptor…
radical Apr 26, 2021
6ecbceb
Fix ILLinkDescriptorsPath
radical Apr 27, 2021
3dc25ee
[wasm] Disable some System.Text.Json tests
radical Apr 27, 2021
812f860
[wasm] Disable failing test in System.Xml.Xsl.XslCompiledTransformApi…
radical Apr 22, 2021
2d666e6
Preserve xunit type in tests
radical Apr 27, 2021
620c5bb
[wasm] Disable failing tests in System.Xml.Xsl.XslCompiledTransformAp…
radical Apr 27, 2021
c57520d
[wasm] Disable failing tests in `System.Runtime.Tests`
radical Apr 27, 2021
91fca65
Merge remote-tracking branch 'origin/main' into test-trimming-for-aot
radical Apr 27, 2021
5507316
Merge remote-tracking branch 'origin/main' into test-trimming-for-aot
radical Apr 27, 2021
b694c10
Update list of disabled tests, and disable aot ones only when relevant
radical Apr 27, 2021
d792ac7
Fix build: don't run aot for tests that fail with eat
radical Apr 27, 2021
6b8cada
Disable failing test `DataContractSerializerTests.DCS_DerivedTypeWith…
radical Apr 27, 2021
8a912e6
Disable System.Reflection.Metadata.Decoding.Tests.CustomAttributeDeco…
radical Apr 27, 2021
0a770d0
Disable System.Reflection.Tests.CustomAttributeTests.CustomAttributeT…
radical Apr 27, 2021
c004584
Disable System.Runtime.Extensions.Tests for aot
radical Apr 27, 2021
ee78cd7
Disable System.Runtime.Tests, and System.Text.Json.Tests for aot
radical Apr 27, 2021
a644852
Fix path for System.Text.Json tests
radical Apr 28, 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
Prev Previous commit
Next Next commit
[wasm] Fix trimming errors for Microsoft.Extensions.Logging.Tests 
.. and:

- Microsoft.Extensions.Configuration.FileExtensions
- Microsoft.Extensions.Configuration
- Microsoft.Extensions.FileProviders.Composite
- Microsoft.Extensions.Logging
- Microsoft.Extensions.Primitives
- Microsoft.Extensions.Http.Tests

Fixes #50709

Example failures:

```
[02:19:11] fail: [FAIL] Microsoft.Extensions.Logging.Test.LoggerFactoryTest.CreateDisposeDisposesInnerServiceProvider
[02:19:11] info: System.ArgumentException : Type Moq.Internals.InterfaceProxy is not valid base type for interface proxy, because it does not have accessible parameterless constructor. Only a non-sealed class with non-private default constructor can be used as base type for interface proxy. Please use some other valid type.
[02:19:11] info:    at Castle.DynamicProxy.Generators.InterfaceProxyWithTargetGenerator.ThrowInvalidBaseType(Type type, String doesNotHaveAccessibleParameterlessConstructor)
[02:19:11] info:    at Castle.DynamicProxy.Generators.InterfaceProxyWithTargetGenerator.EnsureValidBaseType(Type type)
[02:19:11] info:    at Castle.DynamicProxy.Generators.InterfaceProxyWithTargetGenerator.GenerateCode(Type proxyTargetType, Type[] interfaces, ProxyGenerationOptions options)
[02:19:11] info:    at Castle.DynamicProxy.DefaultProxyBuilder.CreateInterfaceProxyTypeWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options)
[02:19:11] info:    at Castle.DynamicProxy.ProxyGenerator.CreateInterfaceProxyTypeWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options)
[02:19:11] info:    at Castle.DynamicProxy.ProxyGenerator.CreateInterfaceProxyWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options, IInterceptor[] interceptors)
[02:19:11] info:    at Moq.CastleProxyFactory.CreateProxy(Type mockType, IInterceptor interceptor, Type[] interfaces, Object[] arguments)
[02:19:11] info:    at Moq.Mock`1[[Microsoft.Extensions.Logging.ILoggerProvider, Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60]].InitializeInstance()
[02:19:11] info:    at Moq.Mock`1[[Microsoft.Extensions.Logging.ILoggerProvider, Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60]].OnGetObject()
[02:19:11] info:    at Moq.Mock.get_Object()
[02:19:11] info:    at Moq.Mock`1[[Microsoft.Extensions.Logging.ILoggerProvider, Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60]].get_Object()
[02:19:11] info:    at Microsoft.Extensions.Logging.Test.LoggerFactoryTest.<>c__DisplayClass20_0.<CreateDisposeDisposesInnerServiceProvider>b__3(IServiceProvider _)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.VisitFactory(FactoryCallSite factoryCallSite, RuntimeResolverContext context)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteVisitor`2[[Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeResolverContext, Microsoft.Extensions.DependencyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60],[System.Object, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].VisitCallSiteMain(ServiceCallSite callSite, RuntimeResolverContext argument)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.ResolveService(ServiceCallSite callSite, RuntimeResolverContext context, RuntimeResolverLock lockType, ServiceProviderEngineScope serviceProviderEngine)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.VisitRootCache(ServiceCallSite callSite, RuntimeResolverContext context)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteVisitor`2[[Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeResolverContext, Microsoft.Extensions.DependencyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60],[System.Object, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].VisitCallSite(ServiceCallSite callSite, RuntimeResolverContext argument)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.VisitIEnumerable(IEnumerableCallSite enumerableCallSite, RuntimeResolverContext context)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteVisitor`2[[Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeResolverContext, Microsoft.Extensions.DependencyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60],[System.Object, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].VisitCallSiteMain(ServiceCallSite callSite, RuntimeResolverContext argument)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.ResolveService(ServiceCallSite callSite, RuntimeResolverContext context, RuntimeResolverLock lockType, ServiceProviderEngineScope serviceProviderEngine)
[02:19:11] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.VisitRootCache(ServiceCallSite callSite, RuntimeResolverContext context)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteVisitor`2[[Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeResolverContext, Microsoft.Extensions.DependencyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60],[System.Object, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].VisitCallSite(ServiceCallSite callSite, RuntimeResolverContext argument)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.VisitConstructor(ConstructorCallSite constructorCallSite, RuntimeResolverContext context)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteVisitor`2[[Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeResolverContext, Microsoft.Extensions.Depende
ncyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60],[System.Object, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].VisitCallSiteMain(S
erviceCallSite callSite, RuntimeResolverContext argument)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.ResolveService(ServiceCallSite callSite, RuntimeResolverContext context, RuntimeResolverLock lockType,
ServiceProviderEngineScope serviceProviderEngine)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.VisitRootCache(ServiceCallSite callSite, RuntimeResolverContext context)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteVisitor`2[[Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeResolverContext, Microsoft.Extensions.Depende
ncyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60],[System.Object, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].VisitCallSite(Servi
ceCallSite callSite, RuntimeResolverContext argument)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.CallSiteRuntimeResolver.Resolve(ServiceCallSite callSite, ServiceProviderEngineScope scope)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeServiceProviderEngine.<>c__DisplayClass1_0.<RealizeService>b__1(ServiceProviderEngineScope p)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.RuntimeServiceProviderEngine.<>c__DisplayClass1_0.<RealizeService>b__0(ServiceProviderEngineScope scope)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.ServiceProviderEngine.GetService(Type serviceType, ServiceProviderEngineScope serviceProviderEngineScope)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceLookup.ServiceProviderEngine.GetService(Type serviceType)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceProvider.GetService(Type serviceType)
[02:19:12] info:    at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetService[ILoggerFactory](IServiceProvider provider)
[02:19:12] info:    at Microsoft.Extensions.Logging.LoggerFactory.Create(Action`1 configure)
[02:19:12] info:    at Microsoft.Extensions.Logging.Test.LoggerFactoryTest.CreateDisposeDisposesInnerServiceProvider()
[02:19:12] info:    at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
```
  • Loading branch information
@radical
radical committed Apr 25, 2021
commit 49c7e5a0e251ff2c018b955891428271bd2ae1e5
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>
1 change: 1 addition & 0 deletions ...ensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Http\src\Microsoft.Extensions.Http.csproj" SkipUseReferenceAssembly="true" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" />
<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
Expand Down
2 changes: 2 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,8 @@
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" />
</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" />
Copy link
Member

@eerhardt eerhardt Apr 26, 2021

Choose a reason for hiding this comment

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

Is there a way to detect if the test has a reference to Moq, and add this automatically if it does? That way this doesn't need to be copied everywhere.

Copy link
Member Author

@radical radical Apr 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

We could look for Moq in @(PackageReference). I tried to find all the references to Moq, and *Castle.xml:

$ git grep -E "PackageReference.*Moq|Castle.xml"

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj:    <TrimmerRootDescriptor Include="$(ILLinkDescriptorsPath)ILLink.Descriptors.Castle.xml" />
src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj:    <PackageReference Include="Moq" Version="$(MoqVersion)" />

.. and there seem to be some projects that either don't need the linker xml, or maybe I didn't get to failing test because of Moq yet.

Should we add that irrespective? or maybe doing it as-needed per project is better?

</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions ...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 @@ -152,6 +152,8 @@
<Compile Include="Design\DesignerTransactionTests.cs" />
<Compile Include="Security\Authentication\ExtendedProtection\ExtendedProtectionPolicyTypeConverterTests.cs" />
<Compile Include="XTypeDescriptionProviderTests.cs" />

<TrimmerRootDescriptor Include="$(ILDescriptorsPath)ILLink.Descriptors.Castle.xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.ComponentModel.TypeConverter.TestData" Version="$(SystemComponentModelTypeConverterTestDataVersion)" />
Expand Down