diff --git a/Build.ps1 b/Build.ps1
index 0515652..1694abc 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -11,7 +11,7 @@ $suffix = @{ $true = ""; $false = "$branch-$revision"}[$branch -eq "master" -and
foreach ($src in ls src/Serilog.*) {
Push-Location $src
- & dotnet pack -c Release -o ..\..\.\artifacts --version-suffix=$suffix
+ & dotnet pack -c Release -o ..\..\.\artifacts --version-suffix=$suffix --include-source
if($LASTEXITCODE -ne 0) { exit 1 }
Pop-Location
diff --git a/appveyor.yml b/appveyor.yml
index 078620b..1f1176f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,9 +4,9 @@ image: Visual Studio 2015
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: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/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: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script:
- ps: ./Build.ps1
diff --git a/global.json b/global.json
deleted file mode 100644
index a2b2a41..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "projects": [ "src", "test" ],
- "sdk": {
- "version": "1.0.0-preview2-003121"
- }
-}
diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
new file mode 100644
index 0000000..b0f7124
--- /dev/null
+++ b/sample/Sample/Sample.csproj
@@ -0,0 +1,30 @@
+
+
+
+ Sample Console Application
+ nblumhardt
+ netcoreapp1.0
+ Sample
+ Exe
+ Sample
+ $(PackageTargetFallback);dnxcore50;portable-net45+win8
+ 1.0.4
+ false
+ false
+ false
+ false
+ false
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sample/Sample/Sample.xproj b/sample/Sample/Sample.xproj
deleted file mode 100644
index 617a599..0000000
--- a/sample/Sample/Sample.xproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- 17497155-5d94-45df-81d9-bd960e8cf217
- Sample
- .\obj
- .\bin\
-
-
-
- 2.0
-
-
-
diff --git a/sample/Sample/project.json b/sample/Sample/project.json
deleted file mode 100644
index 0fac48a..0000000
--- a/sample/Sample/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "version": "1.0.0-*",
- "description": "Sample Console Application",
- "authors": [ "nblumhardt" ],
- "buildOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "Serilog.Sinks.Seq": {"target": "project"},
- "Serilog.Sinks.Literate": "2.0.0"
- },
- "frameworks": {
- "net4.5.2": {},
- "netcoreapp1.0": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.0"
- }
- },
- "imports": [
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/serilog-sinks-seq.sln b/serilog-sinks-seq.sln
index 3e78202..63b63f9 100644
--- a/serilog-sinks-seq.sln
+++ b/serilog-sinks-seq.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}"
EndProject
@@ -10,20 +10,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
Build.ps1 = Build.ps1
- global.json = global.json
README.md = README.md
assets\Serilog.snk = assets\Serilog.snk
EndProjectSection
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Seq", "src\Serilog.Sinks.Seq\Serilog.Sinks.Seq.xproj", "{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{88A3ECD1-D91A-49A2-A6D7-5A70973A0E3F}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample", "sample\Sample\Sample.xproj", "{17497155-5D94-45DF-81D9-BD960E8CF217}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{67B1C971-75EE-4ABE-B184-66AAC8D9D572}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Seq.Tests", "test\Serilog.Sinks.Seq.Tests\Serilog.Sinks.Seq.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Seq", "src\Serilog.Sinks.Seq\Serilog.Sinks.Seq.csproj", "{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "sample\Sample\Sample.csproj", "{17497155-5D94-45DF-81D9-BD960E8CF217}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Seq.Tests", "test\Serilog.Sinks.Seq.Tests\Serilog.Sinks.Seq.Tests.csproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Serilog.Sinks.Seq/Properties/AssemblyInfo.cs b/src/Serilog.Sinks.Seq/Properties/AssemblyInfo.cs
index 8d71860..040a264 100644
--- a/src/Serilog.Sinks.Seq/Properties/AssemblyInfo.cs
+++ b/src/Serilog.Sinks.Seq/Properties/AssemblyInfo.cs
@@ -1,9 +1,8 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: AssemblyTitle("Serilog.Sinks.Seq")]
-[assembly: AssemblyDescription("Serilog sink for Seq Events")]
-[assembly: AssemblyCopyright("Copyright © Serilog Contributors 2013-2016")]
+[assembly: AssemblyVersion("3.0.0.0")]
+
[assembly: InternalsVisibleTo("Serilog.Sinks.Seq.Tests, PublicKey=" +
"0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +
"6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9" +
diff --git a/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.csproj b/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.csproj
new file mode 100644
index 0000000..d266604
--- /dev/null
+++ b/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.csproj
@@ -0,0 +1,50 @@
+
+
+
+ Serilog sink that writes to the Seq log server over HTTP/HTTPS.
+ 3.3.0
+ Serilog Contributors
+ Copyright © Serilog Contributors 2013-2017
+ netstandard1.1;netstandard1.3;net45;net46
+ true
+ true
+ Serilog.Sinks.Seq
+ ../../assets/Serilog.snk
+ true
+ true
+ Serilog.Sinks.Seq
+ serilog;seq
+ https://serilog.net/images/serilog-sink-seq-nuget.png
+ https://github.com/serilog/serilog-sinks-seq
+ http://www.apache.org/licenses/LICENSE-2.0
+ false
+
+
+
+ $(DefineConstants);DURABLE;THREADING_TIMER
+
+
+
+ $(DefineConstants);DURABLE;THREADING_TIMER;HRESULTS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.xproj b/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.xproj
deleted file mode 100644
index 8b1b04f..0000000
--- a/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- d8a74f4c-981b-41f1-b807-fe08dfcc06d4
- Serilog
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Serilog.Sinks.Seq/Sinks/Seq/SeqSink.cs b/src/Serilog.Sinks.Seq/Sinks/Seq/SeqSink.cs
index 0c92eae..4f08be6 100644
--- a/src/Serilog.Sinks.Seq/Sinks/Seq/SeqSink.cs
+++ b/src/Serilog.Sinks.Seq/Sinks/Seq/SeqSink.cs
@@ -43,7 +43,7 @@ class SeqSink : PeriodicBatchingSink
readonly bool _useCompactFormat;
DateTime _nextRequiredLevelCheckUtc = DateTime.UtcNow.Add(RequiredLevelCheckInterval);
- ControlledLevelSwitch _controlledSwitch;
+ readonly ControlledLevelSwitch _controlledSwitch;
public SeqSink(
string serverUrl,
diff --git a/src/Serilog.Sinks.Seq/project.json b/src/Serilog.Sinks.Seq/project.json
deleted file mode 100644
index 638713c..0000000
--- a/src/Serilog.Sinks.Seq/project.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "version": "3.2.0-*",
- "description": "Serilog sink that writes to the Seq log server over HTTP/S.",
- "authors": [ "Serilog Contributors" ],
- "packOptions": {
- "tags": [ "serilog", "seq" ],
- "projectUrl": "https://github.com/serilog/serilog-sinks-seq",
- "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
- "iconUrl": "http://serilog.net/images/serilog-sink-seq-nuget.png"
- },
- "dependencies": {
- "Serilog": "2.3.0",
- "Serilog.Sinks.PeriodicBatching": "2.1.0",
- "Serilog.Formatting.Compact": "1.0.0"
- },
- "buildOptions": {
- "keyFile": "../../assets/Serilog.snk",
- "warningsAsErrors": true,
- "xmlDoc": true
- },
- "frameworks": {
- "net4.5": {
- "buildOptions": {
- "define": [ "DURABLE", "THREADING_TIMER", "HRESULTS" ]
- },
- "frameworkAssemblies": {
- "System.Net.Http": ""
- },
- "dependencies": {
- "Serilog.Sinks.File": "3.2.0",
- "Serilog.Sinks.RollingFile": "3.3.0"
- }
- },
- "netstandard1.1": {
- "dependencies": {
- "System.Net.Http": "4.1.0"
- }
- },
- "netstandard1.3": {
- "buildOptions": {
- "define": [ "DURABLE", "THREADING_TIMER" ]
- },
- "dependencies": {
- "System.Net.Http": "4.1.0",
- "Serilog.Sinks.File": "3.2.0",
- "Serilog.Sinks.RollingFile": "3.3.0",
- "System.Threading.Timer": "4.0.1"
- }
- }
- }
-}
diff --git a/test/Serilog.Sinks.Seq.Tests/Serilog.Sinks.Seq.Tests.csproj b/test/Serilog.Sinks.Seq.Tests/Serilog.Sinks.Seq.Tests.csproj
new file mode 100644
index 0000000..92aaa06
--- /dev/null
+++ b/test/Serilog.Sinks.Seq.Tests/Serilog.Sinks.Seq.Tests.csproj
@@ -0,0 +1,32 @@
+
+
+ netcoreapp1.0;net452;net46
+ Serilog.Sinks.Seq.Tests
+ ../../assets/Serilog.snk
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Serilog.Sinks.Seq.Tests/Serilog.Sinks.Seq.Tests.xproj b/test/Serilog.Sinks.Seq.Tests/Serilog.Sinks.Seq.Tests.xproj
deleted file mode 100644
index e4dda7c..0000000
--- a/test/Serilog.Sinks.Seq.Tests/Serilog.Sinks.Seq.Tests.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 3c2d8e01-5580-426a-bdd9-ec59cd98e618
- Serilog.Sinks.Seq.Tests
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/test/Serilog.Sinks.Seq.Tests/project.json b/test/Serilog.Sinks.Seq.Tests/project.json
deleted file mode 100644
index 9b32e3f..0000000
--- a/test/Serilog.Sinks.Seq.Tests/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "testRunner": "xunit",
- "dependencies": {
- "Serilog.Sinks.Seq": { "target": "project" },
- "xunit": "2.1.0",
- "dotnet-test-xunit": "1.0.0-rc2-build10025",
- "Newtonsoft.Json": "8.0.3"
- },
- "buildOptions": {
- "keyFile": "../../assets/Serilog.snk",
- "warningsAsErrors": true
- },
- "frameworks": {
- "net4.5.2": { },
- "netcoreapp1.0": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.0"
- }
- },
- "imports": [
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}