Skip to content

Commit 38298f3

Browse files
jonorossijonorossi
authored
Merge pull request castleproject#614 from Jevonius/update-to-462
Update to net462 as a minimum target
2 parents 51957b8 + ebd23a2 commit 38298f3

File tree

21 files changed

+35
-43
lines changed

21 files changed

+35
-43
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ jobs:
6262
- name: Test on .NET Core 3.1
6363
run: dotnet test -c Release -f netcoreapp3.1 --no-build --no-restore -l "console;verbosity=detailed"
6464

65-
- name: Test on .NET Framework 4.6.1 (Windows only)
65+
- name: Test on .NET Framework 4.6.2 (Windows only)
6666
if: matrix.os == 'windows-latest'
67-
run: dotnet test -c Release -f net461 --no-build --no-restore -l "console;verbosity=detailed"
67+
run: dotnet test -c Release -f net462 --no-build --no-restore -l "console;verbosity=detailed"
6868

69-
- name: Test on .NET Framework 4.6.1 using Mono (Linux only)
69+
- name: Test on .NET Framework 4.6.2 using Mono (Linux only)
7070
if: matrix.os == 'ubuntu-latest'
7171
run: |
72-
docker run --rm -v "$PWD":'/project' -w='/project' mono:$MONO_TAG bash -c 'mono ./src/Castle.Core.Tests/bin/Release/net461/Castle.Core.Tests.exe && mono ./src/Castle.Core.Tests.WeakNamed/bin/Release/net461/Castle.Core.Tests.WeakNamed.exe'
72+
docker run --rm -v "$PWD":'/project' -w='/project' mono:$MONO_TAG bash -c 'mono ./src/Castle.Core.Tests/bin/Release/net462/Castle.Core.Tests.exe && mono ./src/Castle.Core.Tests.WeakNamed/bin/Release/net462/Castle.Core.Tests.WeakNamed.exe'

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Bugfixes:
1616
- Upgrade log4net to v2.0.13 (@jonorossi, @stakx, @dschwartzni, #574, #605)
1717

1818
Deprecations:
19-
- Removed support for the .NET Framework < 4.5 and .NET Standard 1.x. (@stakx, #495, #496)
19+
- Removed support for the .NET Framework < 4.6.2 and .NET Standard 1.x. (@stakx, #495, #496; @Jevonius, #614)
2020
- Removed support for Code Access Security (CAS). (@stakx, #502)
2121
- Removed support for Remoting. This library no longer defines any types deriving from `MarshalByRefObject`, and `ProxyUtil.IsProxy` (which used to recognize remoting/"transparent" proxies) now tests only for DynamicProxy proxies. (@stakx, #507)
2222
- The following public members have been removed:

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ build.cmd
3636

3737
Compilation requires a C# 9 compiler, an up-to-date .NET Core SDK, and MSBuild 15+ (which should be included in the former).
3838

39-
Running the unit tests additionally requires the .NET Framework 4.6.1+ as well as the .NET Core 2.1 and 3.1 runtimes to be installed. (If you do not have all of those installed, you can run the tests for a specific target framework using `dotnet test -f <framework>`.)
39+
Running the unit tests additionally requires the .NET Framework 4.6.2+ as well as the .NET Core 2.1 and 3.1 runtimes to be installed. (If you do not have all of those installed, you can run the tests for a specific target framework using `dotnet test -f <framework>`.)
4040

4141
These requirements should be covered by Visual Studio 2019 and the .NET 5 SDK.
4242

@@ -60,14 +60,14 @@ For known Mono defects, check [our issue tracker](https://github.com/castleproje
6060

6161
The following conditional compilation symbols (vertical) are currently defined for each of the build configurations (horizontal):
6262

63-
Symbol | .NET 4.5 | .NET Standard 2.x
63+
Symbol | .NET 4.6.2 | .NET Standard 2.x
6464
----------------------------------- | ------------------ | ------------------
6565
`FEATURE_APPDOMAIN` | :white_check_mark: | :no_entry_sign:
6666
`FEATURE_ASSEMBLYBUILDER_SAVE` | :white_check_mark: | :no_entry_sign:
6767
`FEATURE_SERIALIZATION` | :white_check_mark: | :no_entry_sign:
6868
`FEATURE_SYSTEM_CONFIGURATION` | :white_check_mark: | :no_entry_sign:
6969
--- | |
70-
`DOTNET45` | :white_check_mark: | :no_entry_sign:
70+
`DOTNET462` | :white_check_mark: | :no_entry_sign:
7171

7272
* `FEATURE_APPDOMAIN` - enables support for features that make use of an AppDomain in the host.
7373
* `FEATURE_ASSEMBLYBUILDER_SAVE` - enabled support for saving the dynamically generated proxy assembly.

‎build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ echo "OSNAME: $OSNAME"
4141
dotnet build --configuration Release || exit 1
4242

4343
echo --------------------
44-
echo Running NET461 Tests
44+
echo Running NET462 Tests
4545
echo --------------------
4646

47-
mono ./src/Castle.Core.Tests/bin/Release/net461/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3
48-
mono ./src/Castle.Core.Tests.WeakNamed/bin/Release/net461/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3
47+
mono ./src/Castle.Core.Tests/bin/Release/net462/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3
48+
mono ./src/Castle.Core.Tests.WeakNamed/bin/Release/net462/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3
4949

5050
echo ---------------------------
5151
echo Running NETCOREAPP3.1 Tests

‎buildscripts/build.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ GOTO test
3434
:test
3535

3636
echo --------------------
37-
echo Running NET461 Tests
37+
echo Running NET462 Tests
3838
echo --------------------
3939

40-
%UserProfile%\.nuget\packages\nunit.consolerunner\3.11.1\tools\nunit3-console.exe src/Castle.Core.Tests/bin/%Configuration%/net461/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3 || exit /b 1
41-
%UserProfile%\.nuget\packages\nunit.consolerunner\3.11.1\tools\nunit3-console.exe src/Castle.Core.Tests.WeakNamed/bin/%Configuration%/net461/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1
40+
%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
41+
%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

4343
echo ---------------------------
4444
echo Running NETCOREAPP3.1 Tests

‎buildscripts/common.props‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,12 @@
5050
<DesktopClrConstants>TRACE;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE;FEATURE_SERIALIZATION;FEATURE_SYSTEM_CONFIGURATION</DesktopClrConstants>
5151
</PropertyGroup>
5252

53-
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='net45|Debug'">
54-
<DefineConstants>$(DiagnosticsConstants);$(DesktopClrConstants);DOTNET45</DefineConstants>
53+
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='net462|Debug'">
54+
<DefineConstants>$(DiagnosticsConstants);$(DesktopClrConstants);DOTNET462</DefineConstants>
5555
</PropertyGroup>
5656

57-
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='net45|Release'">
58-
<DefineConstants>$(DesktopClrConstants);DOTNET45;</DefineConstants>
59-
</PropertyGroup>
60-
61-
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='net461|Debug'">
62-
<DefineConstants>$(DiagnosticsConstants);$(DesktopClrConstants);DOTNET45</DefineConstants>
63-
</PropertyGroup>
64-
65-
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='net461|Release'">
66-
<DefineConstants>$(DesktopClrConstants);DOTNET45</DefineConstants>
57+
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='net462|Release'">
58+
<DefineConstants>$(DesktopClrConstants);DOTNET462</DefineConstants>
6759
</PropertyGroup>
6860

6961
<PropertyGroup Condition="'$(TargetFramework)|$(Configuration)'=='netstandard2.0|Debug'">

‎docs/dynamicproxy-introduction.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ DynamicProxy differs from the proxy implementation built into the CLR which requ
99
To use Castle DynamicProxy you need the following environment:
1010

1111
* one of the following runtimes installed
12-
* .NET Framework 4.5+
12+
* .NET Framework 4.6.2+
1313
* .NET Core 2.1+
1414
* any another .NET platform that supports .NET Standard 2.0+ and runtime type generation using System.Reflection.Emit
1515
* `Castle.Core.dll` (assembly where DynamicProxy lives)

ref/Castle.Core-net45.cs renamed to ref/Castle.Core-net462.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")]
33
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Castle.Core.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010077f5e87030dadccce6902c6adab7a987bd69cb5819991531f560785eacfc89b6fcddf6bb2a00743a7194e454c0273447fc6eec36474ba8e5a3823147d214298e4f9a631b1afee1a51ffeae4672d498f14b000e3d321453cdd8ac064de7e1cf4d222b7e81f54d4fd46725370d702a05b48738cc29d09228f1aa722ae1a9ca02fb")]
44
[assembly: System.Runtime.InteropServices.ComVisible(false)]
5-
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")]
5+
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.6.2", FrameworkDisplayName=".NET Framework 4.6.2")]
66
namespace Castle.Components.DictionaryAdapter
77
{
88
public abstract class AbstractDictionaryAdapter : System.Collections.ICollection, System.Collections.IDictionary, System.Collections.IEnumerable

ref/Castle.Services.Logging.NLogIntegration-net45.cs renamed to ref/Castle.Services.Logging.NLogIntegration-net462.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[assembly: System.CLSCompliant(true)]
22
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")]
33
[assembly: System.Runtime.InteropServices.ComVisible(false)]
4-
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")]
4+
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.6.2", FrameworkDisplayName=".NET Framework 4.6.2")]
55
namespace Castle.Services.Logging.NLogIntegration
66
{
77
public class ExtendedNLogFactory : Castle.Core.Logging.AbstractExtendedLoggerFactory

ref/Castle.Services.Logging.SerilogIntegration-net45.cs renamed to ref/Castle.Services.Logging.SerilogIntegration-net462.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")]
2-
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")]
2+
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.6.2", FrameworkDisplayName=".NET Framework 4.6.2")]
33
namespace Castle.Services.Logging.SerilogIntegration
44
{
55
public class SerilogFactory : Castle.Core.Logging.AbstractLoggerFactory

0 commit comments

Comments
 (0)