Merge pull request #66 from Flexberry/fix-client-profile

Fix net40 client profile
apache · Sep 17, 2020 · 3fa6542 · 3fa6542
2 parents acda688 + 1acab70
commit 3fa6542
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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 @@ public PropertiesDictionary(ReadOnlyPropertiesDictionary propertiesDictionary) :
 
 		#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
@@ -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>