From a7b106277b99bdafefc9b4b30193765ffc747580 Mon Sep 17 00:00:00 2001 From: Shyju Krishnankutty Date: Thu, 5 Sep 2024 15:02:52 -0700 Subject: [PATCH] Fixing path separator character to work with both linux and windows.Build DotnetWorker.Extensions.sln as well for tests --- .../templates/jobs/run-integration-tests-linux.yml | 5 +++-- .../jobs/run-integration-tests-windows.yml | 4 +++- eng/ci/templates/jobs/run-unit-tests.yml | 14 +++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/eng/ci/templates/jobs/run-integration-tests-linux.yml b/eng/ci/templates/jobs/run-integration-tests-linux.yml index c5f904c4..f2b53e85 100644 --- a/eng/ci/templates/jobs/run-integration-tests-linux.yml +++ b/eng/ci/templates/jobs/run-integration-tests-linux.yml @@ -20,7 +20,9 @@ jobs: inputs: command: build arguments: '-c Release' - projects: DotNetWorker.sln + projects: | + DotNetWorker.sln + DotNetWorker.Extensions.sln - template: /eng/ci/templates/steps/setup-e2e-tests.yml@self parameters: @@ -36,4 +38,3 @@ jobs: arguments: '--no-build -c Release --filter "FullyQualifiedName~HttpTrigger"' # only run http tests to avoid emulators on Linux projects: | test/**/*Tests.csproj - !test/**/Worker.Extensions.Rpc.Tests.csproj diff --git a/eng/ci/templates/jobs/run-integration-tests-windows.yml b/eng/ci/templates/jobs/run-integration-tests-windows.yml index 3a383067..9da28120 100644 --- a/eng/ci/templates/jobs/run-integration-tests-windows.yml +++ b/eng/ci/templates/jobs/run-integration-tests-windows.yml @@ -30,7 +30,9 @@ jobs: inputs: command: build arguments: '-c Release' - projects: DotNetWorker.sln + projects: | + DotNetWorker.sln + DotNetWorker.Extensions.sln - template: /eng/ci/templates/steps/setup-e2e-tests.yml@self parameters: diff --git a/eng/ci/templates/jobs/run-unit-tests.yml b/eng/ci/templates/jobs/run-unit-tests.yml index 241359e6..b50cc4ce 100644 --- a/eng/ci/templates/jobs/run-unit-tests.yml +++ b/eng/ci/templates/jobs/run-unit-tests.yml @@ -30,7 +30,7 @@ jobs: command: test arguments: -v n projects: | - **\DotNetWorkerTests.csproj + **/DotNetWorkerTests.csproj - task: DotNetCoreCLI@2 displayName: OpenTelemetry Tests @@ -38,7 +38,7 @@ jobs: command: test arguments: -v n projects: | - **\DotNetWorker.Opentelemetry.Tests.csproj + **/DotNetWorker.Opentelemetry.Tests.csproj - task: DotNetCoreCLI@2 displayName: Sdk Tests @@ -56,8 +56,8 @@ jobs: command: test arguments: -v n projects: | - **\Worker.Extensions.Http.AspNetCore.Tests.csproj - **\Worker.Extensions.Rpc.Tests.csproj - **\Worker.Extensions.Shared.Tests.csproj - **\Worker.Extensions.SignalRService.Tests.csproj - **\Worker.Extensions.Tests.csproj + **/Worker.Extensions.Http.AspNetCore.Tests.csproj + **/Worker.Extensions.Rpc.Tests.csproj + **/Worker.Extensions.Shared.Tests.csproj + **/Worker.Extensions.SignalRService.Tests.csproj + **/Worker.Extensions.Tests.csproj