Merge pull request #38 from datalust/dev

4.0.0 Release
datalust · May 16, 2017 · e6041ce · e6041ce
2 parents cb81556 + c01a218
commit e6041ce
Show file tree

Hide file tree

Showing 52 changed files with 404 additions and 458 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,13 +1,8 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2015
+image: Visual Studio 2017
 configuration: Release
 install:
-  - ps: mkdir -Force ".\build\" | Out-Null
-  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
-  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
-  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
-  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 build_script:
 - ps: ./Build.ps1
 test: off

diff --git a/example/SeqQuery/SeqQuery.csproj b/example/SeqQuery/SeqQuery.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
+    <AssemblyName>seq-query</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>SeqQuery</PackageId>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Seq.Api\Seq.Api.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="docopt.net" Version="0.6.1.9" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/example/SeqQuery/project.json b/example/SeqQuery/project.json
diff --git a/example/SeqQuery/seq-query.xproj b/example/SeqQuery/seq-query.xproj
diff --git a/example/SeqTail/SeqTail.csproj b/example/SeqTail/SeqTail.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
+    <AssemblyName>seq-tail</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>SeqTail</PackageId>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Seq.Api\Seq.Api.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
+    <PackageReference Include="docopt.net" Version="0.6.1.9" />
+    <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="1.0.0-dev-00008" />
+    <PackageReference Include="Serilog.Sinks.Literate" Version="2.0.0" />
+    <PackageReference Include="System.Reactive" Version="3.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/example/SeqTail/project.json b/example/SeqTail/project.json
diff --git a/example/SeqTail/seq-tail.xproj b/example/SeqTail/seq-tail.xproj
diff --git a/example/SignalCopy/SignalCopy.csproj b/example/SignalCopy/SignalCopy.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
+    <AssemblyName>signal-copy</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>SignalCopy</PackageId>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Seq.Api\Seq.Api.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="docopt.net" Version="0.6.1.9" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/example/SignalCopy/project.json b/example/SignalCopy/project.json
diff --git a/example/SignalCopy/signal-copy.xproj b/example/SignalCopy/signal-copy.xproj
diff --git a/global.json b/global.json
diff --git a/seq-api.sln b/seq-api.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B36BE973-6D5B-4DAA-BF42-F1CF11D6F18E}"
 EndProject
@@ -16,22 +16,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{7DCED6
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
-		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5E7A565B-A8EE-43E7-A225-5B640A5D29A0}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Seq.Api", "src\Seq.Api\Seq.Api.xproj", "{D4E037DE-9778-4E48-A4A7-E8C1751E637C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seq.Api", "src\Seq.Api\Seq.Api.csproj", "{D4E037DE-9778-4E48-A4A7-E8C1751E637C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Seq.Api.Tests", "test\Seq.Api.Tests\Seq.Api.Tests.xproj", "{CD473266-4AED-4207-89FD-0B185239F1C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seq.Api.Tests", "test\Seq.Api.Tests\Seq.Api.Tests.csproj", "{CD473266-4AED-4207-89FD-0B185239F1C7}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "seq-query", "example\SeqQuery\seq-query.xproj", "{34BBD428-8297-484E-B771-0B72C172C264}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SeqQuery", "example\SeqQuery\SeqQuery.csproj", "{34BBD428-8297-484E-B771-0B72C172C264}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "seq-tail", "example\SeqTail\seq-tail.xproj", "{42CEBFBA-208F-40F1-AC95-13F05F6D5412}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SeqTail", "example\SeqTail\SeqTail.csproj", "{42CEBFBA-208F-40F1-AC95-13F05F6D5412}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "signal-copy", "example\SignalCopy\signal-copy.xproj", "{E8CDDE17-8E29-4EB4-A4BB-38BCE346A752}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalCopy", "example\SignalCopy\SignalCopy.csproj", "{E8CDDE17-8E29-4EB4-A4BB-38BCE346A752}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Seq.Api/Api/Client/SeqApiClient.cs b/src/Seq.Api/Api/Client/SeqApiClient.cs
@@ -26,7 +26,7 @@ public class SeqApiClient : IDisposable
         // Future versions of Seq may not completely support v1 features, however
         // providing this as an Accept header will ensure what compatibility is available
         // can be utilised.
-        const string SeqApiV3MediaType = "application/vnd.continuousit.seq.v3+json";
+        const string SeqApiV4MediaType = "application/vnd.continuousit.seq.v4+json";
 
         readonly HttpClient _httpClient;
         readonly CookieContainer _cookies = new CookieContainer();
@@ -38,9 +38,7 @@ public class SeqApiClient : IDisposable
 
         public SeqApiClient(string serverUrl, string apiKey = null)
         {
-            if (serverUrl == null) throw new ArgumentNullException(nameof(serverUrl));
-
-            ServerUrl = serverUrl;
+            ServerUrl = serverUrl ?? throw new ArgumentNullException(nameof(serverUrl));
 
             if (!string.IsNullOrEmpty(apiKey))
                 _apiKey = apiKey;
@@ -172,7 +170,7 @@ async Task<Stream> HttpSendAsync(HttpRequestMessage request)
             if (_apiKey != null)
                 request.Headers.Add("X-Seq-ApiKey", _apiKey);
 
-            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(SeqApiV3MediaType));
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(SeqApiV4MediaType));
 
             var response = await _httpClient.SendAsync(request).ConfigureAwait(false);
             var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);

diff --git a/src/Seq.Api/Api/Model/Apps/AppEntity.cs b/src/Seq.Api/Api/Model/Apps/AppEntity.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Seq.Api.Model.Apps
 {
@@ -7,16 +8,20 @@ public class AppEntity : Entity
         public AppEntity()
         {
             Name = "New App";
+#pragma warning disable CS0618 // Type or member is obsolete
             AssemblyNames = new List<string>();
             AvailableSettings = new List<AppSettingPart>();
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         public string Name { get; set; }
 
         public string Description { get; set; }
 
+        [Obsolete("Packages must be installed via a feed.")]
         public string MainReactorTypeName { get; set; }
 
+        [Obsolete("Packages must be installed via a feed.")]
         public List<string> AssemblyNames { get; set; }
 
         public List<AppSettingPart> AvailableSettings { get; set; }

diff --git a/src/Seq.Api/Api/Model/Apps/AppPackagePart.cs b/src/Seq.Api/Api/Model/Apps/AppPackagePart.cs
@@ -8,5 +8,6 @@ public class AppPackagePart
         public string Authors { get; set; }
         public string IconUrl { get; set; }
         public string LicenseUrl { get; set; }
+        public bool UpdateAvailable { get; set; }
     }
 }
diff --git a/src/Seq.Api/Api/Model/Data/QueryExecutionStatisticsPart.cs b/src/Seq.Api/Api/Model/Data/QueryExecutionStatisticsPart.cs
@@ -1,4 +1,4 @@
-namespace Seq.Api.Data
+namespace Seq.Api.Model.Data
 {
     public class QueryExecutionStatisticsPart
     {

diff --git a/src/Seq.Api/Api/Model/Data/QueryResultPart.cs b/src/Seq.Api/Api/Model/Data/QueryResultPart.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Seq.Api.Data
+namespace Seq.Api.Model.Data
 {
     public class QueryResultPart
     {

diff --git a/src/Seq.Api/Api/Model/Data/TimeSlicePart.cs b/src/Seq.Api/Api/Model/Data/TimeSlicePart.cs
@@ -1,4 +1,4 @@
-namespace Seq.Api.Data
+namespace Seq.Api.Model.Data
 {
     public class TimeSlicePart
     {