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 17:39:10 UTC
svn commit: r1697195 - in /logging/log4net/branches/log4net-1.2.x: src/
src/Util/ tests/src/ tests/src/Context/
Author: bodewig
Date: Sun Aug 23 15:39:10 2015
New Revision: 1697195
URL: http://svn.apache.org/r1697195
Log:
merge patch by Alexander Houben for LOG4NET-455 from trunk
Added:
logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextStack.cs
- copied, changed from r1669884, logging/log4net/trunk/src/log4net/Util/LogicalThreadContextStack.cs
logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextStacks.cs
- copied unchanged from r1669884, logging/log4net/trunk/src/log4net/Util/LogicalThreadContextStacks.cs
logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.csproj
- copied, changed from r1669884, logging/log4net/trunk/src/log4net/log4net.vs2012.csproj
logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.sln
- copied, changed from r1669884, logging/log4net/trunk/src/log4net/log4net.vs2012.sln
logging/log4net/branches/log4net-1.2.x/tests/src/Context/LogicalThreadContextTest.cs
- copied, changed from r1669884, logging/log4net/trunk/src/log4net.Tests/Context/LogicalThreadContextTest.cs
logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2012.csproj
- copied, changed from r1669884, logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2012.csproj
Modified:
logging/log4net/branches/log4net-1.2.x/src/ (props changed)
logging/log4net/branches/log4net-1.2.x/src/AssemblyInfo.cs
logging/log4net/branches/log4net-1.2.x/src/LogicalThreadContext.cs
logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextProperties.cs
logging/log4net/branches/log4net-1.2.x/src/log4net.vs2010.csproj
logging/log4net/branches/log4net-1.2.x/tests/src/ (props changed)
logging/log4net/branches/log4net-1.2.x/tests/src/Utils.cs
logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2010.csproj
Propchange: logging/log4net/branches/log4net-1.2.x/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 15:39:10 2015
@@ -1,4 +1,4 @@
/logging/log4net/branches/1.2.12/src:1511686-1520870
/logging/log4net/tags/1.2.13RC1/src:1539445-1539920
/logging/log4net/trunk/src:1539083
-/logging/log4net/trunk/src/log4net:1541408,1544744,1665915
+/logging/log4net/trunk/src/log4net:1541408,1544744,1665915,1669884-1669885
Modified: logging/log4net/branches/log4net-1.2.x/src/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/AssemblyInfo.cs?rev=1697195&r1=1697194&r2=1697195&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/AssemblyInfo.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/AssemblyInfo.cs Sun Aug 23 15:39:10 2015
@@ -59,6 +59,8 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")]
#elif (NET_1_1)
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")]
+#elif (NET_4_5)
+[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")]
#elif (NET_4_0)
#if CLIENT_PROFILE
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")]
@@ -79,6 +81,10 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyTitle("Apache log4net for Mono 1.0")]
#elif (MONO_2_0)
[assembly: AssemblyTitle("Apache log4net for Mono 2.0")]
+#elif (MONO_3_5)
+[assembly: AssemblyTitle("Apache log4net for Mono 3.5")]
+#elif (MONO_4_0)
+[assembly: AssemblyTitle("Apache log4net for Mono 4.0")]
#elif (SSCLI_1_0)
[assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")]
#elif (CLI_1_0)
Modified: logging/log4net/branches/log4net-1.2.x/src/LogicalThreadContext.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/LogicalThreadContext.cs?rev=1697195&r1=1697194&r2=1697195&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/LogicalThreadContext.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/LogicalThreadContext.cs Sun Aug 23 15:39:10 2015
@@ -125,7 +125,7 @@ namespace log4net
/// The logical thread stacks.
/// </para>
/// </remarks>
- public static ThreadContextStacks Stacks
+ public static LogicalThreadContextStacks Stacks
{
get { return s_stacks; }
}
@@ -142,7 +142,7 @@ namespace log4net
/// <summary>
/// The thread context stacks instance
/// </summary>
- private readonly static ThreadContextStacks s_stacks = new ThreadContextStacks(s_properties);
+ private readonly static LogicalThreadContextStacks s_stacks = new LogicalThreadContextStacks(s_properties);
#endregion Private Static Fields
}
Modified: logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextProperties.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextProperties.cs?rev=1697195&r1=1697194&r2=1697195&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextProperties.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextProperties.cs Sun Aug 23 15:39:10 2015
@@ -98,9 +98,14 @@ namespace log4net.Util
return null;
}
set
- {
+ {
// Force the dictionary to be created
- GetProperties(true)[key] = value;
+ PropertiesDictionary props = GetProperties(true);
+ // Reason for cloning the dictionary below: object instances set on the CallContext
+ // need to be immutable to correctly flow through async/await
+ PropertiesDictionary immutableProps = new PropertiesDictionary(props);
+ immutableProps[key] = value;
+ SetCallContextData(immutableProps);
}
}
@@ -122,7 +127,9 @@ namespace log4net.Util
PropertiesDictionary dictionary = GetProperties(false);
if (dictionary != null)
{
- dictionary.Remove(key);
+ PropertiesDictionary immutableProps = new PropertiesDictionary(dictionary);
+ immutableProps.Remove(key);
+ SetCallContextData(immutableProps);
}
}
@@ -139,7 +146,8 @@ namespace log4net.Util
PropertiesDictionary dictionary = GetProperties(false);
if (dictionary != null)
{
- dictionary.Clear();
+ PropertiesDictionary immutableProps = new PropertiesDictionary();
+ SetCallContextData(immutableProps);
}
}
Copied: logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextStack.cs (from r1669884, logging/log4net/trunk/src/log4net/Util/LogicalThreadContextStack.cs)
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextStack.cs?p2=logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextStack.cs&p1=logging/log4net/trunk/src/log4net/Util/LogicalThreadContextStack.cs&r1=1669884&r2=1697195&rev=1697195&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net/Util/LogicalThreadContextStack.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/Util/LogicalThreadContextStack.cs Sun Aug 23 15:39:10 2015
@@ -144,8 +144,9 @@ namespace log4net.Util
{
result = ((StackFrame)(stack.Pop())).Message;
}
- m_registerNew(m_propertyKey,
- new LogicalThreadContextStack(m_propertyKey, m_registerNew) { m_stack = stack });
+ LogicalThreadContextStack ltcs = new LogicalThreadContextStack(m_propertyKey, m_registerNew);
+ ltcs.m_stack = stack;
+ m_registerNew(m_propertyKey, ltcs);
return result;
}
@@ -178,7 +179,8 @@ namespace log4net.Util
Stack stack = new Stack(new Stack(m_stack));
stack.Push(new StackFrame(message, (stack.Count > 0) ? (StackFrame)stack.Peek() : null));
- var contextStack = new LogicalThreadContextStack(m_propertyKey, m_registerNew) { m_stack = stack };
+ LogicalThreadContextStack contextStack = new LogicalThreadContextStack(m_propertyKey, m_registerNew);
+ contextStack.m_stack = stack;
m_registerNew(m_propertyKey, contextStack);
return new AutoPopStackFrame(contextStack, stack.Count - 1);
}
@@ -399,8 +401,10 @@ namespace log4net.Util
{
stack.Pop();
}
+ LogicalThreadContextStack ltcs = new LogicalThreadContextStack(m_logicalThreadContextStack.m_propertyKey, m_logicalThreadContextStack.m_registerNew);
+ ltcs.m_stack = stack;
m_logicalThreadContextStack.m_registerNew(m_logicalThreadContextStack.m_propertyKey,
- new LogicalThreadContextStack(m_logicalThreadContextStack.m_propertyKey, m_logicalThreadContextStack.m_registerNew) { m_stack = stack });
+ ltcs);
}
}
Modified: logging/log4net/branches/log4net-1.2.x/src/log4net.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/log4net.vs2010.csproj?rev=1697195&r1=1697194&r2=1697195&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/log4net.vs2010.csproj (original)
+++ logging/log4net/branches/log4net-1.2.x/src/log4net.vs2010.csproj Sun Aug 23 15:39:10 2015
@@ -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
@@ -66,7 +66,7 @@
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\build\bin\net\2.0\debug\</OutputPath>
+ <OutputPath>..\build\bin\net\4.0\debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -86,7 +86,7 @@
<CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\build\bin\net\2.0\release\</OutputPath>
+ <OutputPath>..\build\bin\net\4.0\release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -723,9 +723,15 @@
<Compile Include="Util\ThreadContextProperties.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="Util\LogicalThreadContextStack.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="Util\ThreadContextStack.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="Util\LogicalThreadContextStacks.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="Util\ThreadContextStacks.cs">
<SubType>Code</SubType>
</Compile>
Copied: logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.csproj (from r1669884, logging/log4net/trunk/src/log4net/log4net.vs2012.csproj)
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.csproj?p2=logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.csproj&p1=logging/log4net/trunk/src/log4net/log4net.vs2012.csproj&r1=1669884&r2=1697195&rev=1697195&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net/log4net.vs2012.csproj (original)
+++ logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.csproj Sun Aug 23 15:39:10 2015
@@ -66,13 +66,13 @@
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\build\bin\log4net\net\4.5\debug\</OutputPath>
+ <OutputPath>..\build\bin\net\4.5\debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE;FRAMEWORK_4_5_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;NET;NET_2_0;NET_4_0;NET_4_5</DefineConstants>
<DocumentationFile>log4net.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
@@ -86,13 +86,13 @@
<CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\build\bin\log4net\net\4.5\release\</OutputPath>
+ <OutputPath>..\build\bin\net\4.5\release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;STRONG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE;FRAMEWORK_4_5_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;STRONG;NET;NET_2_0;NET_4_0;NET_4_5</DefineConstants>
<DocumentationFile>log4net.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
Copied: logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.sln (from r1669884, logging/log4net/trunk/src/log4net/log4net.vs2012.sln)
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.sln?p2=logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.sln&p1=logging/log4net/trunk/src/log4net/log4net.vs2012.sln&r1=1669884&r2=1697195&rev=1697195&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net/log4net.vs2012.sln (original)
+++ logging/log4net/branches/log4net-1.2.x/src/log4net.vs2012.sln Sun Aug 23 15:39:10 2015
@@ -22,7 +22,7 @@ Microsoft Visual Studio Solution File, F
#
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.vs2012", "log4net.vs2012.csproj", "{181FE707-E161-4722-9F38-6AAAB6FAA106}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2012", "..\log4net.Tests\log4net.Tests.vs2012.csproj", "{B0530F10-0238-49A9-93B0-8EF412E90BCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2012", "..\tests\src\log4net.Tests.vs2010.csproj", "{B0530F10-0238-49A9-93B0-8EF412E90BCF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Propchange: logging/log4net/branches/log4net-1.2.x/tests/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 23 15:39:10 2015
@@ -0,0 +1,4 @@
+/logging/log4net/branches/1.2.12/tests/src:1511686-1520870
+/logging/log4net/tags/1.2.13RC1/tests/src:1539445-1539920
+/logging/log4net/trunk/src/log4net.Tests:1669884
+/logging/log4net/trunk/tests/src:1539083
Copied: logging/log4net/branches/log4net-1.2.x/tests/src/Context/LogicalThreadContextTest.cs (from r1669884, logging/log4net/trunk/src/log4net.Tests/Context/LogicalThreadContextTest.cs)
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/tests/src/Context/LogicalThreadContextTest.cs?p2=logging/log4net/branches/log4net-1.2.x/tests/src/Context/LogicalThreadContextTest.cs&p1=logging/log4net/trunk/src/log4net.Tests/Context/LogicalThreadContextTest.cs&r1=1669884&r2=1697195&rev=1697195&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.Tests/Context/LogicalThreadContextTest.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/tests/src/Context/LogicalThreadContextTest.cs Sun Aug 23 15:39:10 2015
@@ -31,7 +31,7 @@ using NUnit.Framework;
namespace log4net.Tests.Context
{
-#if FRAMEWORK_4_5_OR_ABOVE
+#if NET_4_5
/// <summary>
/// Used for internal unit testing the <see cref="LogicalThreadContext"/> class.
/// </summary>
Modified: logging/log4net/branches/log4net-1.2.x/tests/src/Utils.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/tests/src/Utils.cs?rev=1697195&r1=1697194&r2=1697195&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/tests/src/Utils.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/tests/src/Utils.cs Sun Aug 23 15:39:10 2015
@@ -105,6 +105,7 @@ namespace log4net.Tests
internal static void RemovePropertyFromAllContexts() {
GlobalContext.Properties.Remove(PROPERTY_KEY);
ThreadContext.Properties.Remove(PROPERTY_KEY);
+ LogicalThreadContext.Properties.Remove(PROPERTY_KEY);
}
}
}
\ No newline at end of file
Modified: logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2010.csproj?rev=1697195&r1=1697194&r2=1697195&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2010.csproj (original)
+++ logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2010.csproj Sun Aug 23 15:39:10 2015
@@ -163,6 +163,9 @@
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="Context\LogicalThreadContextTest.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="Context\ThreadContextTest.cs">
<SubType>Code</SubType>
</Compile>
Copied: logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2012.csproj (from r1669884, logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2012.csproj)
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2012.csproj?p2=logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2012.csproj&p1=logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2012.csproj&r1=1669884&r2=1697195&rev=1697195&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.Tests/log4net.Tests.vs2012.csproj (original)
+++ logging/log4net/branches/log4net-1.2.x/tests/src/log4net.Tests.vs2012.csproj Sun Aug 23 15:39:10 2015
@@ -66,13 +66,13 @@
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\build\bin\log4net.Tests\net\4.5\debug\</OutputPath>
+ <OutputPath>..\bin\Debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE;FRAMEWORK_4_5_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;NET;NET_2_0;NET_4_0;NET_4_5</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
@@ -87,13 +87,13 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\build\bin\log4net.Tests\net\4.5\release\</OutputPath>
+ <OutputPath>..\bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE;FRAMEWORK_4_5_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;NET;NET_2_0;NET_4_0;NET_4_5</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
@@ -110,7 +110,7 @@
<ItemGroup>
<Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\test\nunit.framework.dll</HintPath>
+ <HintPath>..\..\..\ibatisnet-3\External-Bin\Net\2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
@@ -130,7 +130,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\log4net\AssemblyVersionInfo.cs">
+ <Compile Include="..\..\src\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
<SubType>Code</SubType>
</Compile>
@@ -233,7 +233,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\log4net\log4net.vs2012.csproj">
+ <ProjectReference Include="..\..\src\log4net.vs2012.csproj">
<Project>{181fe707-e161-4722-9f38-6aaab6faa106}</Project>
<Name>log4net.vs2012</Name>
</ProjectReference>