You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2015/08/23 16:32:35 UTC
svn commit: r1697184 - in /logging/log4net/branches/log4net-1.2.x:
log4net.build pom.xml src/AssemblyVersionInfo.cpp
src/AssemblyVersionInfo.cs src/AssemblyVersionInfo.js
src/AssemblyVersionInfo.vb src/Log4netAssemblyInfo.cs
Author: bodewig
Date: Sun Aug 23 14:32:34 2015
New Revision: 1697184
URL: http://svn.apache.org/r1697184
Log:
bump version
Modified:
logging/log4net/branches/log4net-1.2.x/log4net.build
logging/log4net/branches/log4net-1.2.x/pom.xml
logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cpp
logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cs
logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.js
logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.vb
logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs
Modified: logging/log4net/branches/log4net-1.2.x/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/log4net.build?rev=1697184&r1=1697183&r2=1697184&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/log4net.build (original)
+++ logging/log4net/branches/log4net-1.2.x/log4net.build Sun Aug 23 14:32:34 2015
@@ -20,7 +20,7 @@ limitations under the License.
<property name="log4net.basedir" value="." />
<property name="project.build.config" value="debug" />
<property name="project.build.package" value="false" />
- <property name="package.version" value="1.2.13"/>
+ <property name="package.version" value="1.2.14"/>
<!-- Include log4net helpers -->
<include buildfile="${log4net.basedir}/log4net.include" />
@@ -1587,7 +1587,7 @@ limitations under the License.
<property name="AutoDocumentConstructors" value="true" />
<property name="GetExternalSummaries" value="true" />
<property name="IncludeAssemblyVersion" value="false" />
- <property name="FooterHtml" value="<a href='http://logging.apache.org/log4net/'>Copyright 2004-2013 The Apache Software Foundation.</a><br></br>Apache log4net, Apache and log4net are trademarks of The Apache Software Foundation."/>
+ <property name="FooterHtml" value="<a href='http://logging.apache.org/log4net/'>Copyright 2004-2015 The Apache Software Foundation.</a><br></br>Apache log4net, Apache and log4net are trademarks of The Apache Software Foundation."/>
</documenter>
</documenters>
</ndoc>
Modified: logging/log4net/branches/log4net-1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/pom.xml?rev=1697184&r1=1697183&r2=1697184&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/pom.xml (original)
+++ logging/log4net/branches/log4net-1.2.x/pom.xml Sun Aug 23 14:32:34 2015
@@ -20,7 +20,7 @@
<groupId>log4net</groupId>
<artifactId>apache-log4net</artifactId>
<packaging>pom</packaging>
- <version>1.2.13</version>
+ <version>1.2.14</version>
<name>Apache log4net</name>
<description>Logging framework for Microsoft .NET Framework.</description>
<url>http://logging.apache.org/log4net/</url>
Modified: logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cpp
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cpp?rev=1697184&r1=1697183&r2=1697184&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cpp (original)
+++ logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cpp Sun Aug 23 14:32:34 2015
@@ -31,12 +31,12 @@ using namespace System::Runtime::Compile
// You can specify all the value or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersionAttribute("1.2.13.0")];
+[assembly: AssemblyVersionAttribute("1.2.14.0")];
[assembly: AssemblyInformationalVersionAttribute("1.2")];
#if !NETCF
#if !SSCLI
-[assembly: AssemblyFileVersionAttribute("1.2.13.0")]
+[assembly: AssemblyFileVersionAttribute("1.2.14.0")]
#endif
#endif
@@ -45,5 +45,5 @@ using namespace System::Runtime::Compile
//
[assembly: AssemblyCompany("The Apache Software Foundation")];
-[assembly: AssemblyCopyright("Copyright 2004-2013 The Apache Software Foundation.")];
+[assembly: AssemblyCopyright("Copyright 2004-2015 The Apache Software Foundation.")];
[assembly: AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")];
Modified: logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cs?rev=1697184&r1=1697183&r2=1697184&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.cs Sun Aug 23 14:32:34 2015
@@ -28,12 +28,12 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: System.Reflection.AssemblyVersion("1.2.13.0")]
+[assembly: System.Reflection.AssemblyVersion("1.2.14.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2")]
#if !NETCF
#if !SSCLI
-[assembly: System.Reflection.AssemblyFileVersion("1.2.13.0")]
+[assembly: System.Reflection.AssemblyFileVersion("1.2.14.0")]
#endif
#endif
@@ -42,5 +42,5 @@
//
[assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2013 The Apache Software Foundation.")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2015 The Apache Software Foundation.")]
[assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")]
Modified: logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.js
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.js?rev=1697184&r1=1697183&r2=1697184&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.js (original)
+++ logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.js Sun Aug 23 14:32:34 2015
@@ -31,12 +31,12 @@
// an import functions as a workaround for this issue.
import System.Reflection;
-[assembly: AssemblyVersion("1.2.13.0")]
+[assembly: AssemblyVersion("1.2.14.0")]
[assembly: AssemblyInformationalVersionAttribute("1.2")]
@if (!@NETCF)
@if (!@SSCLI)
-[assembly: AssemblyFileVersion("1.2.13.0")]
+[assembly: AssemblyFileVersion("1.2.14.0")]
@end
@end
@@ -45,5 +45,5 @@ import System.Reflection;
//
[assembly: AssemblyCompany("The Apache Software Foundation")]
-[assembly: AssemblyCopyright("Copyright 2004-2013 The Apache Software Foundation.")]
+[assembly: AssemblyCopyright("Copyright 2004-2015 The Apache Software Foundation.")]
[assembly: AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")]
Modified: logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.vb
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.vb?rev=1697184&r1=1697183&r2=1697184&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.vb (original)
+++ logging/log4net/branches/log4net-1.2.x/src/AssemblyVersionInfo.vb Sun Aug 23 14:32:34 2015
@@ -28,12 +28,12 @@
' You can specify all the values or you can default the Revision and Build Numbers
' by using the '*' as shown below:
-<Assembly: System.Reflection.AssemblyVersion("1.2.13.0")>
+<Assembly: System.Reflection.AssemblyVersion("1.2.14.0")>
<Assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2")>
#If NOT NETCF Then
#If NOT SSCLI Then
-<Assembly: System.Reflection.AssemblyFileVersion("1.2.13.0")>
+<Assembly: System.Reflection.AssemblyFileVersion("1.2.14.0")>
#End If
#End If
@@ -42,5 +42,5 @@
'
<Assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")>
-<Assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2013 The Apache Software Foundation.")>
+<Assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2015 The Apache Software Foundation.")>
<Assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")>
Modified: logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs?rev=1697184&r1=1697183&r2=1697184&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs Sun Aug 23 14:32:34 2015
@@ -25,13 +25,17 @@ namespace log4net {
/// </summary>
public sealed class AssemblyInfo {
/// <summary>Version of the assembly</summary>
- public const string Version = "1.2.13";
+ public const string Version = "1.2.14";
/// <summary>Version of the framework targeted</summary>
#if NET_1_1
public const decimal TargetFrameworkVersion = 1.1M;
-#elif NET_4_0
+#elif NET_4_5
+ public const decimal TargetFrameworkVersion = 4.5M;
+#elif NET_4_0 || MONO_4_0
public const decimal TargetFrameworkVersion = 4.0M;
+#elif MONO_3_5
+ public const decimal TargetFrameworkVersion = 3.5M;
#elif NET_2_0 || NETCF_2_0 || MONO_2_0
#if !CLIENT_PROFILE
public const decimal TargetFrameworkVersion = 2.0M;