Revert temporary changes

Author: Youssef1313

azure-pipelines-official.yml

@@ -149,6 +149,8 @@ extends:
                   /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog
                 name: Test
                 displayName: Test
+                env:
+                  TESTINGPLATFORM_DEFAULT_HANG_TIMEOUT: 5m
 
               - task: CopyFiles@2
                 displayName: 'Copy binlogs'
@@ -217,6 +219,8 @@ extends:
                   ./test.sh --configuration $(_BuildConfig) --ci --test --integrationTest --nobl /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog
                 name: Test
                 displayName: Tests
+                env:
+                  TESTINGPLATFORM_DEFAULT_HANG_TIMEOUT: 5m
 
               - task: 1ES.PublishBuildArtifacts@1
                 displayName: 'Publish Test Results folders'

azure-pipelines.yml

@@ -115,21 +115,13 @@ stages:
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
           # We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
           # Otherwise, props/targets are not imported. It's important that they are imported so that IsTestingPlatformApplication ends up being set.
-          # - script: dotnet test -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
-          #   name: Test
-          #   displayName: Test
-          #   env:
-          #     DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
-          #     NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
-          #     DOTNET_CLI_CONTEXT_VERBOSE: 1
-          - script: Test.cmd
-              -configuration $(_BuildConfig)
-              -ci
-              -nobl
-              /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog
+          - script: dotnet test -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
+            name: Test
+            displayName: Test
             env:
               DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
-              TESTINGPLATFORM_DEFAULT_HANG_TIMEOUT: 20m
+              NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
+              DOTNET_CLI_CONTEXT_VERBOSE: 1
 
           - task: PublishBuildArtifacts@1
             displayName: 'Publish Test Results folders'
@@ -201,21 +193,13 @@ stages:
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
           # We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
           # Otherwise, props/targets are not imported. It's important that they are imported so that IsTestingPlatformApplication ends up being set.
-          # - script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
-          #   name: Test
-          #   displayName: Test
-          #   env:
-          #     DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
-          #     NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
-          #     DOTNET_CLI_CONTEXT_VERBOSE: 1
-
-          - script: |
-              chmod +x ./test.sh
-              ./test.sh --configuration $(_BuildConfig) --ci --test --integrationTest --nobl /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog
+          - script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
             name: Test
             displayName: Test
             env:
               DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
+              NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
+              DOTNET_CLI_CONTEXT_VERBOSE: 1
 
           - task: PublishBuildArtifacts@1
             displayName: 'Publish Test Results folders'
@@ -273,20 +257,13 @@ stages:
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
           # We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
           # Otherwise, props/targets are not imported. It's important that they are imported so that IsTestingPlatformApplication ends up being set.
-          # - script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
-          #   name: Test
-          #   displayName: Test
-          #   env:
-          #     DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
-          #     NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
-          #     DOTNET_CLI_CONTEXT_VERBOSE: 1
-          - script: |
-              chmod +x ./test.sh
-              ./test.sh --configuration $(_BuildConfig) --ci --test --integrationTest --nobl /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog
+          - script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
             name: Test
             displayName: Test
             env:
               DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
+              NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
+              DOTNET_CLI_CONTEXT_VERBOSE: 1
 
           - task: PublishBuildArtifacts@1
             displayName: 'Publish Test Results folders'