diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2847ffe15..b46235bbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,7 +184,7 @@ jobs: if [ "${{ matrix.mtls }}" = "true" ]; then export Grpc__ClientP12="${{ steps.deploy.outputs.generated-folder }}/certificates/ingress/client.submitter.p12" fi - dotnet test --runtime linux-x64 -f net8.0 --logger "trx;LogFileName=test-results.trx" + dotnet test --runtime linux-x64 -f net6.0 --logger "trx;LogFileName=test-results.trx" - name: Test Report uses: dorny/test-reporter@v1 diff --git a/Tests/ArmoniK.DevelopmentKit.Common.Tests/ArmoniK.DevelopmentKit.Common.Tests.csproj b/Tests/ArmoniK.DevelopmentKit.Common.Tests/ArmoniK.DevelopmentKit.Common.Tests.csproj index 1173a4457..2b0884996 100644 --- a/Tests/ArmoniK.DevelopmentKit.Common.Tests/ArmoniK.DevelopmentKit.Common.Tests.csproj +++ b/Tests/ArmoniK.DevelopmentKit.Common.Tests/ArmoniK.DevelopmentKit.Common.Tests.csproj @@ -1,7 +1,7 @@ - net472;net8.0 + net472;net6.0;net8.0 enable false diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj index c06ff074e..c7bdf3430 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj @@ -1,7 +1,7 @@ - net472;net8.0 + net472;net6.0;net8.0 1.0.0-700 true diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj index daa85bcb4..73681a1e5 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj @@ -1,7 +1,7 @@ - net8.0 + net6.0;net8.0 1.0.0-700 diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/Dockerfile b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/Dockerfile index 485322823..f3c03c007 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/Dockerfile +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/Dockerfile @@ -7,7 +7,7 @@ COPY . . WORKDIR "/src/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker" -RUN dotnet publish -a "${TARGETARCH}" --self-contained -c Release -f net8.0 . +RUN dotnet publish -a "${TARGETARCH}" --self-contained -c Release -f net6.0 . FROM ${WORKER_DLL_IMAGE} AS final diff --git a/Tests/endToEndTests.sh b/Tests/endToEndTests.sh index 7df425a41..25a080081 100755 --- a/Tests/endToEndTests.sh +++ b/Tests/endToEndTests.sh @@ -5,7 +5,7 @@ export MODE="All" export SERVER_NFS_IP="" export STORAGE_TYPE="HostPath" configuration="Release" -FRAMEWORK=net8.0 +FRAMEWORK=net6.0 OUTPUT_JSON="nofile" TO_BUCKET=false PACKAGE_NAME="ArmoniK.EndToEndTests.Worker-v1.0.0-700.zip" diff --git a/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj b/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj index 11a7bdcf7..342eb6c91 100644 --- a/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj +++ b/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj @@ -1,7 +1,7 @@ - net8.0 + net6.0;net8.0 True true diff --git a/Worker/src/DLLWorker/Dockerfile b/Worker/src/DLLWorker/Dockerfile index a7a818964..80c1f216b 100644 --- a/Worker/src/DLLWorker/Dockerfile +++ b/Worker/src/DLLWorker/Dockerfile @@ -15,10 +15,10 @@ RUN dotnet restore -a "${TARGETARCH}" "Worker/src/DLLWorker/ArmoniK.DevelopmentK COPY . . WORKDIR "/src/Worker/src/DLLWorker" ARG BUILD_CONFIG=Release -RUN dotnet build "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net8.0 -o /app/build +RUN dotnet build "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net6.0 -o /app/build FROM build AS publish -RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net8.0 -o /app/publish --self-contained true +RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net6.0 -o /app/publish --self-contained true FROM base AS final diff --git a/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj b/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj index bf8135dce..614d18b9e 100644 --- a/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj +++ b/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj @@ -1,7 +1,7 @@ - net8.0 + net6.0;net8.0 Library True true diff --git a/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj b/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj index a055e98d1..6210bf83f 100644 --- a/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj +++ b/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj @@ -1,7 +1,7 @@ - net8.0 + net6.0;net8.0 Library True true