Skip to content

[iOS] Remove unnecessary newline from CI script #67861

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
steveisok merged 20 commits into from
Aug 2, 2022
Merged

[iOS] Remove unnecessary newline from CI script #67861

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bc27e00
[iOS] Remove unnecessary newline from CI script
Apr 11, 2022
6ae7f12
Add in change to use MacOS 11 queue in runtime-extra-platforms
Jul 20, 2022
b025c1a
Root out crashes
Jul 21, 2022
6d76bd5
Revert RunScriptCommand ordering
Jul 21, 2022
4fb433f
Adjust AppleAppBuilder to pick up alternate location for aotdata file…
Jul 22, 2022
8136190
Set ZipPackage to testdirectory
Jul 22, 2022
32e33c9
Try crashing suites on iOS instead
Jul 23, 2022
a6e0d5b
Skip crashes on tvOS, enable on iOS rolling builds
Jul 25, 2022
c201560
Merge remote-tracking branch 'upstream/main' into fix-tvos-device-ci
Jul 25, 2022
c0ca0d7
Add list of iOS suites to run
Jul 25, 2022
a4f69a5
Skip zipfile extract unicode tests. Correct tests.proj paths
Jul 26, 2022
fef0558
Merge remote-tracking branch 'upstream/main' into fix-tvos-device-ci
Jul 26, 2022
cc6c535
Merge remote-tracking branch 'upstream/main' into fix-tvos-device-ci
Jul 27, 2022
da9f90d
Skip more sourcegenerator tests
Jul 27, 2022
fb556ce
PR Feedback
Jul 28, 2022
b874db0
Fixup
Jul 28, 2022
9d52a51
More feedback
Jul 31, 2022
ef30e9f
Skip CborDocument_RoundTrip because of crash
Aug 1, 2022
81c4779
Merge remote-tracking branch 'upstream/main' into fix-tvos-device-ci
Aug 1, 2022
50ae647
IsNonBundledAssemblyLoadingSupported platform check
Aug 1, 2022
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
6 changes: 5 additions & 1 deletion eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ jobs:

# iOS devices
- ${{ if in(parameters.platform, 'iOS_arm64') }}:
- OSX.1015.Amd64.Iphone.Open
# split traffic for PR's and rolling builds
- ${{ if ne(parameters.jobParameters.isExtraPlatforms, true) }}:
- OSX.1015.Amd64.Iphone.Open
- ${{ if eq(parameters.jobParameters.isExtraPlatforms, true) }}:
- OSX.1200.Amd64.Iphone.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvOS_arm64') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-extra-platforms-other.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ jobs:
testGroup: innerloop
nameSuffix: AllSubsets_Mono
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true
timeoutInMinutes: 180
condition: >-
or(
Expand Down
5 changes: 2 additions & 3 deletions eng/testing/tests.ioslike.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@
<_AfterBuildCommands>
mv $XHARNESS_OUT/AOTBuild.binlog &quot;$HELIX_WORKITEM_UPLOAD_ROOT&quot;
sign &quot;$app&quot;
xharness apple test --app &quot;$app&quot; --output-directory &quot;$output_directory&quot; --target &quot;$target&quot; --timeout &quot;$timeout&quot; --xcode &quot;$xcode_path&quot; -v --launch-timeout &quot;$launch_timeout&quot; $(_ResetSimulatorSwitch) $(_SignalAppEndSwitch) --
</_AfterBuildCommands>
xharness apple test --app &quot;$app&quot; --output-directory &quot;$output_directory&quot; --target &quot;$target&quot; --timeout &quot;$timeout&quot; --xcode &quot;$xcode_path&quot; -v --launch-timeout &quot;$launch_timeout&quot; $(_ResetSimulatorSwitch) $(_SignalAppEndSwitch) -- </_AfterBuildCommands>
Copy link
Member

@akoeplinger akoeplinger Jun 14, 2022

Choose a reason for hiding this comment

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

this is quite brittle, we should at least add a comment why the xml end tag is on the same line.

I'd much prefer if we refactored the code to put together the RunScriptCommand where we actually know all the arguments, rather than hoping nobody appends a newline between here and somewhere else.

Copy link
Member

@akoeplinger akoeplinger Jun 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

thinking about it some more, the RunScriptCommand is expected to be single-line. we should keep it that way and instead move the things that need to happen before the xharness apple test into a separate ItemGroup which we prepend similar to PostRunScriptCommands in tests.targets

Copy link
Member

@akoeplinger akoeplinger Jun 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

so this would become:

<ItemGroup>
  <PreRunScriptCommands Include="$(_AOTBuildCommand)" />
  <PreRunScriptCommands Include="mv $XHARNESS_OUT/AOTBuild.binlog &quot;$HELIX_WORKITEM_UPLOAD_ROOT&quot;" />
  <PreRunScriptCommands Include="sign &quot;$app&quot;" />
</ItemGroup>

and RunScriptCommand would just be the xharness apple test ... command in a single line


<RunScriptCommand>$(_AOTBuildCommand) $(_AfterBuildCommands)</RunScriptCommand>
</PropertyGroup>
</PropertyGroup>

<Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleApp.props"
Condition="'$(BuildTestsOn)' == 'local'" />
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.IO.Compression.ZipFile/tests/ZipFile.Extract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public void ExtractToDirectoryNull()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72951", TestPlatforms.iOS | TestPlatforms.tvOS)]
public void ExtractToDirectoryUnicode()
{
string zipFileName = zfile("unicode.zip");
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.IO.Compression.ZipFile/tests/ZipFileExtensions.ZipArchive.Extract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public void ExtractToDirectoryExtension()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72951", TestPlatforms.iOS | TestPlatforms.tvOS)]
public void ExtractToDirectoryExtension_Unicode()
{
using (ZipArchive archive = ZipFile.OpenRead(zfile("unicode.zip")))
Expand Down
4 changes: 3 additions & 1 deletion src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Net.Http;
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.ExceptionServices;
using System.Runtime.Remoting;
using System.Security;
Expand Down Expand Up @@ -258,7 +259,8 @@ public void ExecuteAssemblyByName()
}).Dispose();
}

[Fact]
// Executing exe's not supported for full aot - especially on devices
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
public void ExecuteAssembly()
{
CopyTestAssemblies();
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public unsafe void GetFolderPath_Windows(Environment.SpecialFolder folder)
Assert.Equal(folderPath, knownFolder);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[PlatformSpecific(TestPlatforms.AnyUnix)] // Uses P/Invokes
public void GetLogicalDrives_Unix_AtLeastOneIsRoot()
{
Expand Down
10 changes: 5 additions & 5 deletions ...es.UnitTests/System/Runtime/InteropServices/Marshal/GetDelegateForFunctionPointerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace System.Runtime.InteropServices.Tests
[ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
public class GetDelegateForFunctionPointerTests
{
[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[InlineData(typeof(NonGenericDelegate))]
[InlineData(typeof(MulticastDelegate))]
[InlineData(typeof(OtherNonGenericDelegate))]
Expand All @@ -28,7 +28,7 @@ public void GetDelegateForFunctionPointer_NonGeneric_ReturnsExpected(Type t)
VerifyDelegate(functionDelegate, targetMethod);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
public void GetDelegateForFunctionPointer_CollectibleType_ReturnsExpected()
{
MethodInfo targetMethod = typeof(GetDelegateForFunctionPointerTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);
Expand All @@ -51,7 +51,7 @@ public void GetDelegateForFunctionPointer_CollectibleType_ReturnsExpected()
VerifyDelegate(functionDelegate, targetMethod);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
public void GetDelegateForFunctionPointer_Generic_ReturnsExpected()
{
MethodInfo targetMethod = typeof(GetDelegateForFunctionPointerTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);
Expand All @@ -63,7 +63,7 @@ public void GetDelegateForFunctionPointer_Generic_ReturnsExpected()
VerifyDelegate(functionDelegate, targetMethod);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
public void GetDelegateForFunctionPointer_GenericInvalidType_ReturnsExpected()
{
MethodInfo targetMethod = typeof(GetDelegateForFunctionPointerTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);
Expand Down Expand Up @@ -139,7 +139,7 @@ public void GetDelegateForFunctionPointer_InvalidType_ThrowsArgumentException(Ty
AssertExtensions.Throws<ArgumentException>("t", () => Marshal.GetDelegateForFunctionPointer((IntPtr)1, t));
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
public void GetDelegateForFunctionPointer_CantCast_ThrowsInvalidCastException()
{
MethodInfo targetMethod = typeof(GetDelegateForFunctionPointerTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);
Expand Down
12 changes: 6 additions & 6 deletions ...es.UnitTests/System/Runtime/InteropServices/Marshal/GetFunctionPointerForDelegateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace System.Runtime.InteropServices.Tests
{
public class GetFunctionPointerForDelegateTests
{
[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
public void GetFunctionPointerForDelegate_NormalDelegateNonGeneric_ReturnsExpected()
{
Expand All @@ -23,7 +23,7 @@ public void GetFunctionPointerForDelegate_NormalDelegateNonGeneric_ReturnsExpect
Assert.Equal(pointer1, pointer2);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
public void GetFunctionPointerForDelegate_MarshalledDelegateNonGeneric_ReturnsExpected()
{
Expand All @@ -40,7 +40,7 @@ public void GetFunctionPointerForDelegate_MarshalledDelegateNonGeneric_ReturnsEx
Assert.Equal(pointer1, pointer2);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
public void GetFunctionPointerForDelegate_NormalDelegateGeneric_ReturnsExpected()
{
Expand All @@ -53,7 +53,7 @@ public void GetFunctionPointerForDelegate_NormalDelegateGeneric_ReturnsExpected(
Assert.Equal(pointer1, pointer2);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
public void GetFunctionPointerForDelegate_MarshalledDelegateGeneric_ReturnsExpected()
{
Expand Down Expand Up @@ -92,7 +92,7 @@ public void GetFunctionPointer_GenericDelegate_ThrowsArgumentException()
AssertExtensions.Throws<ArgumentException>("delegate", () => Marshal.GetFunctionPointerForDelegate(d));
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser.")]
public void GetFunctionPointerForDelegate_MarshalledOpenStaticDelegate()
{
Expand All @@ -102,7 +102,7 @@ public void GetFunctionPointerForDelegate_MarshalledOpenStaticDelegate()
Assert.NotEqual(IntPtr.Zero, ptr);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser.")]
public void GetFunctionPointerForDelegate_MarshalledClosedStaticDelegate()
{
Expand Down
2 changes: 1 addition & 1 deletion ...time.InteropServices.UnitTests/System/Runtime/InteropServices/Marshal/IsComObjectTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static IEnumerable<object[]> IsComObject_TestData()
yield return new object[] { collectibleComImportObject };
}

[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
[MemberData(nameof(IsComObject_TestData))]
public void IsComObject_NonComObject_ReturnsFalse(object value)
{
Expand Down
5 changes: 5 additions & 0 deletions ...e.InteropServices.UnitTests/System/Runtime/InteropServices/Marshal/PtrToStructureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace System.Runtime.InteropServices.Tests
public class PtrToStructureTests
{
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73008", TestPlatforms.iOS | TestPlatforms.tvOS)]
public void StructureToPtr_NonGenericType_ReturnsExpected()
{
var structure = new SequentialClass
Expand Down Expand Up @@ -64,6 +65,7 @@ public void StructureToPtr_GenericType_ReturnsExpected()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73008", TestPlatforms.iOS | TestPlatforms.tvOS)]
public void StructureToPtr_NonGenericObject_ReturnsExpected()
{
var structure = new SomeTestStruct
Expand All @@ -90,6 +92,7 @@ public void StructureToPtr_NonGenericObject_ReturnsExpected()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73008", TestPlatforms.iOS | TestPlatforms.tvOS)]
public void StructureToPtr_GenericObject_ReturnsExpected()
{
var structure = new SomeTestStruct
Expand Down Expand Up @@ -146,6 +149,7 @@ public void PtrToStructure_AutoLayoutClass_ThrowsArgumentException()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73008", TestPlatforms.iOS | TestPlatforms.tvOS)]
public unsafe void PtrToStructure_GenericLayoutClass_Generic()
{
int i = 42;
Expand All @@ -156,6 +160,7 @@ public unsafe void PtrToStructure_GenericLayoutClass_Generic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73008", TestPlatforms.iOS | TestPlatforms.tvOS)]
public unsafe void PtrToStructure_GenericLayoutClass()
{
int i = 42;
Expand Down
1 change: 1 addition & 0 deletions ...e.InteropServices.UnitTests/System/Runtime/InteropServices/Marshal/StructureToPtrTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ public unsafe void StructureToPtr_OpaqueStruct_In_NonBlittableStructure_Success(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73008", TestPlatforms.iOS | TestPlatforms.tvOS)]
public void StructureToPtr_Flat_And_Nested_NonBlittableStructure_Success()
{
MarshalAndDestroy(new NonBlittableStruct_Flat
Expand Down
4 changes: 3 additions & 1 deletion src/libraries/System.Runtime.Loader/tests/DefaultContext/DefaultLoadContextTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ private Assembly ResolveNullAssembly(AssemblyLoadContext sender, AssemblyName as
return null;
}

[Fact]
// Does not apply to Mono AOT scenarios as it is expected the name of the .aotdata file matches
// the true name of the assembly and not the physical file name.
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
public void LoadInDefaultContext()
{
// This will attempt to load an assembly, by path, in the Default Load context via the Resolving event
Expand Down
21 changes: 18 additions & 3 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\**\*.Test.csproj" />
</ItemGroup>

<!-- Excluding all tests for devices until building on helix works properly -->
<ItemGroup Condition="'$(TargetOS)' == 'tvOS' and '$(RunDisablediOSTests)' != 'true'">
<!-- Ref.Emit in XSLCompiledTransform -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj" />
Expand All @@ -279,21 +278,29 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj" />

<!--
System.Formats.Cbor crashes on tvOS
Mysterious crashes on tvOS
-->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Formats.Cbor\tests\System.Formats.Cbor.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.MemoryMappedFiles\tests\System.IO.MemoryMappedFiles.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Numerics\tests\System.Runtime.Numerics.Tests.csproj" />

<!--
Test apps that are too large and take too long to build
Keep here until aggressive trimming targets can work on helix.

https://github.com/dotnet/runtime/issues/72834
https://github.com/dotnet/runtime/issues/72836
-->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />

<!--
Source generator tests aren't necessary on mobile
https://github.com/dotnet/runtime/issues/72836
-->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.Abstractions\tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.Abstractions\tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Unit.Tests\System.Text.Json.SourceGeneration.Roslyn4.0.Unit.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn4.0.Tests.csproj" />

<!-- Functional tests on devices have problems with return codes from mlaunch -->
Expand Down Expand Up @@ -640,11 +647,19 @@
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'iOS'">
<!-- Only System.Runtime tests on iOS for now -->
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests.csproj" />

<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'iOS' and '$(IsManualOrRollingBuild)' == 'true'">
<!-- These crash on tvOS, but do not on iOS. Run these only on the rolling builds -->
<ProjectReference Include="$(MSBuildThisFileDirectory)System.IO.MemoryMappedFiles\tests\System.IO.MemoryMappedFiles.Tests.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime.Numerics\tests\System.Runtime.Numerics.Tests.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Formats.Cbor\tests\System.Formats.Cbor.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(RunSmokeTestsOnly)' != 'true' and '$(TargetOS)' == 'iOSSimulator'">
<!-- https://github.com/dotnet/runtime/issues/57666 -->
<!-- <ProjectReference Include="$(MonoProjectRoot)sample\iOS\Program.csproj"
Expand Down