diff --git a/appveyor.yml b/appveyor.yml
index f4204642d..5857c16a3 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 de988294d..fc76c1a4b 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 ]