You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by da...@apache.org on 2020/09/17 06:32:23 UTC
[logging-log4net] branch master updated: Fix net40 client profile
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
The following commit(s) were added to refs/heads/master by this push:
new 1acab70 Fix net40 client profile
new 3fa6542 Merge pull request #66 from Flexberry/fix-client-profile
1acab70 is described below
commit 1acab70f5450f4bbeef144d0a249a230070bbb4a
Author: Tsar Nikolay <ns...@ics.perm.ru>
AuthorDate: Tue Sep 8 13:49:21 2020 +0500
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 aa3c3e6..2e33cb7 100644
--- a/src/log4net/AssemblyInfo.cs
+++ b/src/log4net/AssemblyInfo.cs
@@ -73,14 +73,17 @@ using System.Runtime.CompilerServices;
[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 1765929..0c73300 100644
--- a/src/log4net/Core/LoggingEvent.cs
+++ b/src/log4net/Core/LoggingEvent.cs
@@ -324,7 +324,7 @@ namespace log4net.Core
[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 4510eaa..a4dc6c4 100644
--- a/src/log4net/Util/PropertiesDictionary.cs
+++ b/src/log4net/Util/PropertiesDictionary.cs
@@ -35,10 +35,11 @@ namespace log4net.Util
/// </remarks>
/// <author>Nicko Cadell</author>
/// <author>Gert Driesen</author>
-#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 @@ namespace log4net.Util
#region Private Instance Constructors
-#if !(NETCF || CLIENT_PROFILE)
+#if !NETCF
/// <summary>
/// Initializes a new instance of the <see cref="PropertiesDictionary" /> class
/// with serialized data.
diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj
index 62b1734..53c9c3e 100644
--- a/src/log4net/log4net.csproj
+++ b/src/log4net/log4net.csproj
@@ -69,14 +69,14 @@
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<OutDir>..\..\build\$(Configuration)\net35-client</OutDir>
- <DefineConstants>$(DefineConstants);NET_2_0;CLIENT_PROFILE</DefineConstants>
+ <DefineConstants>$(DefineConstants);NET_2_0;NET_3_5;CLIENT_PROFILE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net40-client'">
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<OutDir>..\..\build\$(Configuration)\net40-client</OutDir>
- <DefineConstants>$(DefineConstants);NET_2_0;CLIENT_PROFILE</DefineConstants>
+ <DefineConstants>$(DefineConstants);NET_2_0;NET_4_0;CLIENT_PROFILE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_3</DefineConstants>