Skip to content

Commit fe0606b

Browse files
ghuntleyghuntley
authored
sertilog.sinks.xamarin is now maintained (#2)
serilog.sinks.xamarin is now maintained
1 parent 44dc6e1 commit fe0606b

18 files changed

+186
-109
lines changed

‎Build.ps1

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,17 @@ function Invoke-MSBuild($solution, $customLogger)
2424
{
2525
if ($customLogger)
2626
{
27-
msbuild "$solution" /verbosity:minimal /p:Configuration=Release /logger:"$customLogger"
27+
C:\PROGRA~2\MSBuild\14.0\Bin\amd64\msbuild "$solution" /verbosity:minimal /p:Configuration=Release /logger:"$customLogger"
2828
}
2929
else
3030
{
31-
msbuild "$solution" /verbosity:minimal /p:Configuration=Release
31+
C:\PROGRA~2\MSBuild\14.0\Bin\amd64\msbuild "$solution" /verbosity:minimal /p:Configuration=Release
3232
}
3333
}
3434

35-
function Invoke-NuGetPackProj($csproj)
36-
{
37-
nuget pack -Prop Configuration=Release -Symbols $csproj
38-
}
39-
40-
function Invoke-NuGetPackSpec($nuspec, $version)
41-
{
42-
nuget pack $nuspec -Version $version -OutputDirectory ..\..\
43-
}
44-
4535
function Invoke-NuGetPack($version)
4636
{
47-
ls src/**/*.csproj |
48-
Where-Object { -not ($_.Name -like "*net40*") } |
49-
ForEach-Object { Invoke-NuGetPackProj $_ }
37+
nuget pack "src\Serilog.Sinks.Xamarin.nuspec" -Version $version -OutputDirectory artifacts\
5038
}
5139

5240
function Invoke-Build($majorMinor, $patch, $customLogger, $notouch, $sln)
@@ -82,4 +70,4 @@ if (-not $sln)
8270
$sln = $slnfull.BaseName
8371
}
8472

85-
Invoke-Build $majorMinor $patch $customLogger $notouch $sln
73+
Invoke-Build $majorMinor $patch $customLogger $notouch $sln

‎README.md

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
1-
# Serilog.Sinks.Xamarin
1+
# Serilog.Sinks.Xamarin [![Build status](https://ci.appveyor.com/api/projects/status/8iy9owuib92gvtix?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-xamarin) [![Join the chat at https://gitter.im/serilog/serilog](https://img.shields.io/gitter/room/serilog/serilog.svg)](https://gitter.im/serilog/serilog)
22

3-
A Serilog sink that writes events to Xamarin mobile targets.
3+
Writes [Serilog](https://serilog.net) events to the console of Xamarin.iOS (NSLog) / Xamarin.Android (AndroidLog).
44

5-
**This sub-project needs an active maintainer.** Without an owner/owners who both have the knowledge and software licenses required to support Xamarin, we've been unable to move this forwards. Please raise an issue on the Serilog tracker if this is you :-)
5+
### Getting started
6+
7+
Install from [NuGet](https://nuget.org/packages/serilog.sinks.xamarin):
8+
9+
```powershell
10+
Install-Package Serilog.Sinks.Xamarin -Pre
11+
```
12+
13+
When using Xamarin.iOS
14+
15+
```csharp
16+
Log.Logger = new LoggerConfiguration()
17+
.WriteTo.NSLog();
18+
.CreateLogger()
19+
```
20+
21+
When using Xamarin.Android
22+
23+
24+
```csharp
25+
Log.Logger = new LoggerConfiguration()
26+
.WriteTo.AndroidLog();
27+
.CreateLogger()
28+
```
29+
30+
Within your portable class libary or within your application
31+
32+
```csharp
33+
Log.Information("This will be written to either NSLog or AndroidLog");
34+
35+
```
36+
37+
Because the memory buffer may contain events that have not yet been written to the target sink, it is important to call `Log.CloseAndFlush()` or `Logger.Dispose()` when the application/activity exits.
38+
39+
### About this sink
40+
41+
This sink is maintained by [Geoffrey Huntley](https://ghuntley.com/).

‎appveyor.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: '{build}'
2+
skip_tags: true
3+
image: Visual Studio 2015
4+
configuration: Release
5+
install:
6+
- ps: mkdir -Force ".\artifacts\" | Out-Null
7+
build_script:
8+
- ps: ./Build.ps1 -majorMinor 0.1 -patch "$env:APPVEYOR_BUILD_VERSION" -branch "$env:APPVEYOR_REPO_BRANCH"
9+
test: off
10+
artifacts:
11+
- path: artifacts/Serilog.*.nupkg
12+
deploy:
13+
- provider: NuGet
14+
api_key:
15+
secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
16+
skip_symbols: true
17+
on:
18+
branch: /^(master|dev)$/
19+
- provider: GitHub
20+
auth_token:
21+
secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
22+
artifact: /Serilog.*\.nupkg/
23+
tag: v$(appveyor_build_version)
24+
on:
25+
branch: master

‎artifacts/.gitkeep

Whitespace-only changes.

‎serilog-sinks-xamarin.sln

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Xamarin.Droid", "src\Serilog.Sinks.Xamarin.Droid\Serilog.Sinks.Xamarin.Droid.csproj", "{129D844D-273B-4E51-904B-2BD8169427DF}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Xamarin.iOS", "src\Serilog.Sinks.Xamarin.iOS\Serilog.Sinks.Xamarin.iOS.csproj", "{7E96D14B-2224-4EB9-B26B-6306D225024F}"
9+
EndProject
610
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{129D844D-273B-4E51-904B-2BD8169427DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{129D844D-273B-4E51-904B-2BD8169427DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{129D844D-273B-4E51-904B-2BD8169427DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{129D844D-273B-4E51-904B-2BD8169427DF}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{7E96D14B-2224-4EB9-B26B-6306D225024F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{7E96D14B-2224-4EB9-B26B-6306D225024F}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{7E96D14B-2224-4EB9-B26B-6306D225024F}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{7E96D14B-2224-4EB9-B26B-6306D225024F}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
725
GlobalSection(SolutionProperties) = preSolution
826
HideSolutionNode = FALSE
927
EndGlobalSection

‎src/Serilog.Sinks.MonoAndroid/Serilog.Sinks.MonoAndroid.nuspec

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

‎src/Serilog.Sinks.MonoTouch/Serilog.Sinks.MonoTouch.nuspec

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

‎src/Serilog.Sinks.MonoAndroid/LoggerConfigurationMonoAndroidExtensions.cs renamed to ‎src/Serilog.Sinks.Xamarin.Droid/LoggerConfigurationXamarinExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015 Serilog Contributors
1+
// Copyright 2016 Serilog Contributors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -16,15 +16,15 @@
1616
using Serilog.Configuration;
1717
using Serilog.Events;
1818
using Serilog.Formatting.Display;
19-
using Serilog.Sinks.MonoAndroid;
19+
using Serilog.Sinks.Xamarin;
2020

2121
namespace Serilog
2222
{
2323
/// <summary>
2424
/// Adds WriteTo.AndroidLog() to the logger configuration.
2525
/// </summary>
26-
public static class LoggerConfigurationMonoAndroidExtensions
27-
{
26+
public static class LoggerConfigurationXamarinExtensions
27+
{
2828
const string DefaultAndroidLogOutputTemplate = "[{Level}] {Message:l{NewLine:l}{Exception:l}";
2929

3030
/// <summary>

‎src/Serilog.Sinks.MonoAndroid/Properties/AssemblyInfo.cs renamed to ‎src/Serilog.Sinks.Xamarin.Droid/Properties/AssemblyInfo.cs

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

4-
[assembly: AssemblyTitle("Serilog.Sinks.MonoAndroid")]
5-
[assembly: AssemblyDescription("Serilog sink for MonoAndroid")]
6-
[assembly: AssemblyCopyright("Copyright © Serilog Contributors 2014")]
4+
[assembly: AssemblyTitle("Serilog.Sinks.Droid")]
5+
[assembly: AssemblyDescription("Serilog sink for Xamarin Android")]
6+
[assembly: AssemblyCopyright("Copyright © Serilog Contributors 2016")]
77
[assembly: AssemblyVersion("1.0.0.0")]
88
[assembly: AssemblyFileVersion("1.0.0.0")]
99

‎src/Serilog.Sinks.MonoAndroid/Serilog.Sinks.MonoAndroid.csproj renamed to ‎src/Serilog.Sinks.Xamarin.Droid/Serilog.Sinks.Xamarin.Droid.csproj

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>Serilog</RootNamespace>
13-
<AssemblyName>Serilog.Sinks.MonoAndroid</AssemblyName>
12+
<RootNamespace>Serilog.Sinks.Xamarin</RootNamespace>
13+
<AssemblyName>Serilog.Sinks.Xamarin.Droid</AssemblyName>
1414
<FileAlignment>512</FileAlignment>
1515
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1616
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
17-
<AndroidUseLatestPlatformSdk />
18-
<TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
17+
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
18+
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2121
<DebugSymbols>true</DebugSymbols>
@@ -33,30 +33,31 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36-
<DocumentationFile>bin\Release\Serilog.Sinks.MonoAndroid.xml</DocumentationFile>
36+
<DocumentationFile>bin\Release\Serilog.Sinks.Xamarin.Droid.xml</DocumentationFile>
3737
</PropertyGroup>
3838
<ItemGroup>
39+
<Reference Include="Microsoft.CSharp" />
3940
<Reference Include="Mono.Android" />
4041
<Reference Include="mscorlib" />
42+
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\Serilog.2.1.0\lib\netstandard1.3\Serilog.dll</HintPath>
44+
<Private>True</Private>
45+
</Reference>
4146
<Reference Include="System" />
4247
<Reference Include="System.Core" />
4348
</ItemGroup>
4449
<ItemGroup>
45-
<Compile Include="LoggerConfigurationMonoAndroidExtensions.cs" />
46-
<Compile Include="Sinks\MonoAndroid\AndroidLogSink.cs" />
50+
<Compile Include="LoggerConfigurationXamarinExtensions.cs" />
51+
<Compile Include="Sinks\Xamarin\AndroidLogSink.cs" />
4752
<Compile Include="Properties\AssemblyInfo.cs" />
4853
</ItemGroup>
4954
<ItemGroup>
50-
<None Include="Serilog.Sinks.MonoAndroid.nuspec">
55+
<None Include="packages.config" />
56+
<None Include="..\Serilog.Sinks.Xamarin.nuspec">
5157
<SubType>Designer</SubType>
5258
</None>
5359
</ItemGroup>
54-
<ItemGroup>
55-
<ProjectReference Include="..\Serilog\Serilog.csproj">
56-
<Project>{0915dbd9-0f7c-4439-8d9e-74c3d579b219}</Project>
57-
<Name>Serilog</Name>
58-
</ProjectReference>
59-
</ItemGroup>
60+
<ItemGroup />
6061
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
6162
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6263
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Serilog.Sinks.MonoAndroid/Sinks/MonoAndroid/AndroidLogSink.cs renamed to ‎src/Serilog.Sinks.Xamarin.Droid/Sinks/Xamarin/AndroidLogSink.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using Serilog.Formatting;
2222
using AndroidLog = Android.Util.Log;
2323

24-
namespace Serilog.Sinks.MonoAndroid
24+
namespace Serilog.Sinks.Xamarin
2525
{
2626
/// <summary>
2727
/// Writes events to <see cref="AndroidLog"/>.

‎src/Serilog.Sinks.Xamarin.Droid/packages.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.CSharp" version="4.0.1" targetFramework="monoandroid23" />
4+
<package id="Serilog" version="2.1.0" targetFramework="monoandroid23" />
5+
<package id="System.Collections" version="4.0.11" targetFramework="monoandroid23" />
6+
<package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="monoandroid23" />
7+
<package id="System.Globalization" version="4.0.11" targetFramework="monoandroid23" />
8+
<package id="System.Linq" version="4.1.0" targetFramework="monoandroid23" />
9+
<package id="System.Reflection" version="4.1.0" targetFramework="monoandroid23" />
10+
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid23" />
11+
<package id="System.Runtime" version="4.1.0" targetFramework="monoandroid23" />
12+
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid23" />
13+
<package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="monoandroid23" />
14+
<package id="System.Threading" version="4.0.11" targetFramework="monoandroid23" />
15+
</packages>

‎src/Serilog.Sinks.MonoTouch/LoggerConfigurationMonoTouchExtensions.cs renamed to ‎src/Serilog.Sinks.Xamarin.iOS/LoggerConfigurationXamarinExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015 Serilog Contributors
1+
// Copyright 2016 Serilog Contributors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -16,15 +16,15 @@
1616
using Serilog.Configuration;
1717
using Serilog.Events;
1818
using Serilog.Formatting.Display;
19-
using Serilog.Sinks.MonoTouch;
19+
using Serilog.Sinks.Xamarin;
2020

2121
namespace Serilog
2222
{
2323
/// <summary>
2424
/// Adds WriteTo.NSLog() to the logger configuration.
2525
/// </summary>
26-
public static class LoggerConfigurationMonoTouchExtensions
27-
{
26+
public static class LoggerConfigurationXamarinExtensions
27+
{
2828
const string DefaultNSLogOutputTemplate = "[{Level}] {Message:l{NewLine:l}{Exception:l}";
2929

3030
/// <summary>

‎src/Serilog.Sinks.MonoTouch/Properties/AssemblyInfo.cs renamed to ‎src/Serilog.Sinks.Xamarin.iOS/Properties/AssemblyInfo.cs

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

4-
[assembly: AssemblyTitle("Serilog.Sinks.MonoTouch")]
5-
[assembly: AssemblyDescription("Serilog sink for MonoTouch")]
6-
[assembly: AssemblyCopyright("Copyright © Serilog Contributors 2014")]
4+
[assembly: AssemblyTitle("Serilog.Sinks.iOS")]
5+
[assembly: AssemblyDescription("Serilog sink for Xamarin iOS")]
6+
[assembly: AssemblyCopyright("Copyright © Serilog Contributors 2016")]
77
[assembly: AssemblyVersion("1.0.0.0")]
88
[assembly: AssemblyFileVersion("1.0.0.0")]
99

0 commit comments

Comments
 (0)