Skip to content

Commit 582513b

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/1.0.4' into production
2 parents 8cae1ef + 418dcb6 commit 582513b

File tree

41 files changed

+531
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+531
-220
lines changed

‎CSF.Zpt.Abstractions/AssemblyInfo.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System.Reflection;
1+
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

44
// This is a stub file with empty values; the values will be replaced at build-time.
5-
[assembly: AssemblyTitle("STUB")]
6-
[assembly: AssemblyDescription("STUB")]
7-
[assembly: AssemblyCompany("STUB")]
8-
[assembly: AssemblyProduct("STUB")]
9-
[assembly: AssemblyCopyright("STUB")]
10-
[assembly: AssemblyConfiguration("STUB")]
11-
[assembly: AssemblyVersion("1.0.0.0")]
12-
[assembly: AssemblyFileVersion("1.0.0.0")]
5+
[assembly: AssemblyTitle("CSF.Zpt.Abstractions")]
6+
[assembly: AssemblyDescription("Abstract types & interfaces for ZPT-Sharp.")]
7+
[assembly: AssemblyCompany("CSF Software Limited")]
8+
[assembly: AssemblyProduct("CSF.Zpt")]
9+
[assembly: AssemblyCopyright("CSF Software Limited et al")]
10+
[assembly: AssemblyConfiguration("Release")]
11+
[assembly: AssemblyVersion("1.0.4.0")]
12+
[assembly: AssemblyFileVersion("1.0.4.1")]

‎CSF.Zpt.Cli/AssemblyInfo.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System.Reflection;
1+
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

44
// This is a stub file with empty values; the values will be replaced at build-time.
5-
[assembly: AssemblyTitle("STUB")]
6-
[assembly: AssemblyDescription("STUB")]
7-
[assembly: AssemblyCompany("STUB")]
8-
[assembly: AssemblyProduct("STUB")]
9-
[assembly: AssemblyCopyright("STUB")]
10-
[assembly: AssemblyConfiguration("STUB")]
11-
[assembly: AssemblyVersion("1.0.0.0")]
12-
[assembly: AssemblyFileVersion("1.0.0.0")]
5+
[assembly: AssemblyTitle("ZptBuilder")]
6+
[assembly: AssemblyDescription("Command-line utility for rendering ZPT documents")]
7+
[assembly: AssemblyCompany("CSF Software Limited")]
8+
[assembly: AssemblyProduct("CSF.Zpt")]
9+
[assembly: AssemblyCopyright("CSF Software Limited et al")]
10+
[assembly: AssemblyConfiguration("Release")]
11+
[assembly: AssemblyVersion("1.0.4.0")]
12+
[assembly: AssemblyFileVersion("1.0.4.1")]

‎CSF.Zpt.Log4net/AssemblyInfo.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System.Reflection;
1+
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

44
// This is a stub file with empty values; the values will be replaced at build-time.
5-
[assembly: AssemblyTitle("STUB")]
6-
[assembly: AssemblyDescription("STUB")]
7-
[assembly: AssemblyCompany("STUB")]
8-
[assembly: AssemblyProduct("STUB")]
9-
[assembly: AssemblyCopyright("STUB")]
10-
[assembly: AssemblyConfiguration("STUB")]
11-
[assembly: AssemblyVersion("1.0.0.0")]
12-
[assembly: AssemblyFileVersion("1.0.0.0")]
5+
[assembly: AssemblyTitle("CSF.Zpt.Log4Net")]
6+
[assembly: AssemblyDescription("Log4net Trace Listener")]
7+
[assembly: AssemblyCompany("CSF Software Limited")]
8+
[assembly: AssemblyProduct("CSF.Zpt")]
9+
[assembly: AssemblyCopyright("CSF Software Limited et al")]
10+
[assembly: AssemblyConfiguration("Release")]
11+
[assembly: AssemblyVersion("1.0.4.0")]
12+
[assembly: AssemblyFileVersion("1.0.4.1")]

‎CSF.Zpt.Log4net/CSF.Zpt.Log4net.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26+
<DocumentationFile>bin\Debug\CSF.Zpt.Log4net.xml</DocumentationFile>
2627
<ConsolePause>false</ConsolePause>
2728
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
2829
</PropertyGroup>
@@ -31,10 +32,16 @@
3132
<OutputPath>bin\Release</OutputPath>
3233
<ErrorReport>prompt</ErrorReport>
3334
<WarningLevel>4</WarningLevel>
35+
<DocumentationFile>bin\Release\CSF.Zpt.Log4net.xml</DocumentationFile>
3436
<ConsolePause>false</ConsolePause>
3537
<DefineConstants>TRACE</DefineConstants>
3638
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
3739
</PropertyGroup>
40+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
41+
<Optimize>true</Optimize>
42+
<DocumentationFile>..\CSF.Zpt.Log4net.xml\CSF.Zpt.Log4net.xml\CSF.Zpt.Log4net.xml\CSF.Zpt.Log4net.xml</DocumentationFile>
43+
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
44+
</PropertyGroup>
3845
<ItemGroup>
3946
<Reference Include="System" />
4047
<Reference Include="log4net">
@@ -50,6 +57,11 @@
5057
<ItemGroup>
5158
<None Include="packages.config" />
5259
<None Include="App.config" />
60+
<None Include="app.config.install.xdt" />
61+
<None Include="web.config.install.xdt" />
62+
<None Include="app.config.uninstall.xdt" />
63+
<None Include="web.config.uninstall.xdt" />
64+
<None Include="CSF.Zpt.Log4net.nuspec.pt" />
5365
</ItemGroup>
5466
<ItemGroup>
5567
<ProjectReference Include="..\CSF.Zpt.Abstractions\CSF.Zpt.Abstractions.csproj">

‎CSF.Zpt.Log4net/CSF.Zpt.Log4net.nuspec.pt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0"?>
2+
<package xmlns:metal="http://xml.zope.org/namespaces/metal"
3+
xmlns:tal="http://xml.zope.org/namespaces/tal">
4+
<metadata tal:define="semVer options/version;
5+
extraVer options/versionExtra;
6+
versionSuffix csharp:!String.IsNullOrEmpty(extraVer)? String.Concat(&quot;-&quot;, extraVer) : String.Empty;
7+
fullVersion string:$semVer$versionSuffix;">
8+
<id>CSF.Zpt.Log4net</id>
9+
<version tal:content="fullVersion">0.0.0</version>
10+
<title>CSF.Zpt.Log4net - logging and diagnostics for ZPT-Sharp</title>
11+
<authors>CSF Software Ltd</authors>
12+
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
13+
<projectUrl>http://csf-dev.github.io/ZPT-Sharp/</projectUrl>
14+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
15+
<description>This is an optional add-on to ZPT-Sharp which provides detailled logging and diagnostics information about the internal ZPT rendering process. Log4net is used as the underlying logging engine.</description>
16+
<copyright tal:content="string:Copyright ${options/copyrightYear}">Copyright 2016</copyright>
17+
<dependencies>
18+
<dependency id="CSF.Zpt.Abstractions"
19+
version="[0.0.0,1.0.0)"
20+
tal:attributes="version string:[$fullVersion,${options/nextBreakingVersion})" />
21+
<dependency id="log4net" version="[2.0.3,3.0.0)" />
22+
</dependencies>
23+
</metadata>
24+
<files>
25+
<file src="bin/Release/CSF.Zpt.Log4net.dll" target="lib/net45" />
26+
<file src="bin/Release/CSF.Zpt.Log4net.xml" target="lib/net45" />
27+
<file src="app.config.install.xdt" target="content" />
28+
<file src="app.config.uninstall.xdt" target="content" />
29+
<file src="web.config.install.xdt" target="content" />
30+
<file src="web.config.uninstall.xdt" target="content" />
31+
</files>
32+
</package>

‎CSF.Zpt.Log4net/Log4netTraceListener.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,15 @@ private ILog GetLogger()
148148

149149
#region constructor
150150

151+
/// <summary>
152+
/// Initializes a new instance of the <see cref="T:CSF.Zpt.Log4netTraceListener"/> class.
153+
/// </summary>
151154
public Log4netTraceListener() : this(null) {}
152155

156+
/// <summary>
157+
/// Initializes a new instance of the <see cref="T:CSF.Zpt.Log4netTraceListener"/> class.
158+
/// </summary>
159+
/// <param name="log">Log.</param>
153160
public Log4netTraceListener(log4net.ILog log)
154161
{
155162
_syncRoot = new object();

‎CSF.Zpt.Log4net/SelfConfiguringLog4netTraceListener.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,20 @@ namespace CSF.Zpt
1212
/// </remarks>
1313
public class SelfConfiguringLog4netTraceListener : Log4netTraceListener
1414
{
15+
/// <summary>
16+
/// Initializes a new instance of the <see cref="T:CSF.Zpt.SelfConfiguringLog4netTraceListener"/> class.
17+
/// </summary>
1518
public SelfConfiguringLog4netTraceListener() : base() {}
1619

20+
/// <summary>
21+
/// Initializes a new instance of the <see cref="T:CSF.Zpt.SelfConfiguringLog4netTraceListener"/> class.
22+
/// </summary>
23+
/// <param name="logger">Logger.</param>
1724
public SelfConfiguringLog4netTraceListener(log4net.ILog logger) : base(logger) {}
1825

26+
/// <summary>
27+
/// Initializes the <see cref="T:CSF.Zpt.SelfConfiguringLog4netTraceListener"/> class.
28+
/// </summary>
1929
static SelfConfiguringLog4netTraceListener()
2030
{
2131
log4net.Config.XmlConfigurator.Configure();

‎CSF.Zpt.Log4net/app.config.install.xdt‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0"?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<configSections xdt:Transform="InsertBefore(/configuration/*[1])" />
4+
<configSections xdt:Locator="XPath(/configuration/configSections[last()])">
5+
<section name="log4net"
6+
type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"
7+
xdt:Transform="InsertIfMissing"
8+
xdt:Locator="Match(name)" />
9+
</configSections>
10+
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
11+
12+
<log4net xdt:Transform="InsertIfMissing">
13+
<!--
14+
Here is a sample log4net configuration. Please review and customise this,
15+
referring to the documentation which is available at the URL below. Log4net
16+
is a powerful and feature-rich logging platform; the following configuration
17+
is an example of one of the simplest possible configurations available.
18+
19+
More information is available at:
20+
21+
https://logging.apache.org/log4net/release/manual/configuration.html
22+
23+
This sample configuration logs all messages (at the DEBUG level) from Zpt-Sharp
24+
and its plugins. It also records messages at the WARN level for any other
25+
sources which write to log4net. The log file itself is written to a file
26+
named MyApplication.log.
27+
28+
You may read more about logging ZPT-Sharp at:
29+
30+
http://csf-dev.github.io/ZPT-Sharp/logging.html
31+
32+
<root>
33+
<level value="WARN" />
34+
<appender-ref ref="FileAppender" />
35+
</root>
36+
<appender name="FileAppender" type="log4net.Appender.FileAppender">
37+
<file value="MyApplication.log" />
38+
<appendToFile value="false" />
39+
<layout type="log4net.Layout.PatternLayout">
40+
<conversionPattern value="[%-5level] [%logger] %message%n" />
41+
</layout>
42+
</appender>
43+
<logger name="CSF.Zpt">
44+
<level value="DEBUG" />
45+
</logger>
46+
-->
47+
</log4net>
48+
49+
<system.diagnostics xdt:Transform="InsertIfMissing" />
50+
51+
<system.diagnostics>
52+
<sources xdt:Transform="InsertIfMissing" />
53+
<switches xdt:Transform="InsertIfMissing" />
54+
<sharedListeners xdt:Transform="InsertIfMissing" />
55+
</system.diagnostics>
56+
57+
<system.diagnostics>
58+
<sources>
59+
<source name="CSF.Zpt"
60+
switchName="ZptLog4NetSwitch"
61+
switchType="System.Diagnostics.SourceSwitch"
62+
xdt:Transform="InsertIfMissing"
63+
xdt:Locator="Match(name)">
64+
<listeners>
65+
<add name="ZptLog4netListener" />
66+
<remove name="Default" />
67+
</listeners>
68+
</source>
69+
</sources>
70+
<switches>
71+
<add name="ZptLog4NetSwitch"
72+
value="Verbose"
73+
xdt:Transform="InsertIfMissing"
74+
xdt:Locator="Match(name)" />
75+
</switches>
76+
<sharedListeners>
77+
<add name="ZptLog4netListener"
78+
type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net"
79+
xdt:Transform="InsertIfMissing"
80+
xdt:Locator="Match(name)">
81+
<filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose"/>
82+
</add>
83+
</sharedListeners>
84+
</system.diagnostics>
85+
86+
</configuration>

‎CSF.Zpt.Log4net/app.config.uninstall.xdt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<system.diagnostics>
4+
<sources>
5+
<source name="CSF.Zpt"
6+
xdt:Transform="Remove"
7+
xdt:Locator="Match(name)" />
8+
</sources>
9+
<switches>
10+
<add name="ZptLog4NetSwitch"
11+
xdt:Transform="Remove"
12+
xdt:Locator="Match(name)" />
13+
</switches>
14+
<sharedListeners>
15+
<add name="ZptLog4netListener"
16+
xdt:Transform="Remove"
17+
xdt:Locator="Match(name)" />
18+
</sharedListeners>
19+
</system.diagnostics>
20+
</configuration>

‎CSF.Zpt.Log4net/web.config.install.xdt‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0"?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<configSections xdt:Transform="InsertBefore(/configuration/*[1])" />
4+
<configSections xdt:Locator="XPath(/configuration/configSections[last()])">
5+
<section name="log4net"
6+
type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"
7+
xdt:Transform="InsertIfMissing"
8+
xdt:Locator="Match(name)" />
9+
</configSections>
10+
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
11+
12+
<log4net xdt:Transform="InsertIfMissing">
13+
<!--
14+
Here is a sample log4net configuration. Please review and customise this,
15+
referring to the documentation which is available at the URL below. Log4net
16+
is a powerful and feature-rich logging platform; the following configuration
17+
is an example of one of the simplest possible configurations available.
18+
19+
More information is available at:
20+
21+
https://logging.apache.org/log4net/release/manual/configuration.html
22+
23+
This sample configuration logs all messages (at the DEBUG level) from Zpt-Sharp
24+
and its plugins. It also records messages at the WARN level for any other
25+
sources which write to log4net. The log file itself is written to a file
26+
named MyApplication.log.
27+
28+
You may read more about logging ZPT-Sharp at:
29+
30+
http://csf-dev.github.io/ZPT-Sharp/logging.html
31+
32+
<root>
33+
<level value="WARN" />
34+
<appender-ref ref="FileAppender" />
35+
</root>
36+
<appender name="FileAppender" type="log4net.Appender.FileAppender">
37+
<file value="MyApplication.log" />
38+
<appendToFile value="false" />
39+
<layout type="log4net.Layout.PatternLayout">
40+
<conversionPattern value="[%-5level] [%logger] %message%n" />
41+
</layout>
42+
</appender>
43+
<logger name="CSF.Zpt">
44+
<level value="DEBUG" />
45+
</logger>
46+
-->
47+
</log4net>
48+
49+
<system.diagnostics xdt:Transform="InsertIfMissing" />
50+
51+
<system.diagnostics>
52+
<sources xdt:Transform="InsertIfMissing" />
53+
<switches xdt:Transform="InsertIfMissing" />
54+
<sharedListeners xdt:Transform="InsertIfMissing" />
55+
</system.diagnostics>
56+
57+
<system.diagnostics>
58+
<sources>
59+
<source name="CSF.Zpt"
60+
switchName="ZptLog4NetSwitch"
61+
switchType="System.Diagnostics.SourceSwitch"
62+
xdt:Transform="InsertIfMissing"
63+
xdt:Locator="Match(name)">
64+
<listeners>
65+
<add name="ZptLog4netListener" />
66+
<remove name="Default" />
67+
</listeners>
68+
</source>
69+
</sources>
70+
<switches>
71+
<add name="ZptLog4NetSwitch"
72+
value="Verbose"
73+
xdt:Transform="InsertIfMissing"
74+
xdt:Locator="Match(name)" />
75+
</switches>
76+
<sharedListeners>
77+
<add name="ZptLog4netListener"
78+
type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net"
79+
xdt:Transform="InsertIfMissing"
80+
xdt:Locator="Match(name)">
81+
<filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose"/>
82+
</add>
83+
</sharedListeners>
84+
</system.diagnostics>
85+
86+
</configuration>

0 commit comments

Comments
 (0)