Skip to content

Commit b08dbcc

Browse files
jvzjvz
authored
Merge pull request #61 from fluffynuts/add-source-build-artifact
include source zip in release process
2 parents ce1b9fb + 7eb91b4 commit b08dbcc

File tree

4 files changed

+58
-47
lines changed

4 files changed

+58
-47
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎build-with-docker-for-windows.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docker run -v %~dp0%:C:\dev -v %USERPROFILE%\.nuget\packages:C:\packages -t davydm/net-build-tools:vs2019 "npm ci; npm run build"
1+
docker run -v %~dp0%:C:\dev -v %USERPROFILE%\.nuget\packages:C:\packages -t davydm/net-build-tools:vs2019 "npm ci && npm run build"

‎local-tasks/zip.js‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,41 @@ const
22
gulp = requireModule("gulp-with-help"),
33
promisify = requireModule("promisify-stream"),
44
readNuspecVersion = requireModule("read-nuspec-version"),
5+
target = "build/artifacts",
56
zip = require("gulp-zip");
67

7-
gulp.task("zip", async () => {
8-
const version = await readNuspecVersion("log4net.nuspec");
8+
gulp.task("zip", [ "zip-binaries", "zip-source"], () => Promise.resolve());
9+
10+
gulp.task("zip-binaries", async () => {
11+
const version = await readVersion();
912
return promisify(
1013
gulp.src("build/Release/**/*")
1114
.pipe(zip(`log4net-binaries-${version}.zip`))
12-
.pipe(gulp.dest("build/artifacts"))
15+
.pipe(gulp.dest(target))
1316
);
14-
});
17+
});
18+
19+
gulp.task("zip-source", async () => {
20+
const version = await readVersion();
21+
return promisify(
22+
gulp.src([
23+
"**/*",
24+
"!**/obj/**/*",
25+
"!**/bin/**/*",
26+
"!node_modules",
27+
"!node_modules/**/*",
28+
"!build-tools",
29+
"!build-tools/**/*",
30+
"!build",
31+
"!build/**/*",
32+
"!.idea",
33+
"!.idea/**/*"
34+
])
35+
.pipe(zip(`log4net-source-${version}.zip`))
36+
.pipe(gulp.dest(target))
37+
);
38+
});
39+
40+
function readVersion() {
41+
return readNuspecVersion("log4net.nuspec");
42+
}

‎src/log4net/log4net.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,7 +2399,7 @@
23992399
</value>
24002400
<remarks>
24012401
<para>
2402-
The default encoding set is <see cref="!:System.Text.Encoding.Default"/>
2402+
The default encoding set is <see cref="P:System.Text.Encoding.Default"/>
24032403
which is the encoding for the system's current ANSI code page.
24042404
</para>
24052405
</remarks>
@@ -7191,9 +7191,9 @@
71917191
If set the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> property takes priority over the
71927192
<see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> property. The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> property
71937193
specifies a path to a file to load the config from. The path is relative to the
7194-
application's base directory; <see cref="!:AppDomain.BaseDirectory"/>.
7194+
application's base directory; <see cref="P:System.AppDomain.BaseDirectory"/>.
71957195
The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> property is used as a postfix to the assembly file name.
7196-
The config file must be located in the application's base directory; <see cref="!:AppDomain.BaseDirectory"/>.
7196+
The config file must be located in the application's base directory; <see cref="P:System.AppDomain.BaseDirectory"/>.
71977197
For example in a console application setting the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> to
71987198
<c>config</c> has the same effect as not specifying the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> or
71997199
<see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> properties.
@@ -7241,7 +7241,7 @@
72417241
<para>
72427242
If specified, this is the name of the configuration file to use with
72437243
the <see cref="T:log4net.Config.XmlConfigurator"/>. This file path is relative to the
7244-
<b>application base</b> directory (<see cref="!:AppDomain.BaseDirectory"/>).
7244+
<b>application base</b> directory (<see cref="P:System.AppDomain.BaseDirectory"/>).
72457245
</para>
72467246
<para>
72477247
The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> takes priority over the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/>.
@@ -7259,7 +7259,7 @@
72597259
<para>
72607260
If specified this is the extension for the configuration file.
72617261
The path to the config file is built by using the <b>application
7262-
base</b> directory (<see cref="!:AppDomain.BaseDirectory"/>),
7262+
base</b> directory (<see cref="P:System.AppDomain.BaseDirectory"/>),
72637263
the <b>assembly file name</b> and the config file extension.
72647264
</para>
72657265
<para>
@@ -9568,7 +9568,7 @@
95689568
</summary>
95699569
<remarks>
95709570
<para>
9571-
This type extends <see cref="!:ApplicationException"/>. It
9571+
This type extends <see cref="T:System.ApplicationException"/>. It
95729572
does not add any new functionality but does differentiate the
95739573
type of exception being thrown.
95749574
</para>
@@ -10104,13 +10104,13 @@
1010410104
</member>
1010510105
<member name="M:log4net.Core.LoggerManager.OnDomainUnload(System.Object,System.EventArgs)">
1010610106
<summary>
10107-
Called when the <see cref="!:AppDomain.DomainUnload"/> event fires
10107+
Called when the <see cref="E:System.AppDomain.DomainUnload"/> event fires
1010810108
</summary>
10109-
<param name="sender">the <see cref="!:AppDomain"/> that is exiting</param>
10109+
<param name="sender">the <see cref="T:System.AppDomain"/> that is exiting</param>
1011010110
<param name="e">null</param>
1011110111
<remarks>
1011210112
<para>
10113-
Called when the <see cref="!:AppDomain.DomainUnload"/> event fires.
10113+
Called when the <see cref="E:System.AppDomain.DomainUnload"/> event fires.
1011410114
</para>
1011510115
<para>
1011610116
When the event is triggered the log4net system is <see cref="M:Shutdown()"/>.
@@ -10119,13 +10119,13 @@
1011910119
</member>
1012010120
<member name="M:log4net.Core.LoggerManager.OnProcessExit(System.Object,System.EventArgs)">
1012110121
<summary>
10122-
Called when the <see cref="!:AppDomain.ProcessExit"/> event fires
10122+
Called when the <see cref="E:System.AppDomain.ProcessExit"/> event fires
1012310123
</summary>
10124-
<param name="sender">the <see cref="!:AppDomain"/> that is exiting</param>
10124+
<param name="sender">the <see cref="T:System.AppDomain"/> that is exiting</param>
1012510125
<param name="e">null</param>
1012610126
<remarks>
1012710127
<para>
10128-
Called when the <see cref="!:AppDomain.ProcessExit"/> event fires.
10128+
Called when the <see cref="E:System.AppDomain.ProcessExit"/> event fires.
1012910129
</para>
1013010130
<para>
1013110131
When the event is triggered the log4net system is <see cref="M:Shutdown()"/>.
@@ -17281,8 +17281,8 @@
1728117281
Format the <see cref="T:log4net.Core.LoggingEvent"/> and write it to the <see cref="T:System.IO.TextWriter"/>.
1728217282
</para>
1728317283
<para>
17284-
This method creates an <see cref="!:XmlTextWriter"/> that writes to the
17285-
<paramref name="writer"/>. The <see cref="!:XmlTextWriter"/> is passed
17284+
This method creates an <see cref="T:System.Xml.XmlTextWriter"/> that writes to the
17285+
<paramref name="writer"/>. The <see cref="T:System.Xml.XmlTextWriter"/> is passed
1728617286
to the <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method. Subclasses should override the
1728717287
<see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method rather than this method.
1728817288
</para>
@@ -17408,7 +17408,7 @@
1740817408
<para>
1740917409
The <see cref="!:System.Runtime.Remoting.Messaging.CallContext"/> requires a link time
1741017410
<see cref="!:System.Security.Permissions.SecurityPermission"/> for the
17411-
<see cref="!:System.Security.Permissions.SecurityPermissionFlag.Infrastructure"/>.
17411+
<see cref="F:System.Security.Permissions.SecurityPermissionFlag.Infrastructure"/>.
1741217412
If the calling code does not have this permission then this context will be disabled.
1741317413
It will not store any property values set on it.
1741417414
</para>
@@ -20389,7 +20389,7 @@
2038920389
the string key to optimize comparisons.
2039020390
</para>
2039120391
<note>
20392-
The Compact Framework 1.0 the <see cref="!:String.Intern"/>
20392+
The Compact Framework 1.0 the <see cref="M:System.String.Intern(System.String)"/>
2039320393
method does not work. On the Compact Framework
2039420394
the string keys are not interned nor are they
2039520395
compared by reference.
@@ -23737,7 +23737,7 @@
2373723737
<para>
2373823738
The <see cref="!:CallContext"/> requires a link time
2373923739
<see cref="!:System.Security.Permissions.SecurityPermission"/> for the
23740-
<see cref="!:System.Security.Permissions.SecurityPermissionFlag.Infrastructure"/>.
23740+
<see cref="F:System.Security.Permissions.SecurityPermissionFlag.Infrastructure"/>.
2374123741
If the calling code does not have this permission then this context will be disabled.
2374223742
It will not store any property values set on it.
2374323743
</para>
@@ -27244,12 +27244,12 @@
2724427244
</member>
2724527245
<member name="P:log4net.Util.SystemInfo.ApplicationBaseDirectory">
2724627246
<summary>
27247-
Gets the base directory for this <see cref="!:AppDomain"/>.
27247+
Gets the base directory for this <see cref="T:System.AppDomain"/>.
2724827248
</summary>
27249-
<value>The base directory path for the current <see cref="!:AppDomain"/>.</value>
27249+
<value>The base directory path for the current <see cref="T:System.AppDomain"/>.</value>
2725027250
<remarks>
2725127251
<para>
27252-
Gets the base directory for this <see cref="!:AppDomain"/>.
27252+
Gets the base directory for this <see cref="T:System.AppDomain"/>.
2725327253
</para>
2725427254
<para>
2725527255
The value returned may be either a local file path or a URI.
@@ -27258,9 +27258,9 @@
2725827258
</member>
2725927259
<member name="P:log4net.Util.SystemInfo.ConfigurationFileLocation">
2726027260
<summary>
27261-
Gets the path to the configuration file for the current <see cref="!:AppDomain"/>.
27261+
Gets the path to the configuration file for the current <see cref="T:System.AppDomain"/>.
2726227262
</summary>
27263-
<value>The path to the configuration file for the current <see cref="!:AppDomain"/>.</value>
27263+
<value>The path to the configuration file for the current <see cref="T:System.AppDomain"/>.</value>
2726427264
<remarks>
2726527265
<para>
2726627266
The .NET Compact Framework 1.0 does not have a concept of a configuration
@@ -27274,12 +27274,12 @@
2727427274
</member>
2727527275
<member name="P:log4net.Util.SystemInfo.EntryAssemblyLocation">
2727627276
<summary>
27277-
Gets the path to the file that first executed in the current <see cref="!:AppDomain"/>.
27277+
Gets the path to the file that first executed in the current <see cref="T:System.AppDomain"/>.
2727827278
</summary>
2727927279
<value>The path to the entry assembly.</value>
2728027280
<remarks>
2728127281
<para>
27282-
Gets the path to the file that first executed in the current <see cref="!:AppDomain"/>.
27282+
Gets the path to the file that first executed in the current <see cref="T:System.AppDomain"/>.
2728327283
</para>
2728427284
</remarks>
2728527285
</member>
@@ -28399,7 +28399,7 @@
2839928399
</summary>
2840028400
<remarks>
2840128401
<para>
28402-
This type extends <see cref="!:ApplicationException"/>. It
28402+
This type extends <see cref="T:System.ApplicationException"/>. It
2840328403
does not add any new functionality but does differentiate the
2840428404
type of exception being thrown.
2840528405
</para>

0 commit comments

Comments
 (0)