diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 0d8d6d4..7bed681 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -11,7 +11,7 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest, buildjet-4vcpu-ubuntu-2204-arm] env: TEST_COVERAGE: ${{ matrix.os == 'ubuntu-latest' }} - NO_NET48: ${{ matrix.os == 'buildjet-4vcpu-ubuntu-2204-arm' }} + NO_NET481: ${{ matrix.os == 'buildjet-4vcpu-ubuntu-2204-arm' }} DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_NOLOGO: true @@ -32,9 +32,9 @@ jobs: if [ "$TEST_COVERAGE" == "true" ] then ./dotnet_build.sh test_coverage - elif [ "$NO_NET48" == "true" ] + elif [ "$NO_NET481" == "true" ] then - ./dotnet_build.sh no_net48 + ./dotnet_build.sh no_net481 else ./dotnet_build.sh fi @@ -56,7 +56,7 @@ jobs: uses: coverallsapp/github-action@v2 with: format: lcov - files: release/coverage.net9.info release/coverage.net48.info + files: release/coverage.net9.info release/coverage.net481.info - name: Upload dotnet info uses: actions/upload-artifact@v4 diff --git a/scripts/dotnet_build.sh b/scripts/dotnet_build.sh index 6d370e2..fc3b19b 100755 --- a/scripts/dotnet_build.sh +++ b/scripts/dotnet_build.sh @@ -14,9 +14,9 @@ then dotnet test ../ --configuration Release --no-build --verbosity normal --framework net9.0 --collect:"XPlat Code Coverage;Format=lcov" find ../tests/Fastenshtein.Tests/TestResults/ -name "coverage.info" -type f -exec mv {} ../release/coverage.net9.info \; - dotnet test ../ --configuration Release --no-build --verbosity normal --framework net48 --collect:"XPlat Code Coverage;Format=lcov" - find ../tests/Fastenshtein.Tests/TestResults/ -name "coverage.info" -type f -exec mv {} ../release/coverage.net48.info \; -elif [ $1 = "no_net48" ] + dotnet test ../ --configuration Release --no-build --verbosity normal --framework net481 --collect:"XPlat Code Coverage;Format=lcov" + find ../tests/Fastenshtein.Tests/TestResults/ -name "coverage.info" -type f -exec mv {} ../release/coverage.net481.info \; +elif [ $1 = "no_net481" ] then dotnet test ../ --configuration Release --no-build --verbosity normal --framework net9.0 else diff --git a/scripts/github_release.sh b/scripts/github_release.sh index 54fd694..3950e3a 100755 --- a/scripts/github_release.sh +++ b/scripts/github_release.sh @@ -4,8 +4,8 @@ set -e gh release create $1 \ "../release/Fastenshtein.nupkg" \ "../release/Fastenshtein.snupkg" \ - "../release/coverage.net48.info#Code coverage report net48" \ - "../release/coverage.net9.info#Code coverage report net8" \ + "../release/coverage.net481.info#Code coverage report net481" \ + "../release/coverage.net9.info#Code coverage report net9" \ "../release/dotnet_info.txt#Built with" \ --draft \ --generate-notes \ No newline at end of file diff --git a/src/Fastenshtein/Fastenshtein.csproj b/src/Fastenshtein/Fastenshtein.csproj index 70850f1..484960f 100644 --- a/src/Fastenshtein/Fastenshtein.csproj +++ b/src/Fastenshtein/Fastenshtein.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net452;net8.0;net9.0 + netstandard2.0;net462;net8.0;net9.0 false diff --git a/tests/Fastenshtein.Tests/Fastenshtein.Tests.csproj b/tests/Fastenshtein.Tests/Fastenshtein.Tests.csproj index 9bcca58..d2e403e 100644 --- a/tests/Fastenshtein.Tests/Fastenshtein.Tests.csproj +++ b/tests/Fastenshtein.Tests/Fastenshtein.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net9.0;net48 + net8.0;net9.0;net481 false