|
109 | 109 | SuperPmiCollect=$(_SuperPmiCollect)
|
110 | 110 | </_PropertiesToPass>
|
111 | 111 |
|
112 |
| - <_PropertiesToPass Condition="'$(TargetOS)' == 'browser' Or '$(TargetsAndroid)' == 'true'"> |
| 112 | + <_PropertiesToPass Condition="'$(TargetOS)' == 'browser' Or '$(TargetsAndroid)' == 'true' Or '$(TargetsiOS)' == 'true' Or '$(TargetsiOSSimulator)' == 'true' Or '$(TargetstvOS)' == 'true' Or '$(TargetstvOSSimulator)' == 'true'"> |
113 | 113 | $(_PropertiesToPass);
|
114 | 114 | IncludeDotNetCli=$(IncludeDotNetCli);
|
115 | 115 | DotNetCliRuntime=$(DotNetCliRuntime);
|
|
161 | 161 | <HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'browser'">browser-wasm</HelixRuntimeRid>
|
162 | 162 | <HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'android'">android-$(TargetArchitecture)</HelixRuntimeRid>
|
163 | 163 | <HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'iossimulator'">iossimulator-$(TargetArchitecture)</HelixRuntimeRid>
|
| 164 | + <HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'ios'">ios-$(TargetArchitecture)</HelixRuntimeRid> |
| 165 | + <HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'tvossimulator'">tvossimulator-$(TargetArchitecture)</HelixRuntimeRid> |
| 166 | + <HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'tvos'">tvos-$(TargetArchitecture)</HelixRuntimeRid> |
164 | 167 | </PropertyGroup>
|
165 | 168 |
|
166 | 169 | <PropertyGroup>
|
|
507 | 510 | Condition="'$(TargetsAppleMobile)' == 'true'"
|
508 | 511 | Outputs="%(_MergedWrapperMarker.FileName)"
|
509 | 512 | DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
|
| 513 | + |
510 | 514 | <PropertyGroup>
|
511 | 515 | <_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
|
512 | 516 | <_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName>
|
|
593 | 597 | <TimeoutPerTestInMilliseconds Condition=" '$(TimeoutPerTestInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds)</TimeoutPerTestInMilliseconds>
|
594 | 598 | <WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
|
595 | 599 | <_XUnitParallelMode>collections</_XUnitParallelMode>
|
596 |
| - <_XUnitParallelMode Condition=" '$(TargetsAndroid)' == 'true' or '$(TargetsiOSSimulator)' == 'true'">none</_XUnitParallelMode> |
| 600 | + <_XUnitParallelMode Condition=" '$(TargetsAndroid)' == 'true' or '$(TargetsiOSSimulator)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOSSimulator)' == 'true' or '$(TargetstvOS)' == 'true'">none</_XUnitParallelMode> |
597 | 601 | <_XUnitParallelMode Condition=" '$(LongRunningGCTests)' == 'true' ">none</_XUnitParallelMode>
|
598 | 602 | <_XUnitParallelMode Condition=" '$(GcSimulatorTests)' == 'true' ">none</_XUnitParallelMode>
|
599 | 603 | <XUnitRunnerArgs>-parallel $(_XUnitParallelMode) -nocolor -noshadow -xml testResults.xml</XUnitRunnerArgs>
|
|
735 | 739 | <ItemGroup Condition=" '$(UsesHelixSdk)' == 'true' ">
|
736 | 740 | <HelixCorrelationPayload Include="$(CoreRootDirectory)" />
|
737 | 741 |
|
738 |
| - <!-- Browser-Wasm follows a very different workflow, which is currently out of scope of the Log Checker. --> |
739 |
| - <HelixCorrelationPayload Include="$(XUnitLogCheckerDirectory)" Condition="'$(TargetsBrowser)' != 'true'" /> |
| 742 | + <!-- Browser-Wasm and iOS platforms follow a very different workflow, which is currently out of scope of the Log Checker. It's not useful on any platform that uses xharness. --> |
| 743 | + <HelixCorrelationPayload Include="$(XUnitLogCheckerDirectory)" Condition="'$(TargetsBrowser)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetsiOSSimulator)' != 'true' and '$(TargetstvOS)' != 'true' and '$(TargetstvOSSimulator)' != 'true'" /> |
740 | 744 | <HelixCorrelationPayload Condition="'$(TestWrapperTargetsWindows)' == 'true'" Include="dotnet-sos">
|
741 | 745 | <Destination>sos</Destination>
|
742 | 746 | <Uri>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/flat2/dotnet-sos/$(DotnetSosVersion)/dotnet-sos.$(DotnetSosVersion).nupkg</Uri>
|
|
836 | 840 | </ItemGroup>
|
837 | 841 | </Target>
|
838 | 842 |
|
| 843 | + <PropertyGroup> |
| 844 | + <SigningCommand Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'"> |
| 845 | + <![CDATA[ |
| 846 | + for APP_FILE in `find . -name *.app`; do cp embedded.mobileprovision $APP_FILE; sign $APP_FILE; done; ]]> |
| 847 | + </SigningCommand> |
| 848 | + </PropertyGroup> |
| 849 | + |
| 850 | + <PropertyGroup Condition="'$(TargetsAppleMobile)' == 'true'"> |
| 851 | + <AppleTestTarget Condition="'$(TargetOS)' == 'iossimulator'">ios-simulator-64</AppleTestTarget> |
| 852 | + <AppleTestTarget Condition="'$(TargetOS)' == 'tvossimulator'">tvos-simulator</AppleTestTarget> |
| 853 | + <AppleTestTarget Condition="'$(TargetOS)' == 'ios'">ios-device</AppleTestTarget> |
| 854 | + <AppleTestTarget Condition="'$(TargetOS)' == 'tvos'">tvos-device</AppleTestTarget> |
| 855 | + <AppleTestTarget Condition="'$(TargetOS)' == 'maccatalyst'">maccatalyst</AppleTestTarget> |
| 856 | + </PropertyGroup> |
| 857 | + |
839 | 858 | <ItemGroup>
|
840 | 859 | <HelixWorkItem Include="@(LegacyPayloads->Metadata('PayloadGroup'))" Condition="'$(TargetHasHelixXHarnessSdkSupport)' != 'true'">
|
841 | 860 | <PayloadDirectory>%(PayloadDirectory)</PayloadDirectory>
|
|
859 | 878 | </XHarnessApkToTest>
|
860 | 879 |
|
861 | 880 | <XHarnessAppBundleToTest Include="@(LegacyPayloads->Metadata('PayloadZipFile'))" Condition="'$(TargetsAppleMobile)' == 'true'">
|
862 |
| - <TestTarget Condition="'$(TargetArchitecture)' == 'arm64'">ios-simulator-64</TestTarget> |
863 |
| - <TestTarget Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</TestTarget> |
| 881 | + <TestTarget>$(AppleTestTarget)</TestTarget> |
864 | 882 | <TestTimeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</TestTimeout>
|
865 |
| - <CustomCommands>dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs)</CustomCommands> |
866 |
| - <CustomCommands Condition=" '%(TestGroup)' != '' ">dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) -trait TestGroup=%(TestGroup)</CustomCommands> |
| 883 | + <CustomCommands> $(SigningCommand) dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs)</CustomCommands> |
| 884 | + <CustomCommands Condition=" '%(TestGroup)' != '' ">$(SigningCommand) dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) -trait TestGroup=%(TestGroup)</CustomCommands> |
867 | 885 | </XHarnessAppBundleToTest>
|
868 | 886 |
|
869 | 887 | <XHarnessAppBundleToTest Include="@(MergedPayloads->Metadata('PayloadGroup'))" Condition="'$(TargetsAppleMobile)' == 'true'">
|
870 | 888 | <Arguments>--set-env=TestExclusionListPath=TestExclusionList.txt</Arguments>
|
871 |
| - <TestTarget Condition="'$(TargetArchitecture)' == 'arm64'">ios-simulator-64</TestTarget> |
872 |
| - <TestTarget Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</TestTarget> |
| 889 | + <TestTarget>$(AppleTestTarget)</TestTarget> |
873 | 890 | <TestTimeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</TestTimeout>
|
874 | 891 | </XHarnessAppBundleToTest>
|
875 | 892 |
|
|
0 commit comments