Skip to content

Commit bf66485

Browse files
snakefootsnakefoot
committed
Removed obsolete netcoreapp2.1 + netcoreapp3.1
1 parent 9c74c8e commit bf66485

File tree

6 files changed

+7
-49
lines changed

6 files changed

+7
-49
lines changed

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,6 @@ jobs:
2828
- name: Checkout repository
2929
uses: actions/checkout@v4
3030

31-
# Several .NET Core versions will be used during the test run.
32-
# The lowest version gets installed first in order to prevent
33-
# "a newer version is already installed" install errors.
34-
35-
- name: Install .NET Core 2.1
36-
uses: actions/setup-dotnet@v4
37-
with:
38-
dotnet-version: 2.1.x
39-
40-
- name: Install .NET Core 3.1
41-
uses: actions/setup-dotnet@v4
42-
with:
43-
dotnet-version: 3.1.x
44-
4531
- name: Install .NET 6.0
4632
uses: actions/setup-dotnet@v4
4733
with:
@@ -68,12 +54,6 @@ jobs:
6854
# Test
6955
# ----
7056

71-
- name: Test on .NET Core 2.1
72-
run: dotnet test -c Release -f netcoreapp2.1 --no-build --no-restore -l "console;verbosity=detailed"
73-
74-
- name: Test on .NET Core 3.1
75-
run: dotnet test -c Release -f netcoreapp3.1 --no-build --no-restore -l "console;verbosity=detailed"
76-
7757
- name: Test on .NET 6.0
7858
run: dotnet test -c Release -f net6.0 --no-build --no-restore -l "console;verbosity=detailed"
7959

‎appveyor.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ for:
5454
after_build:
5555
- ps: |
5656
$wc = New-Object System.Net.WebClient
57-
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "NetCoreClrTestResults.xml"))
58-
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "NetCoreClrWeakNamedTestResults.xml"))
5957
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "Net60TestResults.xml"))
6058
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "Net60WeakNamedTestResults.xml"))
6159
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "DesktopClrTestResults.xml"))
@@ -70,6 +68,7 @@ for:
7068
nuget push ".\build\Castle.Core-log4net.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
7169
nuget push ".\build\Castle.Core-NLog.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
7270
nuget push ".\build\Castle.Core-Serilog.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
71+
nuget push ".\build\Castle.Core-DiagnosticsLogger.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
7372
}
7473
7574
# upload packages to AppVeyor

‎build.sh‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,6 @@ echo --------------------
4747
mono ./src/Castle.Core.Tests/bin/Release/net462/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3
4848
mono ./src/Castle.Core.Tests.WeakNamed/bin/Release/net462/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3
4949

50-
echo ---------------------------
51-
echo Running NETCOREAPP3.1 Tests
52-
echo ---------------------------
53-
54-
dotnet ./src/Castle.Core.Tests/bin/Release/netcoreapp3.1/Castle.Core.Tests.dll --result=NetCoreClrTestResults.xml;format=nunit3
55-
dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/netcoreapp3.1/Castle.Core.Tests.WeakNamed.dll --result=NetCoreClrWeakNamedTestResults.xml;format=nunit3
56-
5750
echo ---------------------------
5851
echo Running NET6.0 Tests
5952
echo ---------------------------
@@ -62,9 +55,7 @@ dotnet ./src/Castle.Core.Tests/bin/Release/net6.0/Castle.Core.Tests.dll --result
6255
dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/net6.0/Castle.Core.Tests.WeakNamed.dll --result=Net60WeakNamedTestResults.xml;format=nunit3
6356

6457
# Ensure that all test runs produced a protocol file:
65-
if [[ !( -f NetCoreClrTestResults.xml &&
66-
-f NetCoreClrWeakNamedTestResults.xml &&
67-
-f Net60TestResults.xml &&
58+
if [[ !( -f Net60TestResults.xml &&
6859
-f Net60WeakNamedTestResults.xml &&
6960
-f DesktopClrTestResults.xml &&
7061
-f DesktopClrWeakNamedTestResults.xml ) ]]; then
@@ -73,12 +64,6 @@ if [[ !( -f NetCoreClrTestResults.xml &&
7364
fi
7465

7566
# Unit test failure
76-
NETCORE_FAILCOUNT=$(grep -F "One or more child tests had errors" NetCoreClrTestResults.xml NetCoreClrWeakNamedTestResults.xml | wc -l)
77-
if [ $NETCORE_FAILCOUNT -ne 0 ]
78-
then
79-
echo "NetCore Tests have failed, failing the build"
80-
exit 1
81-
fi
8267

8368
NET60_FAILCOUNT=$(grep -F "One or more child tests had errors" Net60TestResults.xml Net60WeakNamedTestResults.xml | wc -l)
8469
if [ $NET60_FAILCOUNT -ne 0 ]

‎buildscripts/build.cmd‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ echo --------------------
4040
%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
4141
%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
4242

43-
echo ---------------------------
44-
echo Running NETCOREAPP3.1 Tests
45-
echo ---------------------------
46-
47-
dotnet .\src\Castle.Core.Tests\bin\%Configuration%\netcoreapp3.1\Castle.Core.Tests.dll --result=NetCoreClrTestResults.xml;format=nunit3 || exit /b 1
48-
dotnet .\src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\netcoreapp3.1/Castle.Core.Tests.WeakNamed.dll --result=NetCoreClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1
49-
50-
5143
echo ---------------------------
5244
echo Running NET6.0 Tests
5345
echo ---------------------------

‎src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\buildscripts\common.props"></Import>
44

55
<PropertyGroup>
6-
<TargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net462;net6.0</TargetFrameworks>
77
</PropertyGroup>
88

99
<PropertyGroup>
@@ -16,6 +16,7 @@
1616
<SignAssembly>False</SignAssembly>
1717
<PublicSign Condition="'$(OS)'=='Unix'">false</PublicSign>
1818
<StartupObject>Program</StartupObject>
19+
<InvariantGlobalization>true</InvariantGlobalization>
1920
</PropertyGroup>
2021

2122
<ItemGroup>

‎src/Castle.Core.Tests/Castle.Core.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\buildscripts\common.props"></Import>
44

55
<PropertyGroup>
6-
<TargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net462;net6.0</TargetFrameworks>
77
</PropertyGroup>
88

99
<PropertyGroup>
@@ -17,6 +17,7 @@
1717
<AssemblyOriginatorKeyFile>..\..\buildscripts\CastleKey.snk</AssemblyOriginatorKeyFile>
1818
<PublicSign Condition="'$(OS)'=='Unix'">true</PublicSign>
1919
<StartupObject>Program</StartupObject>
20+
<InvariantGlobalization>true</InvariantGlobalization>
2021
</PropertyGroup>
2122

2223
<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(&quot;$(TargetFramework)&quot;))' == '.NETFramework'">
@@ -47,7 +48,7 @@
4748
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
4849
<PackageReference Include="NUnitLite" Version="3.13.3" />
4950
<PackageReference Include="log4net" Version="2.0.13" />
50-
<PackageReference Include="NLog" Version="4.5.0" />
51+
<PackageReference Include="NLog" Version="4.7.15" />
5152
<PackageReference Include="Serilog" Version="2.0.0" />
5253
<PackageReference Include="Serilog.Sinks.TextWriter" Version="2.0.0" />
5354
<ProjectReference Include="..\Castle.Core\Castle.Core.csproj" />

0 commit comments

Comments
 (0)