From 1acab70f5450f4bbeef144d0a249a230070bbb4a Mon Sep 17 00:00:00 2001 From: Tsar Nikolay Date: Tue, 8 Sep 2020 13:49:21 +0500 Subject: [PATCH] Fix net40 client profile --- src/log4net/AssemblyInfo.cs | 7 +++++-- src/log4net/Core/LoggingEvent.cs | 2 +- src/log4net/Util/PropertiesDictionary.cs | 7 ++++--- src/log4net/log4net.csproj | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs index aa3c3e63..2e33cb7b 100644 --- a/src/log4net/AssemblyInfo.cs +++ b/src/log4net/AssemblyInfo.cs @@ -73,14 +73,17 @@ [assembly: AssemblyInformationalVersionAttribute("2.0.9.0-.NET 4.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")] #endif // Client Profile -#elif (NET_2_0) +#elif (NET_3_5) #if CLIENT_PROFILE [assembly: AssemblyInformationalVersionAttribute("2.0.9.0-.NET 3.5 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")] #else +[assembly: AssemblyInformationalVersionAttribute("2.0.9.0-.NET 3.5")] +[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5")] +#endif // Client Profile +#elif (NET_2_0) [assembly: AssemblyInformationalVersionAttribute("2.0.9.0-.NET 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")] -#endif // Client Profile #elif (NETCF_1_0) [assembly: AssemblyInformationalVersionAttribute("2.0.9.0-.NETCF 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")] diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs index 1765929c..0c733006 100644 --- a/src/log4net/Core/LoggingEvent.cs +++ b/src/log4net/Core/LoggingEvent.cs @@ -324,7 +324,7 @@ [Flags] public enum FixFlags [Serializable] #endif public class LoggingEvent -#if !NETCF && NET_2_0 +#if !NETCF : ISerializable #endif { diff --git a/src/log4net/Util/PropertiesDictionary.cs b/src/log4net/Util/PropertiesDictionary.cs index 4510eaa0..a4dc6c46 100644 --- a/src/log4net/Util/PropertiesDictionary.cs +++ b/src/log4net/Util/PropertiesDictionary.cs @@ -35,10 +35,11 @@ namespace log4net.Util /// /// Nicko Cadell /// Gert Driesen -#if NETCF || CLIENT_PROFILE +#if NETCF public sealed class PropertiesDictionary : ReadOnlyPropertiesDictionary, IDictionary #else - [Serializable] public sealed class PropertiesDictionary : ReadOnlyPropertiesDictionary, ISerializable, IDictionary + [Serializable] + public sealed class PropertiesDictionary : ReadOnlyPropertiesDictionary, ISerializable, IDictionary #endif { #region Public Instance Constructors @@ -72,7 +73,7 @@ public PropertiesDictionary(ReadOnlyPropertiesDictionary propertiesDictionary) : #region Private Instance Constructors -#if !(NETCF || CLIENT_PROFILE) +#if !NETCF /// /// Initializes a new instance of the class /// with serialized data. diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 62b17340..53c9c3e3 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -69,14 +69,14 @@ v3.5 Client ..\..\build\$(Configuration)\net35-client - $(DefineConstants);NET_2_0;CLIENT_PROFILE + $(DefineConstants);NET_2_0;NET_3_5;CLIENT_PROFILE .NETFramework - v3.5 + v4.0 Client ..\..\build\$(Configuration)\net40-client - $(DefineConstants);NET_2_0;CLIENT_PROFILE + $(DefineConstants);NET_2_0;NET_4_0;CLIENT_PROFILE $(DefineConstants);NETSTANDARD;NETSTANDARD1_3