Remove whacky predicate logic and use enabled property

PrismLibrary · Apr 22, 2020 · e99fcf1 · e99fcf1
1 parent 1f1a9d9
commit e99fcf1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 31 deletions.
diff --git a/build/steps/test-core.yml b/build/steps/test-core.yml
@@ -7,8 +7,8 @@ steps:
 
   displayName: Test Prism.Core
 
-- ${{ if eq(parameters.publishTestResults, true) }}:
-  - template: publish-vstest-results.yml
-    parameters:
-      testRunTitle: Prism.Core
-      testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Prism.Core.Tests/TestResults/*.trx'
+- template: publish-vstest-results.yml
+  enabled: ${{ parameters.publishTestResults }}
+  parameters:
+    testRunTitle: Prism.Core
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Prism.Core.Tests/TestResults/*.trx'
diff --git a/build/steps/test-forms.yml b/build/steps/test-forms.yml
@@ -9,18 +9,20 @@ steps:
 
   displayName: Test Prism.Forms
 
-- ${{ if eq(parameters.publishTestResults, true) }}:
-  - template: publish-vstest-results.yml
-    parameters:
-      testRunTitle: Prism.Forms
-      testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Forms/Prism.Forms.Tests/TestResults/*.trx'
+- template: publish-vstest-results.yml
+  enabled: ${{ parameters.publishTestResults }}
+  parameters:
+    testRunTitle: Prism.Forms
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Forms/Prism.Forms.Tests/TestResults/*.trx'
 
-  - template: publish-vstest-results.yml
-    parameters:
-      testRunTitle: Prism.DryIoc.Forms
-      testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Forms/Prism.DryIoc.Forms.Tests/TestResults/*.trx'
+- template: publish-vstest-results.yml
+  enabled: ${{ parameters.publishTestResults }}
+  parameters:
+    testRunTitle: Prism.DryIoc.Forms
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Forms/Prism.DryIoc.Forms.Tests/TestResults/*.trx'
 
-  - template: publish-vstest-results.yml
-    parameters:
-      testRunTitle: Prism.Unity.Forms
-      testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Forms/Prism.Unity.Forms.Tests/TestResults/*.trx'
+- template: publish-vstest-results.yml
+  enabled: ${{ parameters.publishTestResults }}
+  parameters:
+    testRunTitle: Prism.Unity.Forms
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Forms/Prism.Unity.Forms.Tests/TestResults/*.trx'
diff --git a/build/steps/test-wpf.yml b/build/steps/test-wpf.yml
@@ -9,18 +9,20 @@ steps:
 
   displayName: Test Prism.WPF
 
-- ${{ if eq(parameters.publishTestResults, true) }}:
-  - template: publish-vstest-results.yml
-    parameters:
-      testRunTitle: Prism.WPF
-      testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Wpf/Prism.Wpf.Tests/TestResults/*.trx'
+- template: publish-vstest-results.yml
+  enabled: ${{ parameters.publishTestResults }}
+  parameters:
+    testRunTitle: Prism.WPF
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Wpf/Prism.Wpf.Tests/TestResults/*.trx'
 
-  - template: publish-vstest-results.yml
-    parameters:
-      testRunTitle: Prism.DryIoc.WPF
-      testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Wpf/Prism.DryIoc.Wpf.Tests/TestResults/*.trx'
+- template: publish-vstest-results.yml
+  enabled: ${{ parameters.publishTestResults }}
+  parameters:
+    testRunTitle: Prism.DryIoc.WPF
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Wpf/Prism.DryIoc.Wpf.Tests/TestResults/*.trx'
 
-  - template: publish-vstest-results.yml
-    parameters:
-      testRunTitle: Prism.Unity.WPF
-      testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Wpf/Prism.Unity.Wpf.Tests/TestResults/*.trx'
+- template: publish-vstest-results.yml
+  enabled: ${{ parameters.publishTestResults }}
+  parameters:
+    testRunTitle: Prism.Unity.WPF
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/tests/Wpf/Prism.Unity.Wpf.Tests/TestResults/*.trx'