Author: bodewig
Date: Tue Nov 5 17:39:55 2013
New Revision: 1539082
URL: http://svn.apache.org/r1539082
Log:
LOG4NET-71 move log4net's sources to a subdirectory
Added:
logging/log4net/trunk/src/log4net/
logging/log4net/trunk/src/log4net/Appender/
- copied from r1539059, logging/log4net/trunk/src/Appender/
logging/log4net/trunk/src/log4net/AssemblyInfo.cs
- copied unchanged from r1539059,
logging/log4net/trunk/src/AssemblyInfo.cs
logging/log4net/trunk/src/log4net/AssemblyVersionInfo.cpp
- copied unchanged from r1539059,
logging/log4net/trunk/src/AssemblyVersionInfo.cpp
logging/log4net/trunk/src/log4net/AssemblyVersionInfo.cs
- copied unchanged from r1539059,
logging/log4net/trunk/src/AssemblyVersionInfo.cs
logging/log4net/trunk/src/log4net/AssemblyVersionInfo.js
- copied unchanged from r1539059,
logging/log4net/trunk/src/AssemblyVersionInfo.js
logging/log4net/trunk/src/log4net/AssemblyVersionInfo.vb
- copied unchanged from r1539059,
logging/log4net/trunk/src/AssemblyVersionInfo.vb
logging/log4net/trunk/src/log4net/Config/
- copied from r1539059, logging/log4net/trunk/src/Config/
logging/log4net/trunk/src/log4net/Core/
- copied from r1539059, logging/log4net/trunk/src/Core/
logging/log4net/trunk/src/log4net/DateFormatter/
- copied from r1539059, logging/log4net/trunk/src/DateFormatter/
logging/log4net/trunk/src/log4net/Filter/
- copied from r1539059, logging/log4net/trunk/src/Filter/
logging/log4net/trunk/src/log4net/GlobalContext.cs
- copied unchanged from r1539059,
logging/log4net/trunk/src/GlobalContext.cs
logging/log4net/trunk/src/log4net/ILog.cs
- copied unchanged from r1539059, logging/log4net/trunk/src/ILog.cs
logging/log4net/trunk/src/log4net/Layout/
- copied from r1539059, logging/log4net/trunk/src/Layout/
logging/log4net/trunk/src/log4net/Log4netAssemblyInfo.cs
- copied unchanged from r1539059,
logging/log4net/trunk/src/Log4netAssemblyInfo.cs
logging/log4net/trunk/src/log4net/LogManager.cs
- copied unchanged from r1539059, logging/log4net/trunk/src/LogManager.cs
logging/log4net/trunk/src/log4net/LogicalThreadContext.cs
- copied unchanged from r1539059,
logging/log4net/trunk/src/LogicalThreadContext.cs
logging/log4net/trunk/src/log4net/MDC.cs
- copied unchanged from r1539059, logging/log4net/trunk/src/MDC.cs
logging/log4net/trunk/src/log4net/NDC.cs
- copied unchanged from r1539059, logging/log4net/trunk/src/NDC.cs
logging/log4net/trunk/src/log4net/ObjectRenderer/
- copied from r1539059, logging/log4net/trunk/src/ObjectRenderer/
logging/log4net/trunk/src/log4net/Plugin/
- copied from r1539059, logging/log4net/trunk/src/Plugin/
logging/log4net/trunk/src/log4net/Repository/
- copied from r1539059, logging/log4net/trunk/src/Repository/
logging/log4net/trunk/src/log4net/ThreadContext.cs
- copied unchanged from r1539059,
logging/log4net/trunk/src/ThreadContext.cs
logging/log4net/trunk/src/log4net/Util/
- copied from r1539059, logging/log4net/trunk/src/Util/
logging/log4net/trunk/src/log4net/log4net.vs2008.csproj
- copied, changed from r1539059,
logging/log4net/trunk/src/log4net.vs2008.csproj
logging/log4net/trunk/src/log4net/log4net.vs2008.sln
- copied, changed from r1539059,
logging/log4net/trunk/src/log4net.vs2008.sln
logging/log4net/trunk/src/log4net/log4net.vs2010.csproj
- copied, changed from r1539059,
logging/log4net/trunk/src/log4net.vs2010.csproj
logging/log4net/trunk/src/log4net/log4net.vs2010.sln
- copied, changed from r1539059,
logging/log4net/trunk/src/log4net.vs2010.sln
Removed:
logging/log4net/trunk/src/Appender/
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/Config/
logging/log4net/trunk/src/Core/
logging/log4net/trunk/src/DateFormatter/
logging/log4net/trunk/src/Filter/
logging/log4net/trunk/src/GlobalContext.cs
logging/log4net/trunk/src/ILog.cs
logging/log4net/trunk/src/Layout/
logging/log4net/trunk/src/Log4netAssemblyInfo.cs
logging/log4net/trunk/src/LogManager.cs
logging/log4net/trunk/src/LogicalThreadContext.cs
logging/log4net/trunk/src/MDC.cs
logging/log4net/trunk/src/NDC.cs
logging/log4net/trunk/src/ObjectRenderer/
logging/log4net/trunk/src/Plugin/
logging/log4net/trunk/src/Repository/
logging/log4net/trunk/src/ThreadContext.cs
logging/log4net/trunk/src/Util/
logging/log4net/trunk/src/log4net.vs2008.csproj
logging/log4net/trunk/src/log4net.vs2008.sln
logging/log4net/trunk/src/log4net.vs2010.csproj
logging/log4net/trunk/src/log4net.vs2010.sln
Modified:
logging/log4net/trunk/log4net.build
logging/log4net/trunk/log4net.include
logging/log4net/trunk/src/ (props changed)
logging/log4net/trunk/tests/nant.build
logging/log4net/trunk/tests/src/log4net.Tests.vs2008.csproj
logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj
Modified: logging/log4net/trunk/log4net.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1539082&r1=1539081&r2=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Tue Nov 5 17:39:55 2013
@@ -211,8 +211,9 @@ limitations under the License.
<include name="${log4net.basedir}/NOTICE" />
<include name="${log4net.basedir}/LICENSE" />
</resourcefileset>
- <fileset id="sources" basedir="${log4net.basedir}/src">
- <include name="**/*.cs" />
+ <fileset id="sources" basedir="${log4net.basedir}">
+ <include name="src/log4net/**/*.cs" />
+ <include name="${generated.src.dir}/**/*.cs" />
</fileset>
<assemblyfileset id="references">
<include name="mscorlib.dll"/>
@@ -397,7 +398,6 @@ limitations under the License.
<exclude name="**/*.csproj.user" />
<exclude name="**/*.vbproj.user" />
- <exclude name="src/GeneratedAssemblyInfo.cs" />
<exclude name="tests/doc/**" />
<exclude name="tests/lib/net/**" />
<exclude name="tests/lib/mono/**" />
@@ -513,8 +513,9 @@ limitations under the License.
<property name="assembly.description"
value="The Apache Software Foundation log4net Logging
Framework built from svn revision ${source.svn.revision} of ${source.svn.url}"/>
</if>
- <delete file="src/GeneratedAssemblyInfo.cs"/>
- <asminfo language="CSharp" output="src/GeneratedAssemblyInfo.cs">
+ <delete file="${generated.src.dir}/GeneratedAssemblyInfo.cs"/>
+ <mkdir dir="${generated.src.dir}"/>
+ <asminfo language="CSharp"
output="${generated.src.dir}/GeneratedAssemblyInfo.cs">
<imports>
<import namespace="System.Reflection"/>
</imports>
Modified: logging/log4net/trunk/log4net.include
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.include?rev=1539082&r1=1539081&r2=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.include (original)
+++ logging/log4net/trunk/log4net.include Tue Nov 5 17:39:55 2013
@@ -16,6 +16,9 @@ See the License for the specific languag
limitations under the License.
-->
<project name="log4net-helpers" xmlnds="http://tempuri.org/nant-vs.xsd";>
+ <property name="build.dir" value="${log4net.basedir}/build"/>
+ <property name="generated.src.dir" value="${build.dir}/generated-src"/>
+
<!-- The path to the log4net output directory for current build/runtime -->
<property
name="log4net.output.dir"
Propchange: logging/log4net/trunk/src/
('svn:ignore' removed)
Copied: logging/log4net/trunk/src/log4net/log4net.vs2008.csproj (from r1539059,
logging/log4net/trunk/src/log4net.vs2008.csproj)
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/log4net.vs2008.csproj?p2=logging/log4net/trunk/src/log4net/log4net.vs2008.csproj&p1=logging/log4net/trunk/src/log4net.vs2008.csproj&r1=1539059&r2=1539082&rev=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2008.csproj (original)
+++ logging/log4net/trunk/src/log4net/log4net.vs2008.csproj Tue Nov 5 17:39:55
2013
@@ -50,7 +50,7 @@
<OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
- <OutputPath>..\build\bin\net\2.0\debug\</OutputPath>
+ <OutputPath>..\..\build\bin\net\2.0\debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -69,7 +69,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release|AnyCPU' ">
- <OutputPath>..\build\bin\net\2.0\release\</OutputPath>
+ <OutputPath>..\..\build\bin\net\2.0\release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Copied: logging/log4net/trunk/src/log4net/log4net.vs2008.sln (from r1539059,
logging/log4net/trunk/src/log4net.vs2008.sln)
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/log4net.vs2008.sln?p2=logging/log4net/trunk/src/log4net/log4net.vs2008.sln&p1=logging/log4net/trunk/src/log4net.vs2008.sln&r1=1539059&r2=1539082&rev=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2008.sln (original)
+++ logging/log4net/trunk/src/log4net/log4net.vs2008.sln Tue Nov 5 17:39:55
2013
@@ -22,7 +22,7 @@ Microsoft Visual Studio Solution File, F
#
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.vs2008",
"log4net.vs2008.csproj", "{181FE707-E161-4722-9F38-6AAAB6FAA106}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2008",
"..\tests\src\log4net.Tests.vs2008.csproj",
"{B0530F10-0238-49A9-93B0-8EF412E90BCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2008",
"..\..\tests\src\log4net.Tests.vs2008.csproj",
"{B0530F10-0238-49A9-93B0-8EF412E90BCF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Copied: logging/log4net/trunk/src/log4net/log4net.vs2010.csproj (from r1539059,
logging/log4net/trunk/src/log4net.vs2010.csproj)
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/log4net.vs2010.csproj?p2=logging/log4net/trunk/src/log4net/log4net.vs2010.csproj&p1=logging/log4net/trunk/src/log4net.vs2010.csproj&r1=1539059&r2=1539082&rev=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2010.csproj (original)
+++ logging/log4net/trunk/src/log4net/log4net.vs2010.csproj Tue Nov 5 17:39:55
2013
@@ -66,7 +66,7 @@
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
- <OutputPath>..\build\bin\net\2.0\debug\</OutputPath>
+ <OutputPath>..\..\build\bin\net\2.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\2.0\release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Copied: logging/log4net/trunk/src/log4net/log4net.vs2010.sln (from r1539059,
logging/log4net/trunk/src/log4net.vs2010.sln)
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/log4net.vs2010.sln?p2=logging/log4net/trunk/src/log4net/log4net.vs2010.sln&p1=logging/log4net/trunk/src/log4net.vs2010.sln&r1=1539059&r2=1539082&rev=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2010.sln (original)
+++ logging/log4net/trunk/src/log4net/log4net.vs2010.sln Tue Nov 5 17:39:55
2013
@@ -22,7 +22,7 @@ Microsoft Visual Studio Solution File, F
#
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.vs2010",
"log4net.vs2010.csproj", "{181FE707-E161-4722-9F38-6AAAB6FAA106}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2010",
"..\tests\src\log4net.Tests.vs2010.csproj",
"{B0530F10-0238-49A9-93B0-8EF412E90BCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2010",
"..\..\tests\src\log4net.Tests.vs2010.csproj",
"{B0530F10-0238-49A9-93B0-8EF412E90BCF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Modified: logging/log4net/trunk/tests/nant.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/tests/nant.build?rev=1539082&r1=1539081&r2=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/tests/nant.build (original)
+++ logging/log4net/trunk/tests/nant.build Tue Nov 5 17:39:55 2013
@@ -87,7 +87,6 @@ limitations under the License.
<fileset id="sources" basedir="src">
<include name="**/*.cs" />
- <include name="../../src/AssemblyVersionInfo.cs" />
</fileset>
<assemblyfileset id="references">
<include name="mscorlib.dll"/>
Modified: logging/log4net/trunk/tests/src/log4net.Tests.vs2008.csproj
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/log4net.Tests.vs2008.csproj?rev=1539082&r1=1539081&r2=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/log4net.Tests.vs2008.csproj (original)
+++ logging/log4net/trunk/tests/src/log4net.Tests.vs2008.csproj Tue Nov 5
17:39:55 2013
@@ -113,7 +113,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\src\AssemblyVersionInfo.cs">
+ <Compile Include="..\..\src\log4net\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
<SubType>Code</SubType>
</Compile>
@@ -200,7 +200,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\src\log4net.vs2008.csproj">
+ <ProjectReference Include="..\..\src\log4net\log4net.vs2008.csproj">
<Project>{181FE707-E161-4722-9F38-6AAAB6FAA106}</Project>
<Name>log4net.vs2008</Name>
</ProjectReference>
Modified: logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj?rev=1539082&r1=1539081&r2=1539082&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj (original)
+++ logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj Tue Nov 5
17:39:55 2013
@@ -130,7 +130,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\src\AssemblyVersionInfo.cs">
+ <Compile Include="..\..\src\log4net\AssemblyVersionInfo.cs">
<Link>AssemblyVersionInfo.cs</Link>
<SubType>Code</SubType>
</Compile>
@@ -230,7 +230,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\src\log4net.vs2010.csproj">
+ <ProjectReference Include="..\..\src\lognet\log4net.vs2010.csproj">
<Project>{181fe707-e161-4722-9f38-6aaab6faa106}</Project>
<Name>log4net.vs2010</Name>
</ProjectReference>
