Merge branch 'preview/1.0' into develop/1.0

Author: petesramek

.github/actions/testing/test/action.yml

@@ -2,9 +2,11 @@
 author: 'Pete Sramek'
 description: 'Run tests, collects code coverage, logs test results, uploads test artifacts'
 inputs:
+# Required
   project-path:
-    description: 'Test project path.'
-    required: true  
+    description: 'Search pattern for test projects.'
+    required: true
+# Optional
   dotnet_sdk_version:
     description: '.NET SDK version. Default: 10.x'
     required: false
@@ -34,11 +36,11 @@ inputs:
     required: false
     default: 'true'
   test-results-directory:
-    description: 'Search pattern for test artifacts. Default: test-results'
+    description: 'Search pattern for test artifacts. Default: "test-results"'
     required: false
     default: 'test-results'
   test-artifacts-name:
-    description: 'Test artifacts name, Default: test-results'
+    description: 'Test artifacts name, Default: "test-results"'
     required: false
     default: 'test-results'
 
@@ -53,31 +55,26 @@ runs:
       with:
         dotnet-version: ${{ inputs.dotnet_sdk_version }}
 
-    - name: 'Test with .NET CLI (Native Code Coverage)'
+    - if: ${{ inputs.use-trf-logger == 'true' }}
+      name: 'Set TRX_LOGGER_ARGS environment variable'
       shell: bash
-      env:
-        DOTNET_USE_TEST_PLATFORM: '1'
-      run: |
-        ARGS=()
-        ARGS+=(--project ${{ inputs.project-path }} )
-        ARGS+=(--configuration "${{ inputs.build-configuration }}" )
-        ARGS+=(--results-directory "${{ inputs.test-results-directory }}" )
-
-        if [[ "${{ inputs.use-trf-logger }}" == "true" ]]; then
-          ARGS+=(--report-trx )
-        fi
+      run: echo "TRX_LOGGER_ARGS=--report-trx" >> $GITHUB_ENV
 
-        if [[ "${{ inputs.collect-code-coverage }}" == "true" ]]; then
-          ARGS+=(--coverage )
-          ARGS+=(--coverage-output-format "${{ inputs.code-coverage-output-format }}" )
-
-          if [[ -n "${{ inputs.code-coverage-settings-file }}" ]]; then
-            ARGS+=(--coverage-settings:"${{ inputs.code-coverage-settings-file }}" )
-          fi
-        fi
+    - if: ${{ inputs.collect-code-coverage == 'true' }}
+      name: 'Set CODE_COVERAGE_ARGS environment variable'
+      shell: bash
+      run: |
+        echo "CODE_COVERAGE_ARGS=--collect:"Code Coverage" --coverage-output-format ${{ inputs.code-coverage-output-format}}" >> $GITHUB_ENV
 
-        echo "Running: dotnet test ${ARGS[*]}"
-        dotnet test "${ARGS[@]}"
+    - if: ${{ inputs.collect-code-coverage == 'true' && inputs.code-coverage-settings-file != ''}}
+      name: 'Set CODE_COVERAGE_ARGS environment variable'
+      shell: bash
+      run: |
+        echo "CODE_COVERAGE_ARGS=${{ env.CODE_COVERAGE_ARGS }} --coverage-settings ${{ inputs.code-coverage-settings-file }}" >> $GITHUB_ENV
+      
+    - name: 'Test with .NET CLI'
+      shell: bash
+      run: dotnet test ${{ inputs.project-path }} --configuration ${{ inputs.build-configuration }} ${{ env.CODE_COVERAGE_ARGS }} ${{ env.TRX_LOGGER_ARGS }} --results-directory ${{ inputs.test-results-directory }}
 
     - name: 'Upload test results'
       if: ${{ inputs.upload-test-artifacts == 'true' }}