Skip to content

Commit bdadd59

Browse files
authored
Reenable Android.Device_Emulator.Aot.Test.csproj (#50332)
* Reenable Android.Device_Emulator.Aot.Test.csproj Closes #49757 * Update tests.proj
1 parent 4249956 commit bdadd59

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/libraries/tests.proj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\System.Text.RegularExpressions.Tests.csproj" />
6969
</ItemGroup>
7070

71+
<ItemGroup Condition="'$(TargetOS)' == 'Android' and '$(TargetArchitecture)' == 'x86'">
72+
<!-- https://github.com/dotnet/runtime/issues/50493 -->
73+
<FunctionalTestExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\AOT\Android.Device_Emulator.Aot.Test.csproj" />
74+
</ItemGroup>
75+
7176
<ItemGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator') and '$(RunDisablediOSTests)' != 'true'">
7277
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.Composite\tests\Microsoft.Extensions.FileProviders.Composite.Tests.csproj" />
7378
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.HostFactoryResolver\tests\Microsoft.Extensions.HostFactoryResolver.Tests.csproj" />
@@ -347,27 +352,29 @@
347352
<ProjectReference Include="$(MonoProjectRoot)sample\iOS\Program.csproj"
348353
BuildInParallel="false" />
349354
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\**\*.Test.csproj"
355+
Exclude="@(FunctionalTestExclusions)"
350356
BuildInParallel="false" />
351357
</ItemGroup>
352358

353359
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and ('$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator')">
354360
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\**\*.Test.csproj"
361+
Exclude="@(FunctionalTestExclusions)"
355362
BuildInParallel="false" />
356363
</ItemGroup>
357364

358365
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'Android'">
359366
<ProjectReference Include="$(MonoProjectRoot)sample\Android\AndroidSampleApp.csproj"
360367
BuildInParallel="false" />
361-
<!-- Disable Android.Device_Emulator.Aot.Test.csproj temporarily due to https://github.com/dotnet/runtime/issues/49757 -->
362368
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\Android\**\*.Test.csproj"
363-
Exclude="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\AOT\Android.Device_Emulator.Aot.Test.csproj"
369+
Exclude="@(FunctionalTestExclusions)"
364370
BuildInParallel="false" />
365371
</ItemGroup>
366372

367373
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'Browser'">
368374
<ProjectReference Include="$(MonoProjectRoot)sample\wasm\**\*.Sample.csproj"
369375
BuildInParallel="false" />
370376
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\WebAssembly\**\*.Test.csproj"
377+
Exclude="@(FunctionalTestExclusions)"
371378
BuildInParallel="false" />
372379
</ItemGroup>
373380

0 commit comments

Comments
 (0)