Skip to content

Commit 188bd15

Browse files
MichalStrehovskymatouskozak
authored andcommitted
Skip DispatchProxy app test on native AOT (dotnet#101374)
1 parent 91e06b6 commit 188bd15

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

eng/testing/linker/trimmingTests.targets

+7-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@
3838
</ItemGroup>
3939

4040
<ItemGroup Condition="!$(SkipOnTestRuntimes.Contains('$(PackageRID)'))">
41-
<TestConsoleApps Include="@(TestConsoleAppSourceFiles->'%(ProjectFile)')" Condition="!$([System.String]::Copy('%(TestConsoleAppSourceFiles.SkipOnTestRuntimes)').Contains('$(PackageRID)'))">
41+
<_SkippedAppSourceFiles Include="@(TestConsoleAppSourceFiles)" Condition="$([System.String]::Copy('%(TestConsoleAppSourceFiles.SkipOnTestRuntimes)').Contains('$(PackageRID)'))" />
42+
43+
<_SkippedAppSourceFiles Include="@(TestConsoleAppSourceFiles)" Condition="'$(RunNativeAotTestApps)' == 'true' and '%(TestConsoleAppSourceFiles.NativeAotIncompatible)' == 'true'" />
44+
45+
<_AppSourceFiles Include="@(TestConsoleAppSourceFiles)" Exclude="@(_SkippedAppSourceFiles)" />
46+
47+
<TestConsoleApps Include="@(_AppSourceFiles->'%(ProjectFile)')">
4248
<ProjectCompileItems>%(FullPath)</ProjectCompileItems>
4349
</TestConsoleApps>
4450
<TestConsoleApps AdditionalProperties="MSBuildEnableWorkloadResolver=$(MSBuildEnableWorkloadResolver)" Condition="'$(MSBuildEnableWorkloadResolver)' != ''" />
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<Project DefaultTargets="Build">
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
33

4+
<ItemGroup>
5+
<TestConsoleAppSourceFiles Include="DispatchProxyTest.cs">
6+
<!-- https://github.com/dotnet/runtime/issues/73136 -->
7+
<NativeAotIncompatible>true</NativeAotIncompatible>
8+
</TestConsoleAppSourceFiles>
9+
</ItemGroup>
10+
411
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
512
</Project>

src/libraries/tests.proj

-1
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,6 @@
652652
<ProjectExclusions Condition="'$(RunNativeAotTestApps)' == 'true'" Include="$(MSBuildThisFileDirectory)\System.Linq.Queryable\tests\TrimmingTests\System.Linq.Queryable.TrimmingTests.proj" />
653653
<ProjectExclusions Condition="'$(RunNativeAotTestApps)' == 'true'" Include="$(MSBuildThisFileDirectory)\System.Private.Xml.Linq\tests\TrimmingTests\System.Xml.Linq.TrimmingTests.proj" />
654654
<ProjectExclusions Condition="'$(RunNativeAotTestApps)' == 'true'" Include="$(MSBuildThisFileDirectory)\System.Net.Http\tests\TrimmingTests\System.Net.Http.TrimmingTests.proj" />
655-
<ProjectExclusions Condition="'$(RunNativeAotTestApps)' == 'true'" Include="$(MSBuildThisFileDirectory)\System.Reflection.DispatchProxy\tests\TrimmingTests\System.Reflection.DispatchProxy.TrimmingTests.proj" />
656655
<ProjectExclusions Condition="'$(RunNativeAotTestApps)' == 'true'" Include="$(MSBuildThisFileDirectory)\System.Linq.Expressions\tests\TrimmingTests\System.Linq.Expressions.TrimmingTests.proj" />
657656
<ProjectExclusions Condition="'$(RunNativeAotTestApps)' == 'true'" Include="$(MSBuildThisFileDirectory)\System.Private.Xml\tests\TrimmingTests\System.Private.Xml.TrimmingTests.proj" />
658657
<ProjectExclusions Condition="'$(RunNativeAotTestApps)' == 'true'" Include="$(MSBuildThisFileDirectory)\System.Runtime\tests\System.Runtime.Tests\TrimmingTests\System.Runtime.TrimmingTests.proj" />

0 commit comments

Comments
 (0)