From 1a30f40e1cd5676981c247e61573a5c68fa47fd5 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Mon, 2 Sep 2024 22:28:48 -0400 Subject: [PATCH] chore: Adjust test paths --- build/ci/stage-build-linux-tests.yml | 18 +++++++++--------- build/ci/stage-build-macos-tests.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/ci/stage-build-linux-tests.yml b/build/ci/stage-build-linux-tests.yml index f2cdc7d..b600c9a 100644 --- a/build/ci/stage-build-linux-tests.yml +++ b/build/ci/stage-build-linux-tests.yml @@ -47,7 +47,7 @@ jobs: ## Raytracer validation - bash: | $(build.sourcesdirectory)/build/scripts/run-tests.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net6.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/WasmAot.UITests" "http://localhost:8000/" displayName: Raytracer UI Tests Net5 env: @@ -62,7 +62,7 @@ jobs: - bash: | $(build.sourcesdirectory)/build/scripts/run-tests.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.Threads/bin/Release/net8.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.Threads/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/Uno.Wasm.Threading.UITests" "http://localhost:8000/" displayName: Threading UI Tests env: @@ -77,7 +77,7 @@ jobs: - bash: | $(build.sourcesdirectory)/build/scripts/run-tests.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.Threads.Aot/bin/Release/net6.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.Threads.Aot/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/Uno.Wasm.Threading.UITests" "http://localhost:8000/" displayName: Threading AOT UI Tests env: @@ -92,7 +92,7 @@ jobs: - task: CopyFiles@2 inputs: - SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net6.0/publish + SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot Contents: '**/*.*' TargetFolder: $(build.artifactstagingdirectory)/subpath-override CleanTargetFolder: false @@ -101,7 +101,7 @@ jobs: - bash: | $(build.sourcesdirectory)/build/scripts/run-tests-swa.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net6.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/WasmAot.UITests" "http://localhost:8000/test/inner" displayName: Raytracer UI Tests Net5 (SWA) env: @@ -110,7 +110,7 @@ jobs: ## Static linking validation - bash: | $(build.sourcesdirectory)/build/scripts/run-tests.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.Net6/bin/Release/net6.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.Net6/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/" displayName: StaticLinking.Aot Tests net5 env: @@ -119,7 +119,7 @@ jobs: ## Static linking validation (net7) - bash: | $(build.sourcesdirectory)/build/scripts/run-tests.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net7.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/" displayName: StaticLinking.Aot Tests net7 env: @@ -135,7 +135,7 @@ jobs: ## Static linking validation (net7) - bash: | $(build.sourcesdirectory)/build/scripts/run-tests-csp.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net7.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/" displayName: StaticLinking.Aot Tests net7 (CSP Enabled) env: @@ -153,7 +153,7 @@ jobs: - task: CopyFiles@2 condition: always() inputs: - SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Server.net7/bin/Release/net7.0 + SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Server.net7/bin/Release/net9.0 Contents: '**/*.*' TargetFolder: $(build.artifactstagingdirectory)/Uno.Wasm.StaticLinking.Server.net7 CleanTargetFolder: false diff --git a/build/ci/stage-build-macos-tests.yml b/build/ci/stage-build-macos-tests.yml index 55be9a3..0d6c502 100644 --- a/build/ci/stage-build-macos-tests.yml +++ b/build/ci/stage-build-macos-tests.yml @@ -54,7 +54,7 @@ jobs: - bash: | $(build.sourcesdirectory)/build/scripts/run-tests.sh \ - "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Interpreter/bin/Release/net9.0/dist" \ + "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Interpreter/bin/Release/net9.0/publish/wwwroot" \ "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/" displayName: StaticLinking Interpreter Test env: