diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f51ded59d..d7edc5aab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,11 +58,6 @@ jobs: with: global-json-file: global.json - - name: Setup .NET SDK 7.0 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - - name: Setup .NET SDK 6.0 uses: actions/setup-dotnet@v3 with: diff --git a/MoreLinq.Test/MoreLinq.Test.csproj b/MoreLinq.Test/MoreLinq.Test.csproj index 413e5e7f4..5defc11f4 100644 --- a/MoreLinq.Test/MoreLinq.Test.csproj +++ b/MoreLinq.Test/MoreLinq.Test.csproj @@ -2,7 +2,7 @@ MoreLinq.Test - net8.0;net7.0;net6.0;net471 + net8.0;net6.0;net471 portable MoreLinq.Test Exe diff --git a/appveyor.yml b/appveyor.yml index c7f50f424..646a17b24 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,10 +52,8 @@ install: - git reset --hard - ps: if ($isWindows) { tools\dotnet-install.ps1 -JSonFile global.json } - ps: if ($isWindows) { tools\dotnet-install.ps1 -Runtime dotnet -Version 6.0.11 -SkipNonVersionedFiles } -- ps: if ($isWindows) { tools\dotnet-install.ps1 -Runtime dotnet -Version 7.0.14 -SkipNonVersionedFiles } - sh: ./tools/dotnet-install.sh --jsonfile global.json - sh: ./tools/dotnet-install.sh --runtime dotnet --version 6.0.11 --skip-non-versioned-files -- sh: ./tools/dotnet-install.sh --runtime dotnet --version 7.0.14 --skip-non-versioned-files - sh: export PATH="$HOME/.dotnet:$PATH" before_build: - dotnet --info diff --git a/test.cmd b/test.cmd index 640f802b9..a6d28730d 100644 --- a/test.cmd +++ b/test.cmd @@ -10,8 +10,6 @@ if %SKIP_TEST_BUILD%==false call build || exit /b 1 call :clean ^ && call :test net8.0 Debug ^ && call :test net8.0 Release ^ - && call :test net7.0 Debug ^ - && call :test net7.0 Release ^ && call :test net6.0 Debug ^ && call :test net6.0 Release ^ && call :test net471 Debug ^ diff --git a/test.sh b/test.sh index fbe65fd50..9bd9806a0 100755 --- a/test.sh +++ b/test.sh @@ -12,7 +12,7 @@ if [[ -z "$1" ]]; then else configs="$1" fi -for f in net6.0 net7.0 net8.0; do +for f in net6.0 net8.0; do for c in $configs; do dotnet test --no-build -c $c -f $f --settings MoreLinq.Test/coverlet.runsettings MoreLinq.Test TEST_RESULTS_DIR="$(ls -dc MoreLinq.Test/TestResults/* | head -1)"