Skip to content

Bring up full library test CI runs on iOS / tvOS devices #59503

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 80 commits into from
Nov 2, 2021
Merged

Bring up full library test CI runs on iOS / tvOS devices #59503

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
64ef141
iOS AOT run w/ smaller test files
Aug 13, 2021
f7f87f7
Merge remote-tracking branch 'upstream/main' into test-zip-app
Aug 13, 2021
2e1ee0e
Bump timeout. Skip some tests that fail aot
Aug 14, 2021
336ec94
Merge remote-tracking branch 'upstream/main' into test-zip-app
Aug 14, 2021
9b29dc5
Print out space used and number of tests processed
Aug 15, 2021
4d678d5
Structure iOS test build to be able to run on helix
Sep 3, 2021
c42ef12
Get past race by enabling logging. Test passes on helix now
Sep 9, 2021
c69a4cd
Enable building on helix for other apple configurations
Sep 9, 2021
5324672
Integrate soft trimming
Sep 14, 2021
f052234
Update template to work with arcade changes
Sep 20, 2021
fe39010
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Sep 20, 2021
d610108
Post merge with main adjustments
Sep 21, 2021
f7bb825
Bring up library tests on iOS / tvOS devices
Sep 22, 2021
f084ae9
Bump arcade / cleanup
Sep 23, 2021
17a2bb2
fix sim runs
Sep 24, 2021
e5d84bc
Build tweaks to fix running tests locally
Sep 28, 2021
2b2d451
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Sep 28, 2021
c17c79e
Preserve more
Sep 28, 2021
7b4eda7
iOS arm64 runs take about 3 hours to complete. Use tvOS to get enough…
Sep 28, 2021
074f565
Figure out why tvos is taking forever uploading to helix.
Sep 28, 2021
abc79f2
Get sim lanes working. Move back to AggressiveTrimming
Sep 28, 2021
e5e136b
Save size by chopping native assets on the build machine and reassemb…
Sep 29, 2021
d8f104e
move binlog mv to sep step
Sep 29, 2021
5d9baa6
Make sure aot/process arguments are populated in the right spot
Sep 29, 2021
784cb6b
Remove trimming so that we can exclude the runtime pack from the arti…
Sep 29, 2021
c4c83fa
Fixup xml tests and debug/release local builds
Oct 7, 2021
9fbb6c7
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 7, 2021
62e907f
Don't use iOS device runs for now. Too little capacity
Oct 7, 2021
7b5ea33
Incorporate MonoTargetsTask
Oct 7, 2021
f90e00e
Skip generic math tests and additional test cleanup (paths)
Oct 8, 2021
650209b
Fix test
Oct 8, 2021
92259e2
Test fixup
Oct 8, 2021
5503e2b
Tweak
Oct 9, 2021
6023b0c
Set MONO_AOT_MODE environment variable to enable PlatformDetection.Is…
MaximLipnin Oct 11, 2021
891d814
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 11, 2021
9038a81
Enable System.Runtime tests on iOS devices only. Disable some tests
Oct 11, 2021
3415de4
Merge remote-tracking branch 'origin/build-ios-tests-helix' into buil…
Oct 11, 2021
25574ed
Skip SRE and fix more tests
Oct 11, 2021
fe194f7
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 12, 2021
56b30b7
Merge branch 'main' into build-ios-tests-helix
MaximLipnin Oct 12, 2021
2c4add6
Use a platform detection not a runtime feature
MaximLipnin Oct 12, 2021
61a895c
Skip more tests that use sre
Oct 12, 2021
41a9f51
Make sure runtimeconfig.bin is generated.
Oct 12, 2021
8ef6c49
Wrong name for runtimeconfig
Oct 12, 2021
ddc2b64
tweak
Oct 12, 2021
b52675b
Skip some tests - bump work item timeout
Oct 13, 2021
633a8f1
Exclude JitInfoIsNotPopulated test when dynamic code is not supported
MaximLipnin Oct 13, 2021
8653d81
Mark one test with an active issue on iOS
MaximLipnin Oct 13, 2021
b862450
Make sure the right test timeout is being passed along
Oct 13, 2021
2189974
Merge branch 'main' into build-ios-tests-helix
MaximLipnin Oct 14, 2021
aa50b69
Exclude more SRE tests
MaximLipnin Oct 14, 2021
d4f38c4
Exclude satellite assemblies from being AOT'd / System.Runtime.Loader…
Oct 14, 2021
f37b1cb
Merge remote-tracking branch 'origin/build-ios-tests-helix' into buil…
Oct 14, 2021
458fb58
Mark some serialization tests with an active issue on iOS/tvOS
MaximLipnin Oct 15, 2021
637c061
Merge branch 'main' into build-ios-tests-helix
MaximLipnin Oct 15, 2021
a5263c1
Mark more serialization tests with an active issue
MaximLipnin Oct 15, 2021
128238e
Mark some System.Threading.Channels.Tests with an active issue
MaximLipnin Oct 15, 2021
8ce67d4
Skip more tests that use SRE
Oct 15, 2021
7a8f49c
Active issue and skip more tests
Oct 18, 2021
3b4c602
Skip more tests
Oct 19, 2021
e1d1748
Skip loader tests that assume assemblies are in as resource files
Oct 19, 2021
680c648
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 19, 2021
4af365a
Skip failing RegexCultureTests
Oct 20, 2021
926989d
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 20, 2021
0003313
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 21, 2021
2419858
Skip test suites that hang for now
Oct 21, 2021
055b85d
Restored fact that was mistakenly removed
Oct 21, 2021
81bd7fd
Feedback
Oct 21, 2021
1a3b910
Skip DllImportGenerator tests as they were failing
Oct 22, 2021
3c1babf
Search top level only for zip files
Oct 22, 2021
fdb81ff
Skip DllImportGenerator tests on all apple mobile platforms. Tweak p…
Oct 22, 2021
7d43598
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 22, 2021
e7d92da
Fix check specific platform check for catalyst
Oct 25, 2021
633dcf7
Remove old condition that was breaking unrelated projects
Oct 25, 2021
ef910cf
Feedback
Oct 26, 2021
4800f60
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Oct 26, 2021
df80bf0
Fix process test introduced in https://github.com/dotnet/runtime/pull…
Oct 26, 2021
0fb5d0b
PR Feedback
Oct 30, 2021
6c3c9ee
Merge remote-tracking branch 'upstream/main' into build-ios-tests-helix
Nov 2, 2021
1b75f13
Apply smoke test setting to iOS & tvOS devices
Nov 2, 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
Bring up library tests on iOS / tvOS devices 
This change enables device runs on CI by building each test app on the helix instance it was deployed to.  In past attempts, we looked at enhancing the build step only via build tricks, compressing / cleaning up files early, etc and we could not overcome the need for excessively long timeouts and far more disk space.

The change also adopts the patterns established in the wasm test build, giving us the opportunity to support different scenario runs as well as workloads testing in the future.
  • Loading branch information
Steve Pfister committed Sep 22, 2021
commit f7bb82585067d4e2f532a7a6e2a21c0f6c0f2c75
4 changes: 2 additions & 2 deletions eng/pipelines/runtime-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
jobParameters:
testGroup: innerloop
nameSuffix: AllSubsets_Mono
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:EnableSoftTrimming=true /p:BuildDarwinFrameworks=true
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:EnableSoftTrimming=true /p:BuildTestsOnHelix=true /p:BuildDarwinFrameworks=true
timeoutInMinutes: 180
condition: >-
or(
Expand All @@ -177,8 +177,8 @@ jobs:
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
extraStepsParameters:
creator: dotnet-bot
interpreter: true
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
extraHelixArguments: /p:NeedsToBuildiOSAppsOnHelix=true
condition: >-
or(
eq(variables['librariesContainsChange'], true),
Expand Down
17 changes: 12 additions & 5 deletions eng/testing/tests.ioslike.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,24 @@
</PropertyGroup>

<PropertyGroup Condition="'$(BuildTestsOnHelix)' == 'true'">
<_AOTBuildCommand>export PATH=$HELIX_CORRELATION_PAYLOAD/build/cmake/cmake-3.16.4-Darwin-x86_64/CMake.app/Contents/bin:$PATH &amp;&amp; ls -la $HELIX_CORRELATION_PAYLOAD/build/cmake/cmake-3.16.4-Darwin-x86_64/CMake.app/Contents &amp;&amp; </_AOTBuildCommand>
<_AOTBuildCommand>$(_AOTBuildCommand) ls -la $EXECUTION_DIR &amp;&amp; </_AOTBuildCommand>
<_AOTBuildCommand>export PATH=$HELIX_CORRELATION_PAYLOAD/build/cmake/cmake-3.16.4-Darwin-x86_64/CMake.app/Contents/bin:$PATH &amp;&amp; </_AOTBuildCommand>
<_AOTBuildCommand>$(_AOTBuildCommand) dotnet msbuild publish/ProxyProjectForAOTOnHelix.proj /bl:$XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand>

<!-- running aot-helix tests locally, so we can test with the same project file as CI -->
<_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration)</_AOTBuildCommand>

<_AOTBuildCommand>$(_AOTBuildCommand) /p:XHARNESS_EXECUTION_DIR=&quot;$XHARNESS_EXECUTION_DIR&quot; /p:RunAOTCompilation=$(RunAOTCompilation) /p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:MonoForceInterpreter=$(MonoForceInterpreter) /p:MonoEnableLLVM=true /p:DevTeamProvisioning=$(DevTeamProvisioning)</_AOTBuildCommand>
<_AOTBuildCommand>$(_AOTBuildCommand) &amp;&amp; ls -la $EXECUTION_DIR</_AOTBuildCommand>
<_AOTBuildCommand>$(_AOTBuildCommand) &amp;&amp; mv $XHARNESS_OUT/AOTBuild.binlog &quot;$HELIX_WORKITEM_UPLOAD_ROOT&quot;</_AOTBuildCommand>

<RunScriptCommand>$(_AOTBuildCommand)</RunScriptCommand>
<_ResetSimulatorSwitch Condition="'$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOSSimulator'">--reset-simulator</_ResetSimulatorSwitch>
<_SignalAppEndSwitch Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">--signal-app-end</_SignalAppEndSwitch>

<_AfterBuildCommands>
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>

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

<Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleApp.props"
Expand Down Expand Up @@ -92,7 +99,7 @@
OutputFile="$(BundleDir)publish\ProxyProjectForAOTOnHelix.props" />

<Copy SourceFiles="@(BundleFiles)" DestinationFolder="$(BundleDir)%(TargetDir)" />
<Copy SourceFiles="@(ExtraFiles)" DestinationFiles="$(BundleDir)\%(TargetDir)" />
<Copy SourceFiles="@(ExtraFiles)" DestinationFolder="$(BundleDir)\%(TargetDir)" />

<PropertyGroup>
<AppBundlePath>$(BundleDir)publish</AppBundlePath>
Expand Down
23 changes: 14 additions & 9 deletions src/libraries/sendtohelixhelp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,18 +310,31 @@
<AppleTestTarget Condition="'$(TargetOS)' == 'MacCatalyst'">maccatalyst</AppleTestTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'MacCatalyst'">
<iOSBuildTargetsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'msbuild', 'apple', 'build'))</iOSBuildTargetsDir>
<WorkItemPrefix Condition="'$(Scenario)' == 'BuildiOSApps' and '$(TestUsingWorkloads)' != 'true'">$(TargetOS)-</WorkItemPrefix>

<CMakeUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/macos/cmake/cmake-3.16.4-Darwin-x86_64.tar.gz</CMakeUrl>

<_XHarnessAppleCustomCommand Condition="'$(NeedsiOSSDK)' == 'true'">
source build-apple-app.sh
</_XHarnessAppleCustomCommand>
</PropertyGroup>

<ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'MacCatalyst'">
<!-- Create work items for test apps -->
<XHarnessAppBundleToTest
Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))">
<TestTarget>$(AppleTestTarget)</TestTarget>
<CustomCommands>$(_XHarnessAppleCustomCommand)</CustomCommands>
</XHarnessAppBundleToTest>

<!-- To save on overall size, we compress each app after building. -->
<XHarnessAppBundleToTest
Include="$([System.IO.Directory]::GetFiles('$(TestArchiveTestsRoot)', '*.zip', System.IO.SearchOption.AllDirectories))"
Exclude="$([System.IO.Directory]::GetFiles('$(TestArchiveRoot)', 'xharness-app-payload*', System.IO.SearchOption.AllDirectories))">
<TestTarget>$(AppleTestTarget)</TestTarget>
<CustomCommands>$(_XHarnessAppleCustomCommand)</CustomCommands>
</XHarnessAppBundleToTest>

<!-- Create work items for run-only apps -->
Expand Down Expand Up @@ -358,15 +371,6 @@
</XHarnessApkToTest>
</ItemGroup>

<PropertyGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator'">
<iOSBuildTargetsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'msbuild', 'apple', 'build'))</iOSBuildTargetsDir>
<WorkItemPrefix Condition="'$(Scenario)' == 'BuildiOSApps' and '$(TestUsingWorkloads)' != 'true'">$(TargetOS)-</WorkItemPrefix>

<CMakeUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/macos/cmake/cmake-3.16.4-Darwin-x86_64.tar.gz</CMakeUrl>

<XHarnessAppleShouldBuildApps Condition="'$(NeedsiOSSDK)' == 'true'">true</XHarnessAppleShouldBuildApps>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
<EmSdkDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'emsdk'))</EmSdkDir>
<WasmBuildTargetsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build'))</WasmBuildTargetsDir>
Expand Down Expand Up @@ -425,6 +429,7 @@
<ItemGroup Condition="'$(NeedsiOSSDK)' == 'true'">
<HelixCorrelationPayload Include="cmake" Uri="$(CMakeUrl)" Destination="build/cmake" />
<HelixCorrelationPayload Include="$(AppleAppBuilderDir)" Destination="build/AppleAppBuilder" />
<HelixCorrelationPayload Include="$(ILStripTaskDir)" Destination="build/ILStrip" />
<HelixCorrelationPayload Include="$(MonoAOTCompilerDir)" Destination="build/MonoAOTCompiler" />
<HelixCorrelationPayload Include="$(MicrosoftNetCoreAppRuntimePackDir)" Destination="build/microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture.ToLower())" />
<HelixCorrelationPayload Include="$(iOSBuildTargetsDir)" Destination="build/apple" />
Expand Down
52 changes: 6 additions & 46 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,10 @@

<!-- Excluding all tests for devices until building on helix works properly -->
<ItemGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS') and '$(RunDisablediOSTests)' != 'true'">
<ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" />

<!-- Functional tests on devices have problems with return codes from mlaunch -->
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\$(TargetOS)\Device\**\*.Test.csproj" />
</ItemGroup>

<!-- Excluding all tests for devices until building on helix works properly -->
<ItemGroup Condition="('$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOSSimulator') and '$(RunDisablediOSTests)' != 'true'">
<ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" />

<!-- Functional tests on devices have problems with return codes from mlaunch -->
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\$(TargetOS)\Simulator\**\*.Test.csproj" />
</ItemGroup>

<!-- Excluding all tests for aot catalyst until building on helix works properly -->
<ItemGroup Condition="('$(TargetOS)' == 'MacCatalyst' and '$(BuildTestsOnHelix)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
<ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" />
Expand Down Expand Up @@ -231,7 +221,7 @@
</ItemGroup>

<!-- Aggressive Trimming related failures -->
<ItemGroup Condition="('$(TargetOS)' != 'Browser' and '$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true') or ('$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true')">
<ItemGroup Condition="('$(TargetOS)' != 'Browser' and '$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true') or ('$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true') or ('$(TargetOS)' == 'iOS' and '$(BuildTestsOnHelix)' == 'true')">
<!-- Issue: https://github.com/dotnet/runtime/issues/50724 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime\tests\System.Dynamic.Runtime.Tests.csproj" />
Expand Down Expand Up @@ -299,66 +289,36 @@
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'iOS'">
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Buffers\tests\System.Buffers.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'iOSSimulator'">
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Buffers\tests\System.Buffers.Tests.csproj" />
<!-- https://github.com/dotnet/runtime/issues/57666 -->
<!-- <ProjectReference Include="$(MonoProjectRoot)sample\iOS\Program.csproj"
BuildInParallel="false" /> -->
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'tvOS'">
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Buffers\tests\System.Buffers.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\Device\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'MacCatalyst' and '$(BuildTestsOnHelix)' == 'true'">
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Buffers\tests\System.Buffers.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(BuildTestsOnHelix)' != 'true' and ('$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'MacCatalyst')">
<ProjectReference Include="$(MonoProjectRoot)sample\iOS\Program.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections\tests\System.Collections.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections.NonGeneric\tests\System.Collections.NonGeneric.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections.Specialized\tests\System.Collections.Specialized.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections.Immutable\tests\System.Collections.Immutable.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

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

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

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(BuildTestsOnHelix)' != 'true' and '$(TargetOS)' == 'tvOS'">
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Buffers\tests\System.Buffers.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections\tests\System.Collections.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections.NonGeneric\tests\System.Collections.NonGeneric.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections.Specialized\tests\System.Collections.Specialized.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\libraries\System.Collections.Immutable\tests\System.Collections.Immutable.Tests.csproj" />
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\Device\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(BuildTestsOnHelix)' != 'true' and '$(TargetOS)' == 'tvOSSimulator'">
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'tvOSSimulator'">
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\Simulator\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
Expand Down
18 changes: 0 additions & 18 deletions src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,12 @@
<PropertyGroup>
<_TestProjectName>$([System.IO.Path]::GetFileName('$(AppBundlePath)'))</_TestProjectName>
<_XHarnessAppPath>$([MSBuild]::NormalizeDirectory($(XHARNESS_EXECUTION_DIR), $(_TestProjectName)))</_XHarnessAppPath>

<_DebugDir>$([MSBuild]::NormalizeDirectory($(XHARNESS_EXECUTION_DIR), $(_TestProjectName)))</_DebugDir>
</PropertyGroup>
<ItemGroup>
<_AppBundleFiles Include="$(AppBundlePath)\**\*" />
<_AppBundleFiles Include="$(XHARNESS_EXECUTION_DIR)\*.mobileprovision" />

<_DebugPublishFiles Include="$(OriginalPublishDir)**\*" />
<_DebugAppFiles Include="$(TestRootDir)**\*" />
</ItemGroup>

<MakeDir Directories="$(_DebugDir)" />
<MakeDir Directories="$(_DebugDir)publish" />
<MakeDir Directories="$(_DebugDir)apple_build" />

<Copy SourceFiles="@(_DebugPublishFiles)"
DestinationFiles="@(_DebugPublishFiles->'$(_DebugDir)publish\%(RecursiveDir)%(Filename)%(Extension)')" />
<!--<Copy SourceFiles="@(_DebugAppFiles)"
DestinationFiles="@(_DebugAppFiles->'$(_DebugDir)apple_build\%(RecursiveDir)%(Filename)%(Extension)')" />-->

<ZipDirectory SourceDirectory="$(_DebugDir)"
DestinationFile="$([MSBuild]::NormalizePath('$(XHARNESS_EXECUTION_DIR)', '$(_TestProjectName).zip'))"
Overwrite="true" />

<MakeDir Directories="$(_XHarnessAppPath)" />

<Move SourceFiles="@(_AppBundleFiles)"
Expand Down