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.

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

Skip source gen DLLs in mono AOT #62518

Merged
merged 5 commits into from
Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/tests/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@
</RemoveDuplicates>
<ItemGroup>
<TestsAndAssociatedAssemblies Include="%(TestDirs.Identity)/*.dll" />
<CoreRootDlls Include="$(CORE_ROOT)/*.dll" Exclude="$(CORE_ROOT)/xunit.performance.api.dll" />
<CoreRootDlls Include="$(CORE_ROOT)/*.dll"
Exclude="$(CORE_ROOT)/xunit.performance.api.dll;
$(CORE_ROOT)/Microsoft.Interop.DllImportGenerator.dll;
$(CORE_ROOT)/Microsoft.Interop.SourceGeneration.dll" />
<AllDlls Condition="'$(MonoFullAot)' == 'true'" Include="@(TestsAndAssociatedAssemblies);@(CoreRootDlls)" />
<AllDlls Condition="'$(MonoFullAot)' != 'true'" Include="@(TestsAndAssociatedAssemblies)" />
</ItemGroup>
Expand Down
11 changes: 10 additions & 1 deletion src/tests/issues.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,15 @@
</ItemGroup>

<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'llvmfullaot' ">
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/explicitlayout/NestedStructs/case03/**">
<Issue>https://github.com/dotnet/runtime/issues/62567</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/explicitlayout/NestedStructs/case04/**">
<Issue>https://github.com/dotnet/runtime/issues/62567</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/explicitlayout/NestedStructs/case05/**">
<Issue>https://github.com/dotnet/runtime/issues/62567</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
<Issue>https://github.com/dotnet/runtime/issues/57361</Issue>
</ExcludeList>
Expand Down Expand Up @@ -2343,7 +2352,7 @@
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/regressions/github60486/**">
<Issue>https://github.com/dotnet/runtime/issues/62334</Issue>
</ExcludeList>
</ExcludeList>
</ItemGroup>

<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmfullaot' or '$(RuntimeVariant)' == 'llvmaot') and '$(TargetArchitecture)' == 'arm64'">
Expand Down