Skip to content

Commit d3c7dac

Browse files
committed
Merge branch 'master' of github.com:exceptionless/Exceptionless.Net into deduplication
2 parents dbefc6b + 0883777 commit d3c7dac

File tree

4 files changed

+11
-15
lines changed

4 files changed

+11
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Exceptionless .NET Clients
22
[![Build status](https://ci.appveyor.com/api/projects/status/xk17pk0u7a5r7yrw/branch/master?svg=true)](https://ci.appveyor.com/project/Exceptionless/exceptionless-net)
3-
[![NuGet Version](http://img.shields.io/nuget/v/Exceptionless.Portable.svg?style=flat)](https://www.nuget.org/packages/Exceptionless.Portable/) [![NuGet Downloads](http://img.shields.io/nuget/dt/Exceptionless.Portable.svg?style=flat)](https://www.nuget.org/packages/Exceptionless.Portable/)
3+
[![NuGet Version](http://img.shields.io/nuget/v/Exceptionless.Portable.svg?style=flat)](https://www.nuget.org/packages/Exceptionless.Portable/)
44
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/exceptionless/Discuss)
55
[![Donate](https://img.shields.io/badge/donorbox-donate-blue.svg)](https://donorbox.org/exceptionless)
66

Source/Samples/SampleConsole/Program.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,18 @@
1010
using Exceptionless.Helpers;
1111
using Exceptionless.Logging;
1212
using Exceptionless.Models;
13-
using Exceptionless.NLog;
1413
using Exceptionless.SampleConsole.Plugins;
1514
using log4net;
1615
using log4net.Config;
1716
using NLog;
18-
using NLog.Fluent;
1917
using LogLevel = Exceptionless.Logging.LogLevel;
20-
using LogManager = log4net.LogManager;
2118

2219
namespace SampleConsole {
2320
internal class Program {
2421
private static readonly int[] _delays = { 0, 50, 100, 1000 };
2522
private static int _delayIndex = 2;
2623
private static readonly InMemoryExceptionlessLog _log = new InMemoryExceptionlessLog { MinimumLogLevel = LogLevel.Info };
2724
private static readonly object _writeLock = new object();
28-
private static readonly ILog _log4net = LogManager.GetLogger(typeof(Program));
2925

3026
private static readonly TimeSpan[] _dateSpans = {
3127
TimeSpan.Zero,

Source/Shared/Dependency/TinyIoC.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ public RegisterOptions(TinyIoCContainer container, TypeRegistration registration
943943
/// Make registration a singleton (single instance) if possible
944944
/// </summary>
945945
/// <returns>RegisterOptions</returns>
946-
/// <exception cref="TinyIoCInstantiationTypeException"></exception>
946+
/// <exception cref="TinyIoCRegistrationException"></exception>
947947
public RegisterOptions AsSingleton()
948948
{
949949
var currentFactory = _Container.GetCurrentFactory(_Registration);
@@ -958,7 +958,7 @@ public RegisterOptions AsSingleton()
958958
/// Make registration multi-instance if possible
959959
/// </summary>
960960
/// <returns>RegisterOptions</returns>
961-
/// <exception cref="TinyIoCInstantiationTypeException"></exception>
961+
/// <exception cref="TinyIoCRegistrationException"></exception>
962962
public RegisterOptions AsMultiInstance()
963963
{
964964
var currentFactory = _Container.GetCurrentFactory(_Registration);
@@ -973,7 +973,7 @@ public RegisterOptions AsMultiInstance()
973973
/// Make registration hold a weak reference if possible
974974
/// </summary>
975975
/// <returns>RegisterOptions</returns>
976-
/// <exception cref="TinyIoCInstantiationTypeException"></exception>
976+
/// <exception cref="TinyIoCRegistrationException"></exception>
977977
public RegisterOptions WithWeakReference()
978978
{
979979
var currentFactory = _Container.GetCurrentFactory(_Registration);
@@ -988,7 +988,7 @@ public RegisterOptions WithWeakReference()
988988
/// Make registration hold a strong reference if possible
989989
/// </summary>
990990
/// <returns>RegisterOptions</returns>
991-
/// <exception cref="TinyIoCInstantiationTypeException"></exception>
991+
/// <exception cref="TinyIoCRegistrationException"></exception>
992992
public RegisterOptions WithStrongReference()
993993
{
994994
var currentFactory = _Container.GetCurrentFactory(_Registration);
@@ -1072,7 +1072,7 @@ public MultiRegisterOptions(IEnumerable<RegisterOptions> registerOptions)
10721072
/// Make registration a singleton (single instance) if possible
10731073
/// </summary>
10741074
/// <returns>RegisterOptions</returns>
1075-
/// <exception cref="TinyIoCInstantiationTypeException"></exception>
1075+
/// <exception cref="TinyIoCRegistrationException"></exception>
10761076
public MultiRegisterOptions AsSingleton()
10771077
{
10781078
_RegisterOptions = ExecuteOnAllRegisterOptions(ro => ro.AsSingleton());
@@ -1083,7 +1083,7 @@ public MultiRegisterOptions AsSingleton()
10831083
/// Make registration multi-instance if possible
10841084
/// </summary>
10851085
/// <returns>MultiRegisterOptions</returns>
1086-
/// <exception cref="TinyIoCInstantiationTypeException"></exception>
1086+
/// <exception cref="TinyIoCRegistrationException"></exception>
10871087
public MultiRegisterOptions AsMultiInstance()
10881088
{
10891089
_RegisterOptions = ExecuteOnAllRegisterOptions(ro => ro.AsMultiInstance());
@@ -1372,7 +1372,7 @@ public RegisterOptions Register(Type registerType, Func<TinyIoCContainer, NamedP
13721372
/// <summary>
13731373
/// Creates/replaces a container class registration with default options.
13741374
/// </summary>
1375-
/// <typeparam name="RegisterImplementation">Type to register</typeparam>
1375+
/// <typeparam name="RegisterType">Type to register</typeparam>
13761376
/// <returns>RegisterOptions for fluent API</returns>
13771377
public RegisterOptions Register<RegisterType>()
13781378
where RegisterType : class
@@ -1383,7 +1383,7 @@ public RegisterOptions Register<RegisterType>()
13831383
/// <summary>
13841384
/// Creates/replaces a named container class registration with default options.
13851385
/// </summary>
1386-
/// <typeparam name="RegisterImplementation">Type to register</typeparam>
1386+
/// <typeparam name="RegisterType">Type to register</typeparam>
13871387
/// <param name="name">Name of registration</param>
13881388
/// <returns>RegisterOptions for fluent API</returns>
13891389
public RegisterOptions Register<RegisterType>(string name)

Source/Tests/Plugins/PluginTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public void ErrorPlugin_IgnoredProperties() {
324324
Assert.NotNull(error);
325325
Assert.True(error.Data.ContainsKey(Error.KnownDataKeys.ExtraProperties));
326326
var json = error.Data[Error.KnownDataKeys.ExtraProperties] as string;
327-
Assert.Equal("{\"ignored_property\":\"Test\",\"random_value\":\"Test\"}", json);
327+
Assert.Equal("{\"IgnoredProperty\":\"Test\",\"RandomValue\":\"Test\"}", json);
328328

329329
client.Configuration.AddDataExclusions("Ignore*");
330330
context = new EventPluginContext(client, new Event());
@@ -335,7 +335,7 @@ public void ErrorPlugin_IgnoredProperties() {
335335
Assert.NotNull(error);
336336
Assert.True(error.Data.ContainsKey(Error.KnownDataKeys.ExtraProperties));
337337
json = error.Data[Error.KnownDataKeys.ExtraProperties] as string;
338-
Assert.Equal("{\"random_value\":\"Test\"}", json);
338+
Assert.Equal("{\"RandomValue\":\"Test\"}", json);
339339
}
340340
}
341341

0 commit comments

Comments
 (0)