From bf66485889cb1d0e4621685240fafc2ce805e4bf Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Wed, 29 Jan 2025 21:16:01 +0100 Subject: [PATCH] Removed obsolete netcoreapp2.1 + netcoreapp3.1 --- .github/workflows/build.yml | 20 ------------------- appveyor.yml | 3 +-- build.sh | 17 +--------------- buildscripts/build.cmd | 8 -------- .../Castle.Core.Tests.WeakNamed.csproj | 3 ++- .../Castle.Core.Tests.csproj | 5 +++-- 6 files changed, 7 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff9ea35071..a50346c555 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,20 +28,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - # Several .NET Core versions will be used during the test run. - # The lowest version gets installed first in order to prevent - # "a newer version is already installed" install errors. - - - name: Install .NET Core 2.1 - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 2.1.x - - - name: Install .NET Core 3.1 - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 3.1.x - - name: Install .NET 6.0 uses: actions/setup-dotnet@v4 with: @@ -68,12 +54,6 @@ jobs: # Test # ---- - - name: Test on .NET Core 2.1 - run: dotnet test -c Release -f netcoreapp2.1 --no-build --no-restore -l "console;verbosity=detailed" - - - name: Test on .NET Core 3.1 - run: dotnet test -c Release -f netcoreapp3.1 --no-build --no-restore -l "console;verbosity=detailed" - - name: Test on .NET 6.0 run: dotnet test -c Release -f net6.0 --no-build --no-restore -l "console;verbosity=detailed" diff --git a/appveyor.yml b/appveyor.yml index f4204642d9..5857c16a3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,8 +54,6 @@ for: after_build: - ps: | $wc = New-Object System.Net.WebClient - $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "NetCoreClrTestResults.xml")) - $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "NetCoreClrWeakNamedTestResults.xml")) $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "Net60TestResults.xml")) $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "Net60WeakNamedTestResults.xml")) $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "DesktopClrTestResults.xml")) @@ -70,6 +68,7 @@ for: nuget push ".\build\Castle.Core-log4net.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json nuget push ".\build\Castle.Core-NLog.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json nuget push ".\build\Castle.Core-Serilog.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json + nuget push ".\build\Castle.Core-DiagnosticsLogger.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json } # upload packages to AppVeyor diff --git a/build.sh b/build.sh index de988294da..fc76c1a4ba 100755 --- a/build.sh +++ b/build.sh @@ -47,13 +47,6 @@ echo -------------------- mono ./src/Castle.Core.Tests/bin/Release/net462/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3 mono ./src/Castle.Core.Tests.WeakNamed/bin/Release/net462/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3 -echo --------------------------- -echo Running NETCOREAPP3.1 Tests -echo --------------------------- - -dotnet ./src/Castle.Core.Tests/bin/Release/netcoreapp3.1/Castle.Core.Tests.dll --result=NetCoreClrTestResults.xml;format=nunit3 -dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/netcoreapp3.1/Castle.Core.Tests.WeakNamed.dll --result=NetCoreClrWeakNamedTestResults.xml;format=nunit3 - echo --------------------------- echo Running NET6.0 Tests echo --------------------------- @@ -62,9 +55,7 @@ dotnet ./src/Castle.Core.Tests/bin/Release/net6.0/Castle.Core.Tests.dll --result dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/net6.0/Castle.Core.Tests.WeakNamed.dll --result=Net60WeakNamedTestResults.xml;format=nunit3 # Ensure that all test runs produced a protocol file: -if [[ !( -f NetCoreClrTestResults.xml && - -f NetCoreClrWeakNamedTestResults.xml && - -f Net60TestResults.xml && +if [[ !( -f Net60TestResults.xml && -f Net60WeakNamedTestResults.xml && -f DesktopClrTestResults.xml && -f DesktopClrWeakNamedTestResults.xml ) ]]; then @@ -73,12 +64,6 @@ if [[ !( -f NetCoreClrTestResults.xml && fi # Unit test failure -NETCORE_FAILCOUNT=$(grep -F "One or more child tests had errors" NetCoreClrTestResults.xml NetCoreClrWeakNamedTestResults.xml | wc -l) -if [ $NETCORE_FAILCOUNT -ne 0 ] -then - echo "NetCore Tests have failed, failing the build" - exit 1 -fi NET60_FAILCOUNT=$(grep -F "One or more child tests had errors" Net60TestResults.xml Net60WeakNamedTestResults.xml | wc -l) if [ $NET60_FAILCOUNT -ne 0 ] diff --git a/buildscripts/build.cmd b/buildscripts/build.cmd index e3efe0333e..54cfd719d1 100644 --- a/buildscripts/build.cmd +++ b/buildscripts/build.cmd @@ -40,14 +40,6 @@ echo -------------------- %UserProfile%\.nuget\packages\nunit.consolerunner\3.11.1\tools\nunit3-console.exe src/Castle.Core.Tests/bin/%Configuration%/net462/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3 || exit /b 1 %UserProfile%\.nuget\packages\nunit.consolerunner\3.11.1\tools\nunit3-console.exe src/Castle.Core.Tests.WeakNamed/bin/%Configuration%/net462/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1 -echo --------------------------- -echo Running NETCOREAPP3.1 Tests -echo --------------------------- - -dotnet .\src\Castle.Core.Tests\bin\%Configuration%\netcoreapp3.1\Castle.Core.Tests.dll --result=NetCoreClrTestResults.xml;format=nunit3 || exit /b 1 -dotnet .\src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\netcoreapp3.1/Castle.Core.Tests.WeakNamed.dll --result=NetCoreClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1 - - echo --------------------------- echo Running NET6.0 Tests echo --------------------------- diff --git a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj index f2a201692e..d38c7879b6 100644 --- a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj +++ b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj @@ -3,7 +3,7 @@ - net462;netcoreapp2.1;netcoreapp3.1;net6.0 + net462;net6.0 @@ -16,6 +16,7 @@ False false Program + true diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj index d893a7bcc1..e4e3dfe4fd 100644 --- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj +++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj @@ -3,7 +3,7 @@ - net462;netcoreapp2.1;netcoreapp3.1;net6.0 + net462;net6.0 @@ -17,6 +17,7 @@ ..\..\buildscripts\CastleKey.snk true Program + true @@ -47,7 +48,7 @@ - +