diff --git a/.gitignore b/.gitignore
index 7964536..f1e3d20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,26 +4,34 @@
# User-specific files
*.suo
*.user
+*.userosscache
*.sln.docstates
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
+[Rr]eleases/
x64/
-build/
+x86/
bld/
[Bb]in/
[Oo]bj/
+[Ll]og/
-# Roslyn cache directories
-*.ide/
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
-#NUNIT
+# NUNIT
*.VisualState.xml
TestResult.xml
@@ -32,6 +40,10 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c
+# DNX
+project.lock.json
+artifacts/
+
*_i.c
*_p.c
*_i.h
@@ -64,14 +76,18 @@ _Chutzpah*
ipch/
*.aps
*.ncb
+*.opendb
*.opensdf
*.sdf
*.cachefile
+*.VC.db
+*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
+*.sap
# TFS 2012 Local Workspace
$tf/
@@ -84,7 +100,7 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
-# JustCode is a .NET coding addin-in
+# JustCode is a .NET coding add-in
.JustCode
# TeamCity is a build add-in
@@ -96,6 +112,7 @@ _TeamCity*
# NCrunch
_NCrunch_*
.*crunch*.local.xml
+nCrunchTemp_*
# MightyMoose
*.mm.*
@@ -123,35 +140,50 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-#*.pubxml
-
-# NuGet Packages Directory
-packages/*
-## TODO: If the tool you use requires repositories.config
-## uncomment the next line
-#!packages/repositories.config
-
-# Enable "build/" folder in the NuGet Packages folder since
-# NuGet packages use it for MSBuild targets.
-# This line needs to be after the ignore of the build folder
-# (and the packages folder if the line above has been uncommented)
-!packages/build/
-
-# Windows Azure Build Output
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
csx/
*.build.csdef
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
# Others
-sql/
-*.Cache
ClientBin/
-[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
@@ -159,6 +191,11 @@ ClientBin/
*.pfx
*.publishsettings
node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
# RIA/Silverlight projects
Generated_Code/
@@ -183,7 +220,33 @@ UpgradeLog*.htm
# Microsoft Fakes
FakesAssemblies/
-# LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
\ No newline at end of file
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
diff --git a/Build.ps1 b/Build.ps1
new file mode 100644
index 0000000..d782ff9
--- /dev/null
+++ b/Build.ps1
@@ -0,0 +1,53 @@
+# This script originally (c) 2016 Serilog Contributors - license Apache 2.0
+
+echo "build: Build started"
+
+Push-Location $PSScriptRoot
+
+if(Test-Path .\artifacts) {
+ echo "build: Cleaning .\artifacts"
+ Remove-Item .\artifacts -Force -Recurse
+}
+
+& dotnet restore --no-cache
+
+$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
+$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
+$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"]
+
+echo "build: Version suffix is $suffix"
+
+foreach ($src in ls src/*) {
+ Push-Location $src
+
+ echo "build: Packaging project in $src"
+
+ & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
+ if($LASTEXITCODE -ne 0) { exit 1 }
+
+ Pop-Location
+}
+
+foreach ($test in ls test/*.Benchmarks) {
+ Push-Location $test
+
+ echo "build: Building performance test project in $test"
+
+ & dotnet build -c Release
+ if($LASTEXITCODE -ne 0) { exit 2 }
+
+ Pop-Location
+}
+
+foreach ($test in ls test/*.Tests) {
+ Push-Location $test
+
+ echo "build: Testing project in $test"
+
+ & dotnet test -c Release
+ if($LASTEXITCODE -ne 0) { exit 3 }
+
+ Pop-Location
+}
+
+Pop-Location
diff --git a/appveyor.yml b/appveyor.yml
index 49607a8..73801aa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,21 +1,29 @@
-version: 3.3.{build}
+version: '{build}'
+skip_tags: true
+image: Visual Studio 2015
configuration: Release
-assembly_info:
- patch: true
- file: '**\AssemblyInfo.*'
- assembly_version: 2.0.0.0
- assembly_file_version: '{version}.0'
- assembly_informational_version: '{version}'
-before_build:
-- cmd: nuget restore
-build:
- publish_nuget: true
- publish_nuget_symbols: true
- verbosity: minimal
+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
+artifacts:
+- path: artifacts/Seq.Api.*.nupkg
deploy:
- provider: NuGet
api_key:
- secure: owIruqEXZlFwqcSBYyjR19/8EodS+aXFzZmBwqlaYnDE/uy1X+KsuI5QH3p9iBmx
- skip_symbols: false
+ secure: 7AS4wbHVs08D6so0JGAVczexCX9ST6CRbNToHZC08rtPqkQENpyNhhSAIX0FShzh
+ skip_symbols: true
+ on:
+ branch: /^(master|dev)$/
+- provider: GitHub
+ auth_token:
+ secure: hX+cZmW+9BCXy7vyH8myWsYdtQHyzzil9K5yvjJv7dK9XmyrGYYDj/DPzMqsXSjo
+ artifact: /Seq.Api.*\.nupkg/
+ tag: v$(appveyor_build_version)
on:
branch: master
diff --git a/example/SeqQuery/packages.config b/example/SeqQuery/packages.config
deleted file mode 100644
index c51d4bd..0000000
--- a/example/SeqQuery/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/example/SeqQuery/project.json b/example/SeqQuery/project.json
new file mode 100644
index 0000000..3ec11f7
--- /dev/null
+++ b/example/SeqQuery/project.json
@@ -0,0 +1,28 @@
+{
+ "version": "1.0.0-*",
+ "buildOptions": {
+ "emitEntryPoint": true,
+ "outputName": "seq-query"
+ },
+
+ "dependencies": {
+ "Seq.Api": { "target": "project" },
+ "docopt.net": "0.6.1.9"
+ },
+
+ "frameworks": {
+ "net4.6": {},
+ "netcoreapp1.0": {
+ "dependencies": {
+ "Microsoft.NETCore.App": {
+ "type": "platform",
+ "version": "1.0.0"
+ }
+ },
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ]
+ }
+ }
+}
diff --git a/example/SeqQuery/seq-query.csproj b/example/SeqQuery/seq-query.csproj
deleted file mode 100644
index 5794b97..0000000
--- a/example/SeqQuery/seq-query.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {546B990E-9659-47F7-ACD8-EBB4948DA430}
- Exe
- Properties
- SeqQuery
- seq-query
- v4.5
- 512
- bb1828c1
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- getseq_net.ico
-
-
-
- ..\..\packages\docopt.net.0.6.1.6\lib\net40\DocoptNet.dll
-
-
-
-
-
- ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll
- True
-
-
- ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {077b5e8a-611b-4ca9-be59-5454092d21fe}
- Seq.Api
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
\ No newline at end of file
diff --git a/example/SeqQuery/seq-query.xproj b/example/SeqQuery/seq-query.xproj
new file mode 100644
index 0000000..a1222c2
--- /dev/null
+++ b/example/SeqQuery/seq-query.xproj
@@ -0,0 +1,19 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 34bbd428-8297-484e-b771-0b72c172c264
+ SeqQuery
+ .\obj
+ .\bin\
+ v4.5.2
+
+
+ 2.0
+
+
+
\ No newline at end of file
diff --git a/example/SeqTail/packages.config b/example/SeqTail/packages.config
deleted file mode 100644
index c51d4bd..0000000
--- a/example/SeqTail/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/example/SeqTail/project.json b/example/SeqTail/project.json
new file mode 100644
index 0000000..3a5ff21
--- /dev/null
+++ b/example/SeqTail/project.json
@@ -0,0 +1,30 @@
+{
+ "version": "1.0.0-*",
+ "buildOptions": {
+ "emitEntryPoint": true,
+ "outputName": "seq-tail"
+ },
+
+ "dependencies": {
+ "Seq.Api": { "target": "project" },
+ "docopt.net": "0.6.1.9"
+ },
+
+ "frameworks": {
+ "net4.6": {},
+ "netcoreapp1.0": {
+ "dependencies": {
+ "Microsoft.NETCore.App": {
+ "type": "platform",
+ "version": "1.0.0"
+ }
+ },
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ]
+ }
+ },
+
+ "runtimes": { "win": {} }
+}
diff --git a/example/SeqTail/seq-tail.csproj b/example/SeqTail/seq-tail.csproj
deleted file mode 100644
index 52fb909..0000000
--- a/example/SeqTail/seq-tail.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {905AF63F-05F6-4293-AE30-DC9FE8B243E7}
- Exe
- Properties
- SeqTail
- seq-tail
- v4.5
- 512
- bb1828c1
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- getseq_net.ico
-
-
-
- ..\..\packages\docopt.net.0.6.1.6\lib\net40\DocoptNet.dll
-
-
-
-
-
- ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll
- True
-
-
- ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {077b5e8a-611b-4ca9-be59-5454092d21fe}
- Seq.Api
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
\ No newline at end of file
diff --git a/example/SeqTail/seq-tail.xproj b/example/SeqTail/seq-tail.xproj
new file mode 100644
index 0000000..68617d0
--- /dev/null
+++ b/example/SeqTail/seq-tail.xproj
@@ -0,0 +1,19 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 42cebfba-208f-40f1-ac95-13f05f6d5412
+ SeqTail
+ .\obj
+ .\bin\
+ v4.5.2
+
+
+ 2.0
+
+
+
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..e793049
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+ "projects": [ "src", "test" ],
+ "sdk": {
+ "version": "1.0.0-preview2-003121"
+ }
+}
diff --git a/seq-api.sln b/seq-api.sln
index 8ea60ca..81a43d5 100644
--- a/seq-api.sln
+++ b/seq-api.sln
@@ -5,24 +5,31 @@ VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B36BE973-6D5B-4DAA-BF42-F1CF11D6F18E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Seq.Api", "src\Seq.Api\Seq.Api.csproj", "{077B5E8A-611B-4CA9-BE59-5454092D21FE}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{1C66E116-DC21-4C8F-833E-A4C2DDF58487}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "seq-tail", "example\SeqTail\seq-tail.csproj", "{905AF63F-05F6-4293-AE30-DC9FE8B243E7}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asset", "asset", "{233C7E7D-26DE-452A-A415-44F99CBA18E7}"
ProjectSection(SolutionItems) = preProject
- appveyor.yml = appveyor.yml
asset\getseq_net.ico = asset\getseq_net.ico
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{7DCED657-7E83-4E6F-AB14-5753E044304D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{7DCED657-7E83-4E6F-AB14-5753E044304D}"
ProjectSection(SolutionItems) = preProject
+ appveyor.yml = appveyor.yml
+ Build.ps1 = Build.ps1
+ global.json = global.json
+ LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "seq-query", "example\SeqQuery\seq-query.csproj", "{546B990E-9659-47F7-ACD8-EBB4948DA430}"
+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}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Seq.Api.Tests", "test\Seq.Api.Tests\Seq.Api.Tests.xproj", "{CD473266-4AED-4207-89FD-0B185239F1C7}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "seq-query", "example\SeqQuery\seq-query.xproj", "{34BBD428-8297-484E-B771-0B72C172C264}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "seq-tail", "example\SeqTail\seq-tail.xproj", "{42CEBFBA-208F-40F1-AC95-13F05F6D5412}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,25 +37,30 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {077B5E8A-611B-4CA9-BE59-5454092D21FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {077B5E8A-611B-4CA9-BE59-5454092D21FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {077B5E8A-611B-4CA9-BE59-5454092D21FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {077B5E8A-611B-4CA9-BE59-5454092D21FE}.Release|Any CPU.Build.0 = Release|Any CPU
- {905AF63F-05F6-4293-AE30-DC9FE8B243E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {905AF63F-05F6-4293-AE30-DC9FE8B243E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {905AF63F-05F6-4293-AE30-DC9FE8B243E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {905AF63F-05F6-4293-AE30-DC9FE8B243E7}.Release|Any CPU.Build.0 = Release|Any CPU
- {546B990E-9659-47F7-ACD8-EBB4948DA430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {546B990E-9659-47F7-ACD8-EBB4948DA430}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {546B990E-9659-47F7-ACD8-EBB4948DA430}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {546B990E-9659-47F7-ACD8-EBB4948DA430}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D4E037DE-9778-4E48-A4A7-E8C1751E637C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D4E037DE-9778-4E48-A4A7-E8C1751E637C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D4E037DE-9778-4E48-A4A7-E8C1751E637C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D4E037DE-9778-4E48-A4A7-E8C1751E637C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CD473266-4AED-4207-89FD-0B185239F1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CD473266-4AED-4207-89FD-0B185239F1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CD473266-4AED-4207-89FD-0B185239F1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CD473266-4AED-4207-89FD-0B185239F1C7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {34BBD428-8297-484E-B771-0B72C172C264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {34BBD428-8297-484E-B771-0B72C172C264}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {34BBD428-8297-484E-B771-0B72C172C264}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {34BBD428-8297-484E-B771-0B72C172C264}.Release|Any CPU.Build.0 = Release|Any CPU
+ {42CEBFBA-208F-40F1-AC95-13F05F6D5412}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {42CEBFBA-208F-40F1-AC95-13F05F6D5412}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {42CEBFBA-208F-40F1-AC95-13F05F6D5412}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {42CEBFBA-208F-40F1-AC95-13F05F6D5412}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {077B5E8A-611B-4CA9-BE59-5454092D21FE} = {B36BE973-6D5B-4DAA-BF42-F1CF11D6F18E}
- {905AF63F-05F6-4293-AE30-DC9FE8B243E7} = {1C66E116-DC21-4C8F-833E-A4C2DDF58487}
- {546B990E-9659-47F7-ACD8-EBB4948DA430} = {1C66E116-DC21-4C8F-833E-A4C2DDF58487}
+ {D4E037DE-9778-4E48-A4A7-E8C1751E637C} = {B36BE973-6D5B-4DAA-BF42-F1CF11D6F18E}
+ {CD473266-4AED-4207-89FD-0B185239F1C7} = {5E7A565B-A8EE-43E7-A225-5B640A5D29A0}
+ {34BBD428-8297-484E-B771-0B72C172C264} = {1C66E116-DC21-4C8F-833E-A4C2DDF58487}
+ {42CEBFBA-208F-40F1-AC95-13F05F6D5412} = {1C66E116-DC21-4C8F-833E-A4C2DDF58487}
EndGlobalSection
EndGlobal
diff --git a/src/Seq.Api/Seq.Api.nuspec b/src/Seq.Api/Seq.Api.nuspec
deleted file mode 100644
index 31a91dd..0000000
--- a/src/Seq.Api/Seq.Api.nuspec
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- Seq.Api
- $version$
- Continuous IT Pty Ltd
- Client library for the Seq HTTP API.
- en-US
- https://getseq.net
- http://getseq.net/images/seq-nuget.png
- seq api
-
-
diff --git a/src/Seq.Api/Seq.Api.xproj b/src/Seq.Api/Seq.Api.xproj
new file mode 100644
index 0000000..def013e
--- /dev/null
+++ b/src/Seq.Api/Seq.Api.xproj
@@ -0,0 +1,21 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+
+ d4e037de-9778-4e48-a4a7-e8c1751e637c
+ Superpower
+ .\obj
+ .\bin\
+ v4.5.2
+
+
+
+ 2.0
+
+
+
diff --git a/src/Seq.Api/packages.config b/src/Seq.Api/packages.config
deleted file mode 100644
index 68a0a6e..0000000
--- a/src/Seq.Api/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Seq.Api/project.json b/src/Seq.Api/project.json
new file mode 100644
index 0000000..6435e19
--- /dev/null
+++ b/src/Seq.Api/project.json
@@ -0,0 +1,52 @@
+{
+ "version": "3.4.0-*",
+
+ "description": "Client library for the Seq HTTP API.",
+ "authors": [ "Datalust", "Contributors" ],
+
+ "packOptions": {
+ "tags": [ "seq"],
+ "projectUrl": "https://github.com/datalust/seq-api",
+ "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+ "iconUrl": "https://getseq.net/images/seq-nuget.pngg"
+ },
+
+ "buildOptions": {
+ "warningsAsErrors": true
+ },
+
+ "configurations": {
+ "Debug": {
+ "buildOptions": {
+ "define": [ "DEBUG", "TRACE" ]
+ }
+ },
+ "Release": {
+ "buildOptions": {
+ "define": [ "RELEASE", "TRACE" ],
+ "optimize": true
+ }
+ }
+ },
+
+ "dependencies": {
+ "NETStandard.Library": "1.6.0",
+ "Newtonsoft.Json": "9.0.1",
+ "Tavis.UriTemplates": "1.1.0"
+ },
+
+ "frameworks": {
+ "netstandard1.3": {
+ "dependencies": {
+ "System.Collections.Concurrent": "4.0.12",
+ "System.Net.Http": "4.1.0"
+ }
+ },
+ "net4.5": {
+ "frameworkAssemblies": {
+ "System.Collections.Concurrent": "",
+ "System.Net.Http": ""
+ }
+ }
+ }
+}
diff --git a/test/Seq.Api.Tests/Properties/AssemblyInfo.cs b/test/Seq.Api.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..083fd7a
--- /dev/null
+++ b/test/Seq.Api.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,15 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Seq.Api.Tests")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
diff --git a/test/Seq.Api.Tests/Seq.Api.Tests.xproj b/test/Seq.Api.Tests/Seq.Api.Tests.xproj
new file mode 100644
index 0000000..eeae732
--- /dev/null
+++ b/test/Seq.Api.Tests/Seq.Api.Tests.xproj
@@ -0,0 +1,22 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ cd473266-4aed-4207-89fd-0b185239f1c7
+ Superpower.Tests
+ .\obj
+ .\bin\
+ v4.5.2
+
+
+ 2.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/Seq.Api.Tests/project.json b/test/Seq.Api.Tests/project.json
new file mode 100644
index 0000000..0c65901
--- /dev/null
+++ b/test/Seq.Api.Tests/project.json
@@ -0,0 +1,25 @@
+{
+ "testRunner": "xunit",
+
+ "dependencies": {
+ "Seq.Api": { "target": "project" },
+ "xunit": "2.1.0",
+ "dotnet-test-xunit": "1.0.0-rc2-build10025"
+ },
+
+ "frameworks": {
+ "netcoreapp1.0": {
+ "dependencies": {
+ "Microsoft.NETCore.App": {
+ "type": "platform",
+ "version": "1.0.0"
+ }
+ },
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ]
+ },
+ "net4.6": {}
+ }
+}