diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 698844ea1c4ded..2d11c86878dfe9 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -177,7 +177,7 @@ - + ios-device ios-device @@ -187,6 +187,20 @@ $(_workItemTimeout) $(_workItemTimeout) + + + + ios-device + ios-device + ios-simulator-64 + ios-simulator-32 + + $(_workItemTimeout) + + false + + 42 + diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 7a57738a2f7b34..de263d79fa539d 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -169,6 +169,9 @@ Exclude="@(ProjectExclusions)" BuildInParallel="false" Condition="'$(TestTrimming)' == 'true'" /> + Main(string[] args) +#else public static async Task Main(string[] args) +#endif { // Register a managed callback (will be called by UIButton, see main.m) // Also, keep the handler alive so GC won't collect it. @@ -48,6 +52,11 @@ public static async Task Main(string[] args) } Console.WriteLine("Done!"); +#if CI_TEST + await Task.Delay(5000); + return 42; +#else await Task.Delay(-1); +#endif } } diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj index 9772e4a154611a..04f3e311bae579 100644 --- a/src/mono/netcore/sample/iOS/Program.csproj +++ b/src/mono/netcore/sample/iOS/Program.csproj @@ -10,6 +10,7 @@ ios-$(TargetArchitecture) true Link + $(DefineConstants);CI_TEST @@ -82,10 +83,33 @@ - - - - - + + + + + + + + + + + + $(TargetOS).AnyCPU.$(Configuration) + + $(ArtifactsDir)helix/ + $(HelixArchiveRoot)runonly/ + $(HelixArchiveRunOnlyRoot)$(OSPlatformConfig)/ + + + <_appFiles Include="$(AppBundlePath)/../**/*" /> + + + + +