Merge pull request #70 from datalust/dev

5.1.1 Release
datalust · Sep 13, 2019 · 2daaed2 · 2daaed2
2 parents 42fec67 + cf85825
commit 2daaed2
Show file tree

Hide file tree

Showing 28 changed files with 596 additions and 177 deletions.
diff --git a/asset/getseq_net.ico b/asset/getseq_net.ico
diff --git a/example/SeqQuery/App.config b/example/SeqQuery/App.config
diff --git a/example/SeqQuery/Program.cs b/example/SeqQuery/Program.cs
@@ -32,7 +32,7 @@ static void Main(string[] args)
                     var server = arguments["<server>"].ToString();
                     var query = Normalize(arguments["<query>"]);
                     var apiKey = Normalize(arguments["--apikey"]);
-                    var @from = Normalize(arguments["--from"]);
+                    var from = Normalize(arguments["--from"]);
                     var to = Normalize(arguments["--to"]);
 
                     await Run(server, apiKey, query, from, to);

diff --git a/example/SeqQuery/SeqQuery.csproj b/example/SeqQuery/SeqQuery.csproj
@@ -6,10 +6,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Seq.Api\Seq.Api.csproj" />
   </ItemGroup>

diff --git a/example/SeqQuery/getseq_net.ico b/example/SeqQuery/getseq_net.ico
diff --git a/example/SeqTail/App.config b/example/SeqTail/App.config
diff --git a/example/SeqTail/Program.cs b/example/SeqTail/Program.cs
@@ -46,7 +46,7 @@ static void Main(string[] args)
                 Console.WriteLine("Tailing, press Ctrl+C to exit.");
                 Console.CancelKeyPress += (s,a) => cancel.Cancel();
 
-                var run = Task.Run(() => Run(server, apiKey, filter, cancel));
+                var run = Task.Run(() => Run(server, apiKey, filter, cancel), cancel.Token);
 
                 run.GetAwaiter().GetResult();
             }
@@ -78,8 +78,8 @@ static async Task Run(string server, string apiKey, string filter, CancellationT
             using (var stream = await connection.Events.StreamAsync<JObject>(filter: strict))
             {
                 var subscription = stream
-                    .Select(jObject => LogEventReader.ReadFromJObject(jObject))
-                    .Subscribe(evt => Log.Write(evt), () => cancel.Cancel());
+                    .Select(LogEventReader.ReadFromJObject)
+                    .Subscribe(Log.Write, cancel.Cancel);
 
                 cancel.Token.WaitHandle.WaitOne();
                 subscription.Dispose();

diff --git a/example/SeqTail/SeqTail.csproj b/example/SeqTail/SeqTail.csproj
@@ -6,10 +6,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Seq.Api\Seq.Api.csproj" />
   </ItemGroup>

diff --git a/example/SeqTail/getseq_net.ico b/example/SeqTail/getseq_net.ico
diff --git a/example/SignalCopy/App.config b/example/SignalCopy/App.config
diff --git a/example/SignalCopy/SignalCopy.csproj b/example/SignalCopy/SignalCopy.csproj
@@ -6,10 +6,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Seq.Api\Seq.Api.csproj" />
   </ItemGroup>

diff --git a/example/SignalCopy/getseq_net.ico b/example/SignalCopy/getseq_net.ico
diff --git a/seq-api.sln b/seq-api.sln
@@ -1,17 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.3
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29230.47
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B36BE973-6D5B-4DAA-BF42-F1CF11D6F18E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{1C66E116-DC21-4C8F-833E-A4C2DDF58487}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asset", "asset", "{233C7E7D-26DE-452A-A415-44F99CBA18E7}"
-	ProjectSection(SolutionItems) = preProject
-		asset\getseq_net.ico = asset\getseq_net.ico
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{7DCED657-7E83-4E6F-AB14-5753E044304D}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
@@ -69,4 +64,7 @@ Global
 		{42CEBFBA-208F-40F1-AC95-13F05F6D5412} = {1C66E116-DC21-4C8F-833E-A4C2DDF58487}
 		{E8CDDE17-8E29-4EB4-A4BB-38BCE346A752} = {1C66E116-DC21-4C8F-833E-A4C2DDF58487}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {20BAB483-FB94-4373-8E4C-0F846B6DBFFC}
+	EndGlobalSection
 EndGlobal
diff --git a/seq-api.sln.DotSettings b/seq-api.sln.DotSettings
@@ -1,2 +1,16 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Datalust/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=dstkey/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hrefs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Parameterize/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=permalinked/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=permalinks/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Permalinks/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reentrant/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=srckey/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unsubscriber/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Workspaces/@EntryIndexedValue">True</s:Boolean>
+</wpf:ResourceDictionary>