diff --git a/nuget.config b/nuget.config
deleted file mode 100644
index 5645e58e..00000000
--- a/nuget.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/seqcli.sln b/seqcli.sln
index d0721e8b..d1af2409 100644
--- a/seqcli.sln
+++ b/seqcli.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{2EA56595-519
appveyor.yml = appveyor.yml
Build.ps1 = Build.ps1
LICENSE = LICENSE
- nuget.config = nuget.config
README.md = README.md
EndProjectSection
EndProject
diff --git a/src/SeqCli/Attribution/.NET Core License.txt b/src/SeqCli/Attribution/.NET Core License.txt
new file mode 100644
index 00000000..984713a4
--- /dev/null
+++ b/src/SeqCli/Attribution/.NET Core License.txt
@@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/SeqCli/Attribution/Json.NET License.txt b/src/SeqCli/Attribution/Json.NET License.txt
new file mode 100644
index 00000000..dfaadbe4
--- /dev/null
+++ b/src/SeqCli/Attribution/Json.NET License.txt
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/SeqCli/Attribution/System.Reactive License.txt b/src/SeqCli/Attribution/System.Reactive License.txt
new file mode 100644
index 00000000..f4146fff
--- /dev/null
+++ b/src/SeqCli/Attribution/System.Reactive License.txt
@@ -0,0 +1,14 @@
+Copyright (c) .NET Foundation and Contributors
+All Rights Reserved
+
+Licensed under the Apache License, Version 2.0 (the "License"); you
+may not use this file except in compliance with the License. You may
+obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing permissions
+and limitations under the License.
diff --git a/src/SeqCli/Cli/Features/OutputFormatFeature.cs b/src/SeqCli/Cli/Features/OutputFormatFeature.cs
index ca622f92..e483aacb 100644
--- a/src/SeqCli/Cli/Features/OutputFormatFeature.cs
+++ b/src/SeqCli/Cli/Features/OutputFormatFeature.cs
@@ -13,6 +13,7 @@
// limitations under the License.
using SeqCli.Config;
+using SeqCli.Output;
using Serilog;
using Serilog.Core;
using Serilog.Events;
@@ -45,7 +46,8 @@ public override void Enable(OptionSet options)
public Logger CreateOutputLogger()
{
var outputConfiguration = new LoggerConfiguration()
- .MinimumLevel.Is(LevelAlias.Minimum);
+ .MinimumLevel.Is(LevelAlias.Minimum)
+ .Enrich.With();
if (_json)
outputConfiguration.WriteTo.Console(new CompactJsonFormatter());
diff --git a/src/SeqCli/Output/RedundantEventTypeRemovalEnricher.cs b/src/SeqCli/Output/RedundantEventTypeRemovalEnricher.cs
new file mode 100644
index 00000000..fbd89010
--- /dev/null
+++ b/src/SeqCli/Output/RedundantEventTypeRemovalEnricher.cs
@@ -0,0 +1,27 @@
+// Copyright 2018 Datalust Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Serilog.Core;
+using Serilog.Events;
+
+namespace SeqCli.Output
+{
+ public class RedundantEventTypeRemovalEnricher : ILogEventEnricher
+ {
+ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+ {
+ logEvent.RemovePropertyIfPresent("@i");
+ }
+ }
+}
diff --git a/src/SeqCli/Program.cs b/src/SeqCli/Program.cs
index dd8c309d..668db97c 100644
--- a/src/SeqCli/Program.cs
+++ b/src/SeqCli/Program.cs
@@ -28,7 +28,7 @@ static async Task Main(string[] args)
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Error()
.WriteTo.Console(
- outputTemplate: "{Message:lj}{NewLine}",
+ outputTemplate: "{Message:lj}{NewLine}{Exception}",
standardErrorFromLevel: LevelAlias.Minimum)
.CreateLogger();
diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj
index 65e0c9f3..e0447852 100644
--- a/src/SeqCli/SeqCli.csproj
+++ b/src/SeqCli/SeqCli.csproj
@@ -13,10 +13,7 @@
-
- PreserveNewest
-
-
+
PreserveNewest
@@ -28,7 +25,6 @@
-