diff --git a/appveyor.yml b/appveyor.yml
index 078620b..4409040 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.3'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script:
- ps: ./Build.ps1
diff --git a/global.json b/global.json
index a2b2a41..2fc780b 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,5 @@
{
- "projects": [ "src", "test" ],
"sdk": {
- "version": "1.0.0-preview2-003121"
+ "version": "1.0.3"
}
-}
+}
\ No newline at end of file
diff --git a/samples/Sample/Sample.csproj b/samples/Sample/Sample.csproj
new file mode 100644
index 0000000..7f5eabb
--- /dev/null
+++ b/samples/Sample/Sample.csproj
@@ -0,0 +1,28 @@
+
+
+
+ net46;netcoreapp1.0
+ Sample
+ Exe
+ Sample
+ 1.0.4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/Sample/Sample.xproj b/samples/Sample/Sample.xproj
deleted file mode 100644
index 632d81f..0000000
--- a/samples/Sample/Sample.xproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 65357fbc-9bc4-466d-b621-1c3a19bc2a78
- Sample
- .\obj
- .\bin\
-
-
-
\ No newline at end of file
diff --git a/samples/Sample/project.json b/samples/Sample/project.json
deleted file mode 100644
index 03cc49a..0000000
--- a/samples/Sample/project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "buildOptions": {
- "emitEntryPoint": true
- },
- "dependencies": {
- "Serilog.Extensions.Logging": { "target": "project" },
- "Serilog.Sinks.Literate": "2.0.0",
- "Microsoft.Extensions.Logging": "1.0.0"
- },
-
- "frameworks": {
- "net4.6": {},
- "netcoreapp1.0": {
- "define": [ "ASYNCLOCAL" ],
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.0"
- }
- },
- "imports": [
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/samples/WebSample/WebSample.csproj b/samples/WebSample/WebSample.csproj
new file mode 100644
index 0000000..2d94dc6
--- /dev/null
+++ b/samples/WebSample/WebSample.csproj
@@ -0,0 +1,50 @@
+
+
+
+ netcoreapp1.0
+ true
+ WebSample
+ Exe
+ WebSample
+ 1.0.4
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/WebSample/WebSample.xproj b/samples/WebSample/WebSample.xproj
deleted file mode 100644
index 94a8514..0000000
--- a/samples/WebSample/WebSample.xproj
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 486df7eb-128d-4c79-8b97-9cefeaddb948
- WebSample
- .\obj
- .\bin\
- v4.5.2
-
-
- 2.0
-
-
-
-
-
-
-
diff --git a/samples/WebSample/project.json b/samples/WebSample/project.json
deleted file mode 100644
index 4ad7c34..0000000
--- a/samples/WebSample/project.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.0.0",
- "type": "platform"
- },
- "Microsoft.AspNetCore.Diagnostics": "1.0.0",
- "Microsoft.AspNetCore.Mvc": "1.0.0",
- "Microsoft.AspNetCore.Razor.Tools": {
- "version": "1.0.0-preview2-final",
- "type": "build"
- },
- "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
- "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
- "Microsoft.AspNetCore.StaticFiles": "1.0.0",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
- "Microsoft.Extensions.Configuration.Json": "1.0.0",
- "Microsoft.Extensions.Logging": "1.0.0",
- "Microsoft.Extensions.Logging.Console": "1.0.0",
- "Microsoft.Extensions.Logging.Debug": "1.0.0",
- "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
- "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
- "Serilog.Extensions.Logging": { "target": "project" },
- "Serilog.Settings.Configuration": "2.1.0-dev-00028",
- "Serilog.Sinks.Trace": "2.0.0",
- "Serilog.Sinks.Literate": "2.0.0",
- "Serilog.Sinks.Seq": "3.1.1"
- },
-
- "tools": {
- "BundlerMinifier.Core": "2.0.238",
- "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
- },
-
- "frameworks": {
- "netcoreapp1.0": {
- "imports": [
- "dotnet5.6",
- "portable-net45+win8"
- ]
- }
- },
-
- "buildOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
-
- "runtimeOptions": {
- "configProperties": {
- "System.GC.Server": true
- }
- },
-
- "publishOptions": {
- "include": [
- "wwwroot",
- "Views",
- "Areas/**/Views",
- "appsettings.json",
- "web.config"
- ]
- },
-
- "scripts": {
- "prepublish": [ "bower install", "dotnet bundle" ],
- "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
- }
-}
diff --git a/serilog-extensions-logging.sln b/serilog-extensions-logging.sln
index 89d90ba..b2c28fb 100644
--- a/serilog-extensions-logging.sln
+++ b/serilog-extensions-logging.sln
@@ -1,30 +1,29 @@
-
+
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26114.2
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Extensions.Logging", "src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.xproj", "{903CD13A-D54B-4CEC-A55F-E22AE3D93B3B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging", "src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj", "{903CD13A-D54B-4CEC-A55F-E22AE3D93B3B}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Extensions.Logging.Tests", "test\Serilog.Extensions.Logging.Tests\Serilog.Extensions.Logging.Tests.xproj", "{37EADF84-5E41-4224-A194-1E3299DCD0B8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging.Tests", "test\Serilog.Extensions.Logging.Tests\Serilog.Extensions.Logging.Tests.csproj", "{37EADF84-5E41-4224-A194-1E3299DCD0B8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E30F638E-BBBE-4AD1-93CE-48CC69CFEFE1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F2407211-6043-439C-8E06-3641634332E7}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample", "samples\Sample\Sample.xproj", "{65357FBC-9BC4-466D-B621-1C3A19BC2A78}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "samples\Sample\Sample.csproj", "{65357FBC-9BC4-466D-B621-1C3A19BC2A78}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{9C21B9DF-AEDD-4AA6-BEA4-912DEF3E5B8E}"
ProjectSection(SolutionItems) = preProject
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}") = "WebSample", "samples\WebSample\WebSample.xproj", "{486DF7EB-128D-4C79-8B97-9CEFEADDB948}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSample", "samples\WebSample\WebSample.csproj", "{486DF7EB-128D-4C79-8B97-9CEFEADDB948}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj b/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj
new file mode 100644
index 0000000..2259620
--- /dev/null
+++ b/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj
@@ -0,0 +1,49 @@
+
+
+
+ Serilog provider for Microsoft.Extensions.Logging
+ 1.4.1
+ Microsoft;Serilog Contributors
+ net45;net46;netstandard1.3
+ true
+ true
+ Serilog.Extensions.Logging
+ ../../assets/Serilog.snk
+ true
+ true
+ Serilog.Extensions.Logging
+ serilog;Microsoft.Extensions.Logging
+ http://serilog.net/images/serilog-extension-nuget.png
+ https://github.com/serilog/serilog-extensions-logging
+ http://www.apache.org/licenses/LICENSE-2.0
+ false
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(DefineConstants);ASYNCLOCAL
+
+
+
+ $(DefineConstants);ASYNCLOCAL
+
+
+
diff --git a/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.xproj b/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.xproj
deleted file mode 100644
index f2134c4..0000000
--- a/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 903cd13a-d54b-4cec-a55f-e22ae3d93b3b
- Serilog
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Serilog.Extensions.Logging/project.json b/src/Serilog.Extensions.Logging/project.json
deleted file mode 100644
index 6e54376..0000000
--- a/src/Serilog.Extensions.Logging/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "version": "1.4.1-*",
- "description": "Serilog provider for Microsoft.Extensions.Logging",
- "authors": [ "Microsoft", "Serilog Contributors" ],
- "packOptions": {
- "tags": [ "serilog", "Microsoft.Extensions.Logging" ],
- "projectUrl": "https://github.com/serilog/serilog-extensions-logging",
- "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
- "iconUrl": "http://serilog.net/images/serilog-extension-nuget.png"
- },
- "dependencies": {
- "Microsoft.Extensions.Logging.Abstractions": "1.0.0",
- "Serilog": "2.3.0"
- },
- "buildOptions": {
- "keyFile": "../../assets/Serilog.snk",
- "xmlDoc": true,
- "warningsAsErrors": true
- },
- "frameworks": {
- "net4.5": {
- "frameworkAssemblies": { "System.Runtime": { "type": "build" } }
- },
- "net4.6": {
- "frameworkAssemblies": { "System.Runtime": { "type": "build" } },
- "buildOptions": {
- "define": [ "ASYNCLOCAL" ]
- }
- },
- "netstandard1.3": {
- "buildOptions": {
- "define": ["ASYNCLOCAL"]
- }
- }
- }
-}
diff --git a/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj b/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj
new file mode 100644
index 0000000..3bead7b
--- /dev/null
+++ b/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj
@@ -0,0 +1,30 @@
+
+
+
+ netcoreapp1.0;net46
+ Serilog.Extensions.Logging.Tests
+ ../../assets/Serilog.snk
+ true
+ true
+ Serilog.Extensions.Logging.Tests
+ true
+ $(PackageTargetFallback);dnxcore50;portable-net45+win8
+ 1.0.4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.xproj b/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.xproj
deleted file mode 100644
index f9259c1..0000000
--- a/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 37eadf84-5e41-4224-a194-1e3299dcd0b8
- Serilog.Framework.Logging.Tests
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/test/Serilog.Extensions.Logging.Tests/project.json b/test/Serilog.Extensions.Logging.Tests/project.json
deleted file mode 100644
index 320de26..0000000
--- a/test/Serilog.Extensions.Logging.Tests/project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "testRunner": "xunit",
- "dependencies": {
- "Serilog.Extensions.Logging": { "target": "project" },
- "xunit": "2.1.0",
- "dotnet-test-xunit": "1.0.0-rc2-build10025"
- },
- "buildOptions": {
- "keyFile": "../../assets/Serilog.snk"
- },
- "frameworks": {
- "netcoreapp1.0": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.0"
- }
- },
- "imports": [
- "dnxcore50",
- "portable-net45+win8"
- ]
- },
- "net4.6": {}
- }
-}
-