Restart the Simulator.app and upload XUnit results

Author: premun

azure-pipelines.yml

@@ -21,7 +21,7 @@ variables:
   - name: _HelixAccessToken
     value: ''
 
-# PR trigger only 
+# PR trigger only
 pr:
   branches:
     include:
@@ -186,7 +186,7 @@ stages:
       steps:
       - download: current
         artifact: Microsoft.DotNet.XHarness.CLI.OSX.IntegrationTests.Debug
-         
+
       - template: /eng/common/templates/steps/send-to-helix.yml
         parameters:
           DisplayNamePrefix: Run Tests
@@ -198,12 +198,13 @@ stages:
           WaitForWorkItemCompletion: true
           HelixTargetQueues: osx.1015.amd64.ios.open
           Creator: xharness
+          EnableXUnitReporter: true
           WorkItemDirectory: $(Pipeline.Workspace)/Microsoft.DotNet.XHarness.CLI.OSX.IntegrationTests.Debug
           WorkItemCommand: sudo launchctl asuser `id -u` sh osx-helix-payload.sh $HELIX_WORKITEM_UPLOAD_ROOT
           WorkItemTimeout: 00:12:00
           env:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-            HelixAccessToken: ''     
+            HelixAccessToken: ''
 
 - ${{ if eq(variables._RunAsInternal, True) }}:
   - template: eng\common\templates\post-build\post-build.yml

tests/integration-tests/helix-payload/osx-helix-payload.sh

@@ -38,8 +38,10 @@ dotnet tool install --no-cache --version $version --add-source .. Microsoft.DotN
 export XHARNESS_DISABLE_COLORED_OUTPUT=true
 export XHARNESS_LOG_WITH_TIMESTAMPS=true
 
-# We have to call this otherwise mlaunch fails to spawn it properly
+# Restart the simulator to make sure it is tied to the right user session
 xcode_path=`xcode-select -p`
+pid=`ps aux | grep $xcode_path/Applications/Simulator.app | grep -v grep | tr -s ' ' | cut -d ' ' -f 2`
+sudo kill $pid
 open -a $xcode_path/Applications/Simulator.app
 
 dotnet tool restore --no-cache