Author: bodewig
Date: Sat Sep 17 14:35:37 2016
New Revision: 1761247
URL: http://svn.apache.org/viewvc?rev=1761247&view=rev
Log:
next release will be 2.0.6 to align with nuget package
Modified:
logging/log4net/trunk/log4net.build
logging/log4net/trunk/log4net.shfbproj
logging/log4net/trunk/netstandard/log4net.tests/project.json
logging/log4net/trunk/netstandard/log4net/project.json
logging/log4net/trunk/pom.xml
logging/log4net/trunk/src/AssemblyInfo.cs
logging/log4net/trunk/src/AssemblyVersionInfo.cpp
logging/log4net/trunk/src/AssemblyVersionInfo.cs
logging/log4net/trunk/src/AssemblyVersionInfo.js
logging/log4net/trunk/src/AssemblyVersionInfo.vb
logging/log4net/trunk/src/Log4netAssemblyInfo.cs
Modified: logging/log4net/trunk/log4net.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Sat Sep 17 14:35:37 2016
@@ -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.15"/>
+ <property name="package.version" value="2.0.6"/>
<!-- Include log4net helpers -->
<include buildfile="${log4net.basedir}/log4net.include" />
Modified: logging/log4net/trunk/log4net.shfbproj
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.shfbproj?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.shfbproj (original)
+++ logging/log4net/trunk/log4net.shfbproj Sat Sep 17 14:35:37 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@ limitations under the License.
<!-- SHFB properties -->
<FrameworkVersion>.NET Framework 3.5</FrameworkVersion>
<OutputPath>doc\sdk\net\4.0\</OutputPath>
- <HtmlHelpName>log4net-sdk-1.2.15</HtmlHelpName>
+ <HtmlHelpName>log4net-sdk-2.0.6</HtmlHelpName>
<Language>en-US</Language>
<SyntaxFilters>Standard</SyntaxFilters>
<SdkLinkTarget>Blank</SdkLinkTarget>
@@ -89,4 +89,4 @@ limitations under the License.
</PropertyGroup>
<!-- Import the SHFB build targets -->
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>
\ No newline at end of file
+</Project>
Modified: logging/log4net/trunk/netstandard/log4net.tests/project.json
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/netstandard/log4net.tests/project.json?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/netstandard/log4net.tests/project.json (original)
+++ logging/log4net/trunk/netstandard/log4net.tests/project.json Sat Sep 17
14:35:37 2016
@@ -1,5 +1,5 @@
{
- "version": "1.0.0-*",
+ "version": "2.0.6",
"buildOptions": {
"compile": [
"../../tests/src/*.cs",
Modified: logging/log4net/trunk/netstandard/log4net/project.json
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/netstandard/log4net/project.json?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/netstandard/log4net/project.json (original)
+++ logging/log4net/trunk/netstandard/log4net/project.json Sat Sep 17 14:35:37
2016
@@ -1,6 +1,6 @@
{
"name": "log4net",
- "version": "3.0.0",
+ "version": "2.0.6",
"title": "Apache log4net for .NET Core",
"copyright": "Copyright 2004-2016 The Apache Software Foundation.",
"frameworks": {
Modified: logging/log4net/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/pom.xml?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/pom.xml (original)
+++ logging/log4net/trunk/pom.xml Sat Sep 17 14:35:37 2016
@@ -20,7 +20,7 @@
<groupId>log4net</groupId>
<artifactId>apache-log4net</artifactId>
<packaging>pom</packaging>
- <version>1.2.15</version>
+ <version>2.0.6</version>
<name>Apache log4net</name>
<description>Logging framework for Microsoft .NET Framework.</description>
<url>http://logging.apache.org/log4net/</url>
Modified: logging/log4net/trunk/src/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyInfo.cs?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/AssemblyInfo.cs Sat Sep 17 14:35:37 2016
@@ -54,71 +54,71 @@ using System.Runtime.CompilerServices;
//
#if (CLI_1_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.CLI 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.CLI 1.0")]
[assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")]
#elif (NET_1_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 1.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")]
#elif (NET_1_1)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET 1.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 1.1")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")]
#elif (NET_4_5)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET 4.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 4.5")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")]
#elif (NET_4_0)
#if CLIENT_PROFILE
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET 4.0 CP")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 4.0 CP")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client
Profile")]
#else
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET 4.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 4.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")]
#endif // Client Profile
#elif (NET_2_0)
#if CLIENT_PROFILE
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET 3.5 CP")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 3.5 CP")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client
Profile")]
#else
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")]
#endif // Client Profile
#elif (NETCF_1_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NETCF 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NETCF 1.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")]
#elif (NETCF_2_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NETCF 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NETCF 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")]
#elif (MONO_1_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-Mono 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 1.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 1.0")]
#elif (MONO_2_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-Mono 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 2.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 2.0")]
#elif (MONO_3_5)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-Mono 3.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 3.5")]
[assembly: AssemblyTitle("Apache log4net for Mono 3.5")]
#elif (MONO_4_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-Mono 4.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 4.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 4.0")]
#elif (SSCLI_1_0)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-SSCLI 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-SSCLI 1.0")]
[assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")]
#elif (NET)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework")]
#elif (NETSTANDARD1_3)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NET Core 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET Core 1.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Core 1.0")]
#elif (NETCF)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-.NETCF")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NETCF")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")]
#elif (MONO)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-Mono")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono")]
[assembly: AssemblyTitle("Apache log4net for Mono")]
#elif (SSCLI)
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0-SSCLI")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-SSCLI")]
[assembly: AssemblyTitle("Apache log4net for Shared Source CLI")]
#else
-[assembly: AssemblyInformationalVersionAttribute("1.2.15.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.6.0")]
[assembly: AssemblyTitle("Apache log4net")]
#endif
Modified: logging/log4net/trunk/src/AssemblyVersionInfo.cpp
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.cpp?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.cpp (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.cpp Sat Sep 17 14:35:37 2016
@@ -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.15.0")];
+[assembly: AssemblyVersionAttribute("2.0.6.0")];
[assembly: AssemblyInformationalVersionAttribute("1.2")];
#if !NETCF
#if !SSCLI
-[assembly: AssemblyFileVersionAttribute("1.2.15.0")]
+[assembly: AssemblyFileVersionAttribute("2.0.6.0")]
#endif
#endif
Modified: logging/log4net/trunk/src/AssemblyVersionInfo.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.cs?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.cs (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.cs Sat Sep 17 14:35:37 2016
@@ -28,11 +28,11 @@
// 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.15.0")]
+[assembly: System.Reflection.AssemblyVersion("2.0.6.0")]
#if !NETCF
#if !SSCLI
-[assembly: System.Reflection.AssemblyFileVersion("1.2.15.0")]
+[assembly: System.Reflection.AssemblyFileVersion("2.0.6.0")]
#endif
#endif
Modified: logging/log4net/trunk/src/AssemblyVersionInfo.js
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.js?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.js (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.js Sat Sep 17 14:35:37 2016
@@ -31,12 +31,12 @@
// an import functions as a workaround for this issue.
import System.Reflection;
-[assembly: AssemblyVersion("1.2.15.0")]
+[assembly: AssemblyVersion("2.0.6.0")]
[assembly: AssemblyInformationalVersionAttribute("1.2")]
@if (!@NETCF)
@if (!@SSCLI)
-[assembly: AssemblyFileVersion("1.2.15.0")]
+[assembly: AssemblyFileVersion("2.0.6.0")]
@end
@end
Modified: logging/log4net/trunk/src/AssemblyVersionInfo.vb
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.vb?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.vb (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.vb Sat Sep 17 14:35:37 2016
@@ -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.15.0")>
+<Assembly: System.Reflection.AssemblyVersion("2.0.6.0")>
<Assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2")>
#If NOT NETCF Then
#If NOT SSCLI Then
-<Assembly: System.Reflection.AssemblyFileVersion("1.2.15.0")>
+<Assembly: System.Reflection.AssemblyFileVersion("2.0.6.0")>
#End If
#End If
Modified: logging/log4net/trunk/src/Log4netAssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Log4netAssemblyInfo.cs?rev=1761247&r1=1761246&r2=1761247&view=diff
==============================================================================
--- logging/log4net/trunk/src/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/Log4netAssemblyInfo.cs Sat Sep 17 14:35:37 2016
@@ -25,7 +25,7 @@ namespace log4net {
/// </summary>
public sealed class AssemblyInfo {
/// <summary>Version of the assembly</summary>
- public const string Version = "1.2.15";
+ public const string Version = "2.0.6";
/// <summary>Version of the framework targeted</summary>
#if NET_1_1
