- fix

dotnet · Aug 16, 2024 · 8956567 · 8956567
1 parent e592b9d
commit 8956567
Showing 1 changed file with 35 additions and 18 deletions.
diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
@@ -33,10 +33,6 @@ steps:
       skipAndroidImages : ${{ eq(parameters.platform, 'ios') }}
       skipAndroidSdks: ${{ eq(parameters.platform, 'ios') }}
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
-      ${{ if eq(parameters.platform, 'android')}}: # Everything should be release but doing android for now to work around an xharness issue
-        configuration: release
-      ${{ if or(eq(parameters.platform, 'ios'), eq(parameters.platform, 'catalyst'), eq(parameters.platform, 'windows'))}}:
-        configuration: debug
 
   - pwsh: ./build.ps1 --target=dotnet --configuration="Release" --verbosity=diagnostic
     displayName: 'Install .NET'
@@ -92,20 +88,41 @@ steps:
       continueOnError: true
       timeoutInMinutes: 5
 
-  - pwsh: |
-      ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --configuration="${{ parameters.configuration }}"
-    displayName: $(Agent.JobName)
-    workingDirectory: ${{ parameters.checkoutDirectory }}
-    condition: and(succeeded(), ne(variables['Platform.Name'], 'Mac'))
-    retryCountOnTaskFailure: 1
-
-  - bash: |
-      # Execute the powershell script from a bash shell on Mac to avoid interference between powershell processes that lead to this error: The STDIO streams did not close within 10 seconds of the exit event from process '/usr/local/bin/pwsh'. This may indicate a child process inherited the STDIO streams and has not yet exited.
-      pwsh ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}  --configuration="${{ parameters.configuration }}"
-    displayName: $(Agent.JobName)
-    workingDirectory: ${{ parameters.checkoutDirectory }}
-    condition: and(succeeded(), eq(variables['Platform.Name'], 'Mac'))
-    retryCountOnTaskFailure: 1
+  # Everything should be release but doing android for now to work around an xharness issue
+  - ${{ if eq(parameters.platform, 'android')}}:
+    - pwsh: |
+        ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --configuration="Release"
+      displayName: $(Agent.JobName)
+      workingDirectory: ${{ parameters.checkoutDirectory }}
+      condition: and(succeeded(), ne(variables['Platform.Name'], 'Mac'))
+      retryCountOnTaskFailure: 1
+
+  - ${{ if eq(parameters.platform, 'android')}}:
+    - bash: |
+        # Execute the powershell script from a bash shell on Mac to avoid interference between powershell processes that lead to this error: The STDIO streams did not close within 10 seconds of the exit event from process '/usr/local/bin/pwsh'. This may indicate a child process inherited the STDIO streams and has not yet exited.
+        pwsh ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --configuration="Release"
+      displayName: $(Agent.JobName)
+      workingDirectory: ${{ parameters.checkoutDirectory }}
+      condition: and(succeeded(), eq(variables['Platform.Name'], 'Mac'))
+      retryCountOnTaskFailure: 1
+
+  - ${{ if ne(parameters.platform, 'android')}}:
+    - pwsh: |
+        ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}
+      displayName: $(Agent.JobName)
+      workingDirectory: ${{ parameters.checkoutDirectory }}
+      condition: and(succeeded(), ne(variables['Platform.Name'], 'Mac'))
+      retryCountOnTaskFailure: 1
+
+  - ${{ if ne(parameters.platform, 'android')}}:
+    - bash: |
+        # Execute the powershell script from a bash shell on Mac to avoid interference between powershell processes that lead to this error: The STDIO streams did not close within 10 seconds of the exit event from process '/usr/local/bin/pwsh'. This may indicate a child process inherited the STDIO streams and has not yet exited.
+        pwsh ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}
+      displayName: $(Agent.JobName)
+      workingDirectory: ${{ parameters.checkoutDirectory }}
+      condition: and(succeeded(), eq(variables['Platform.Name'], 'Mac'))
+      retryCountOnTaskFailure: 1
+  # Everything should be release but doing android for now to work around an xharness issue
 
   - ${{ if eq(parameters.platform, 'ios')}}:
     - bash: |