Skip to content

Commit 697c12c

Browse files
Merge pull request #50 from akkadotnet/dev
v1.3.6 Release
2 parents ce9cdec + dcbfdc5 commit 697c12c

30 files changed

+984
-213
lines changed

.gitignore

Lines changed: 116 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
# Custom
2+
tools/
3+
build/
4+
.nuget/
5+
.dotnet/
6+
.idea/
7+
.[Dd][Ss]_[Ss]tore
8+
19
## Ignore Visual Studio temporary files, build results, and
210
## files generated by popular Visual Studio add-ons.
11+
##
12+
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
313

414
# User-specific files
515
*.suo
@@ -17,17 +27,22 @@
1727
[Rr]eleases/
1828
x64/
1929
x86/
20-
build/
2130
bld/
2231
[Bb]in/
2332
[Oo]bj/
24-
.fake/
25-
TestResults/
26-
PerfResults/
27-
*.lock.json
33+
[Ll]og/
34+
35+
#FAKE
36+
.fake
37+
tools/
38+
39+
#DocFx output
40+
_site/
2841

29-
# Visual Studo 2015 cache/options directory
42+
# Visual Studio 2015 cache/options directory
3043
.vs/
44+
# Uncomment if you have tasks that create the project's static files in wwwroot
45+
#wwwroot/
3146

3247
# MSTest test Results
3348
[Tt]est[Rr]esult*/
@@ -42,6 +57,12 @@ TestResult.xml
4257
[Rr]eleasePS/
4358
dlldata.c
4459

60+
# .NET Core
61+
project.lock.json
62+
project.fragment.lock.json
63+
artifacts/
64+
**/Properties/launchSettings.json
65+
4566
*_i.c
4667
*_p.c
4768
*_i.h
@@ -74,14 +95,18 @@ _Chutzpah*
7495
ipch/
7596
*.aps
7697
*.ncb
98+
*.opendb
7799
*.opensdf
78100
*.sdf
79101
*.cachefile
102+
*.VC.db
103+
*.VC.VC.opendb
80104

81105
# Visual Studio profiler
82106
*.psess
83107
*.vsp
84108
*.vspx
109+
*.sap
85110

86111
# TFS 2012 Local Workspace
87112
$tf/
@@ -94,7 +119,7 @@ _ReSharper*/
94119
*.[Rr]e[Ss]harper
95120
*.DotSettings.user
96121

97-
# JustCode is a .NET coding addin-in
122+
# JustCode is a .NET coding add-in
98123
.JustCode
99124

100125
# TeamCity is a build add-in
@@ -103,9 +128,14 @@ _TeamCity*
103128
# DotCover is a Code Coverage Tool
104129
*.dotCover
105130

131+
# Visual Studio code coverage results
132+
*.coverage
133+
*.coveragexml
134+
106135
# NCrunch
107136
_NCrunch_*
108137
.*crunch*.local.xml
138+
nCrunchTemp_*
109139

110140
# MightyMoose
111141
*.mm.*
@@ -133,11 +163,16 @@ publish/
133163
# Publish Web Output
134164
*.[Pp]ublish.xml
135165
*.azurePubxml
136-
# TODO: Comment the next line if you want to checkin your web deploy settings
166+
# TODO: Comment the next line if you want to checkin your web deploy settings
137167
# but database connection strings (with potential passwords) will be unencrypted
138168
*.pubxml
139169
*.publishproj
140170

171+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
172+
# checkin your Azure Web App publish settings, but sensitive information contained
173+
# in these scripts will be unencrypted
174+
PublishScripts/
175+
141176
# NuGet Packages
142177
*.nupkg
143178
# The packages folder can be ignored because of Package Restore
@@ -146,26 +181,44 @@ publish/
146181
!**/packages/build/
147182
# Uncomment if necessary however generally it will be regenerated when needed
148183
#!**/packages/repositories.config
184+
# NuGet v3's project.json files produces more ignorable files
185+
*.nuget.props
186+
*.nuget.targets
149187

150-
# Windows Azure Build Output
188+
# Microsoft Azure Build Output
151189
csx/
152190
*.build.csdef
153191

154-
# Windows Store app package directory
192+
# Microsoft Azure Emulator
193+
ecf/
194+
rcf/
195+
196+
# Windows Store app package directories and files
155197
AppPackages/
198+
BundleArtifacts/
199+
Package.StoreAssociation.xml
200+
_pkginfo.txt
156201

157-
# Others
202+
# Visual Studio cache files
203+
# files ending in .cache can be ignored
158204
*.[Cc]ache
205+
# but keep track of directories ending in .cache
206+
!*.[Cc]ache/
207+
208+
# Others
159209
ClientBin/
160-
[Ss]tyle[Cc]op.*
161210
~$*
162211
*~
163212
*.dbmdl
164213
*.dbproj.schemaview
214+
*.jfm
165215
*.pfx
166216
*.publishsettings
167-
node_modules/
168-
bower_components/
217+
orleans.codegen.cs
218+
219+
# Since there are multiple workflows, uncomment next line to ignore bower_components
220+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
221+
#bower_components/
169222

170223
# RIA/Silverlight projects
171224
Generated_Code/
@@ -181,6 +234,7 @@ UpgradeLog*.htm
181234
# SQL Server files
182235
*.mdf
183236
*.ldf
237+
*.ndf
184238

185239
# Business Intelligence projects
186240
*.rdl.data
@@ -190,16 +244,60 @@ UpgradeLog*.htm
190244
# Microsoft Fakes
191245
FakesAssemblies/
192246

247+
# GhostDoc plugin setting file
248+
*.GhostDoc.xml
249+
193250
# Node.js Tools for Visual Studio
194251
.ntvs_analysis.dat
252+
node_modules/
253+
254+
# Typescript v1 declaration files
255+
typings/
195256

196257
# Visual Studio 6 build log
197258
*.plg
198259

199260
# Visual Studio 6 workspace options file
200261
*.opt
201262

202-
tools/
203-
build/
204-
.nuget/
205-
.dotnet/
263+
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
264+
*.vbw
265+
266+
# Visual Studio LightSwitch build output
267+
**/*.HTMLClient/GeneratedArtifacts
268+
**/*.DesktopClient/GeneratedArtifacts
269+
**/*.DesktopClient/ModelManifest.xml
270+
**/*.Server/GeneratedArtifacts
271+
**/*.Server/ModelManifest.xml
272+
_Pvt_Extensions
273+
274+
# Paket dependency manager
275+
.paket/paket.exe
276+
paket-files/
277+
278+
# FAKE - F# Make
279+
.fake/
280+
281+
# JetBrains Rider
282+
.idea/
283+
*.sln.iml
284+
285+
# CodeRush
286+
.cr/
287+
288+
# Python Tools for Visual Studio (PTVS)
289+
__pycache__/
290+
*.pyc
291+
292+
# Cake - Uncomment if you are using it
293+
# tools/**
294+
# !tools/packages.config
295+
296+
# Telerik's JustMock configuration file
297+
*.jmconfig
298+
299+
# BizTalk build output
300+
*.btp.cs
301+
*.btm.cs
302+
*.odx.cs
303+
*.xsd.cs

Akka.Logger.Serilog.sln

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27130.2027
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Logger.Serilog", "src\Akka.Logger.Serilog\Akka.Logger.Serilog.csproj", "{E945AABA-2779-41E8-9B43-8898FFD64F22}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Logger.Serilog.Tests", "src\Akka.Logger.Serilog.Tests\Akka.Logger.Serilog.Tests.csproj", "{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Logger.Serilog.Tests.Performance", "src\Akka.Logger.Serilog.Tests.Performance\Akka.Logger.Serilog.Tests.Performance.csproj", "{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{489D8D37-C3F7-477D-9AC7-12DA1621B2CE}"
13+
ProjectSection(SolutionItems) = preProject
14+
build.cmd = build.cmd
15+
build.fsx = build.fsx
16+
build.ps1 = build.ps1
17+
build.sh = build.sh
18+
EndProjectSection
19+
EndProject
20+
Global
21+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22+
Debug|Any CPU = Debug|Any CPU
23+
Release|Any CPU = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26+
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Release|Any CPU.Build.0 = Release|Any CPU
38+
EndGlobalSection
39+
GlobalSection(SolutionProperties) = preSolution
40+
HideSolutionNode = FALSE
41+
EndGlobalSection
42+
GlobalSection(ExtensibilityGlobals) = postSolution
43+
SolutionGuid = {6F6A6366-6F90-4FC6-8E46-861B3CB6C12B}
44+
EndGlobalSection
45+
EndGlobal

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright {yyyy} {name of copyright owner}
189+
Copyright 2014-2018 .NET Foundation
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

README.md

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,64 @@
1-
#### Akka.Logger.Serilog ####
2-
3-
This is the Serilog integration plugin for Akka.NET. Please check out our [documentation](http://getakka.net/articles/utilities/serilog.html) on how to get the most out of this plugin.
4-
5-
Targets Serilog 2.6.0
6-
1+
# Akka.Logger.Serilog
2+
3+
This is the Serilog integration plugin for Akka.NET. Please check out our [documentation](http://getakka.net/articles/utilities/serilog.html) on how to get the most out of this plugin.
4+
5+
Targets Serilog 2.6.0.
6+
7+
### Semantic Logging Syntax
8+
If you intend on using any of the Serilog semantic logging formats in your logging strings, __you need to use the SerilogLoggingAdapter__ inside your instrumented code or there could be elsewhere inside parts of your `ActorSystem`:
9+
10+
```csharp
11+
var log = Context.GetLogger<SerilogLoggingAdapter>(); // correct
12+
log.Info("My boss makes me use {semantic} logging", "semantic"); // serilog semantic logging format
13+
```
14+
15+
This will allow all logging events to be consumed anywhere inside the `ActorSystem`, including places like the Akka.NET TestKit, without throwing `FormatException`s when they encounter semantic logging syntax outside of the `SerilogLogger`.
16+
17+
## Building this solution
18+
To run the build script associated with this solution, execute the following:
19+
20+
**Windows**
21+
```
22+
c:\> build.cmd all
23+
```
24+
25+
**Linux / OS X**
26+
```
27+
c:\> build.sh all
28+
```
29+
30+
If you need any information on the supported commands, please execute the `build.[cmd|sh] help` command.
31+
32+
This build script is powered by [FAKE](https://fake.build/); please see their API documentation should you need to make any changes to the [`build.fsx`](build.fsx) file.
33+
34+
### Conventions
35+
The attached build script will automatically do the following based on the conventions of the project names added to this project:
36+
37+
* Any project name ending with `.Tests` will automatically be treated as a [XUnit2](https://xunit.github.io/) project and will be included during the test stages of this build script;
38+
* Any project name ending with `.Tests` will automatically be treated as a [NBench](https://github.com/petabridge/NBench) project and will be included during the test stages of this build script; and
39+
* Any project meeting neither of these conventions will be treated as a NuGet packaging target and its `.nupkg` file will automatically be placed in the `bin\nuget` folder upon running the `build.[cmd|sh] all` command.
40+
41+
### DocFx for Documentation
42+
This solution also supports [DocFx](http://dotnet.github.io/docfx/) for generating both API documentation and articles to describe the behavior, output, and usages of your project.
43+
44+
All of the relevant articles you wish to write should be added to the `/docs/articles/` folder and any API documentation you might need will also appear there.
45+
46+
All of the documentation will be statically generated and the output will be placed in the `/docs/_site/` folder.
47+
48+
#### Previewing Documentation
49+
To preview the documentation for this project, execute the following command at the root of this folder:
50+
51+
```
52+
C:\> serve-docs.cmd
53+
```
54+
55+
This will use the built-in `docfx.console` binary that is installed as part of the NuGet restore process from executing any of the usual `build.cmd` or `build.sh` steps to preview the fully-rendered documentation. For best results, do this immediately after calling `build.cmd buildRelease`.
56+
57+
### Release Notes, Version Numbers, Etc
58+
This project will automatically populate its release notes in all of its modules via the entries written inside [`RELEASE_NOTES.md`](RELEASE_NOTES.md) and will automatically update the versions of all assemblies and NuGet packages via the metadata included inside [`common.props`](src/common.props).
59+
60+
If you add any new projects to the solution created with this template, be sure to add the following line to each one of them in order to ensure that you can take advantage of `common.props` for standardization purposes:
61+
62+
```
63+
<Import Project="..\common.props" />
64+
```

0 commit comments

Comments
 (0)