From e5b1f51ff075e4591ffec0a287ccad9cc24ca85b Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 4 Feb 2017 08:29:59 +1000 Subject: [PATCH 01/20] Tooling RC3 --- Serilog.sln | 97 +++++++++++++------ appveyor.yml | 4 +- build.sh | 19 ++-- global.json | 2 +- src/Serilog/Serilog.csproj | 45 +++++++++ src/Serilog/Serilog.xproj | 17 ---- src/Serilog/project.json | 65 ------------- .../Serilog.PerformanceTests.csproj | 30 ++++++ .../Serilog.PerformanceTests.xproj | 21 ---- test/Serilog.PerformanceTests/project.json | 30 ------ test/Serilog.Tests/Serilog.Tests.csproj | 41 ++++++++ test/Serilog.Tests/Serilog.Tests.xproj | 21 ---- .../Settings/KeyValuePairSettingsTests.cs | 26 ----- test/Serilog.Tests/project.json | 39 -------- test/TestDummies/TestDummies.csproj | 24 +++++ test/TestDummies/TestDummies.xproj | 21 ---- test/TestDummies/project.json | 15 --- 17 files changed, 217 insertions(+), 300 deletions(-) create mode 100644 src/Serilog/Serilog.csproj delete mode 100644 src/Serilog/Serilog.xproj delete mode 100644 src/Serilog/project.json create mode 100644 test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj delete mode 100644 test/Serilog.PerformanceTests/Serilog.PerformanceTests.xproj delete mode 100755 test/Serilog.PerformanceTests/project.json create mode 100644 test/Serilog.Tests/Serilog.Tests.csproj delete mode 100644 test/Serilog.Tests/Serilog.Tests.xproj delete mode 100644 test/Serilog.Tests/project.json create mode 100644 test/TestDummies/TestDummies.csproj delete mode 100644 test/TestDummies/TestDummies.xproj delete mode 100644 test/TestDummies/project.json diff --git a/Serilog.sln b/Serilog.sln index 32d2b0d9b..e61cd6e07 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -1,12 +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.26127.3 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0D135C0C-A60B-454A-A2F4-CD74A30E04B0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -22,44 +17,84 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5 assets\Serilog.snk = assets\Serilog.snk EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog", "src\Serilog\Serilog.xproj", "{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{791D4267-0D6F-4FDF-80F2-11F4E793B0F2}" +EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Serilog", "src\Serilog\Serilog.csproj", "{AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{290A2775-7CA0-4F81-9DDC-32E28C3A7565}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Tests", "test\Serilog.Tests\Serilog.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}" +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "TestDummies", "test\TestDummies\TestDummies.csproj", "{37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestDummies", "test\TestDummies\TestDummies.xproj", "{2BB12CE5-C867-43BD-AE5D-253FE3248C7F}" +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Serilog.Tests", "test\Serilog.Tests\Serilog.Tests.csproj", "{B11B911D-977A-42CE-900A-596CF59F6FFA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.PerformanceTests", "test\Serilog.PerformanceTests\Serilog.PerformanceTests.xproj", "{D7A37F73-BBA3-4DAE-9648-1A753A86F968}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.PerformanceTests", "test\Serilog.PerformanceTests\Serilog.PerformanceTests.csproj", "{B4AC7ED9-517B-47E9-BB49-15F8A8478E62}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}.Release|Any CPU.Build.0 = Release|Any CPU - {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.Build.0 = Release|Any CPU - {2BB12CE5-C867-43BD-AE5D-253FE3248C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BB12CE5-C867-43BD-AE5D-253FE3248C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BB12CE5-C867-43BD-AE5D-253FE3248C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BB12CE5-C867-43BD-AE5D-253FE3248C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Release|Any CPU.Build.0 = Release|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x64.ActiveCfg = Debug|x64 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x64.Build.0 = Debug|x64 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x86.ActiveCfg = Debug|x86 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x86.Build.0 = Debug|x86 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|Any CPU.Build.0 = Release|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x64.ActiveCfg = Release|x64 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x64.Build.0 = Release|x64 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x86.ActiveCfg = Release|x86 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x86.Build.0 = Release|x86 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x64.ActiveCfg = Debug|x64 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x64.Build.0 = Debug|x64 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x86.ActiveCfg = Debug|x86 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x86.Build.0 = Debug|x86 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|Any CPU.Build.0 = Release|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x64.ActiveCfg = Release|x64 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x64.Build.0 = Release|x64 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x86.ActiveCfg = Release|x86 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x86.Build.0 = Release|x86 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x64.ActiveCfg = Debug|x64 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x64.Build.0 = Debug|x64 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x86.ActiveCfg = Debug|x86 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x86.Build.0 = Debug|x86 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|Any CPU.Build.0 = Release|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x64.ActiveCfg = Release|x64 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x64.Build.0 = Release|x64 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x86.ActiveCfg = Release|x86 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x86.Build.0 = Release|x86 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x64.ActiveCfg = Debug|x64 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x64.Build.0 = Debug|x64 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x86.ActiveCfg = Debug|x86 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x86.Build.0 = Debug|x86 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|Any CPU.Build.0 = Release|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x64.ActiveCfg = Release|x64 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x64.Build.0 = Release|x64 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x86.ActiveCfg = Release|x86 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {803CD13A-D54B-4CEC-A55F-E22AE3D93B3C} = {037440DE-440B-4129-9F7A-09B42D00397E} - {3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0} - {2BB12CE5-C867-43BD-AE5D-253FE3248C7F} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0} - {D7A37F73-BBA3-4DAE-9648-1A753A86F968} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0} + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1} = {791D4267-0D6F-4FDF-80F2-11F4E793B0F2} + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF} = {290A2775-7CA0-4F81-9DDC-32E28C3A7565} + {B11B911D-977A-42CE-900A-596CF59F6FFA} = {290A2775-7CA0-4F81-9DDC-32E28C3A7565} + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62} = {290A2775-7CA0-4F81-9DDC-32E28C3A7565} EndGlobalSection EndGlobal diff --git a/appveyor.yml b/appveyor.yml index 185375dde..a6fda6025 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-rc3/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-rc3-004530' - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" build_script: - ps: ./Build.ps1 diff --git a/build.sh b/build.sh index ff84facad..0d185a815 100755 --- a/build.sh +++ b/build.sh @@ -1,17 +1,14 @@ #!/bin/bash dotnet restore -for path in src/*/project.json; do - dirname="$(dirname "${path}")" - dotnet build ${dirname} -c Release +for path in src/**/*.csproj; do + dotnet build -c Release ${path} done -for path in test/Serilog.Tests/project.json; do - dirname="$(dirname "${path}")" - dotnet build ${dirname} -f netcoreapp1.0 -c Release - dotnet test ${dirname} -f netcoreapp1.0 -c Release +for path in test/**/*.csproj; do + dotnet build -f netcoreapp1.0 -c Release ${path} + dotnet test -f netcoreapp1.0 -c Release ${path} done -for path in test/Serilog.PerformanceTests/project.json; do - dirname="$(dirname "${path}")" - dotnet build ${dirname} -f netcoreapp1.0 -c Release -done \ No newline at end of file +for path in test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj; do + dotnet build -f netcoreapp1.0 -c Release ${path} +done diff --git a/global.json b/global.json index a2b2a4152..e5f27bb8f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-preview2-003121" + "version": "1.0.0-rc3-004530" } } diff --git a/src/Serilog/Serilog.csproj b/src/Serilog/Serilog.csproj new file mode 100644 index 000000000..7b38f1573 --- /dev/null +++ b/src/Serilog/Serilog.csproj @@ -0,0 +1,45 @@ + + + + Simple .NET logging with fully-structured events + 2.4.1 + Serilog Contributors + net45;net46;netstandard1.0;netstandard1.3 + true + Serilog + ../../assets/Serilog.snk + true + true + Serilog + serilog;logging;semantic;structured + http://serilog.net/images/serilog-nuget.png + http://serilog.net + http://www.apache.org/licenses/LICENSE-2.0 + false + + + + + + + + + + + + + + + + + $(DefineConstants);REMOTING;HASHTABLE + + + + $(DefineConstants);ASYNCLOCAL + + + + + + diff --git a/src/Serilog/Serilog.xproj b/src/Serilog/Serilog.xproj deleted file mode 100644 index 865914c3d..000000000 --- a/src/Serilog/Serilog.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 803cd13a-d54b-4cec-a55f-e22ae3d93b3c - Serilog - .\obj - .\bin\ - - 2.0 - - - diff --git a/src/Serilog/project.json b/src/Serilog/project.json deleted file mode 100644 index 810666497..000000000 --- a/src/Serilog/project.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "version": "2.4.1-*", - - "description": "Simple .NET logging with fully-structured events", - "authors": [ "Serilog Contributors" ], - - "packOptions": { - "tags": [ "serilog", "logging", "semantic", "structured" ], - "projectUrl": "http://serilog.net", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "http://serilog.net/images/serilog-nuget.png" - }, - - "buildOptions": { - "keyFile": "../../assets/Serilog.snk", - "xmlDoc": true - }, - - "frameworks": { - "net4.5": { - "buildOptions": { - "define": [ "REMOTING", "HASHTABLE" ] - } - }, - "net4.6": { - "buildOptions": { - "define": [ "ASYNCLOCAL", "HASHTABLE" ] - } - }, - "netstandard1.0": { - "dependencies": { - "Microsoft.CSharp": "4.0.1", - "System.Collections": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "netstandard1.3": { - "buildOptions": { - "define": [ "ASYNCLOCAL", "HASHTABLE" ] - }, - "dependencies": { - "Microsoft.CSharp": "4.0.1", - "System.Collections": "4.0.11", - "System.Collections.NonGeneric": "4.0.1", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11" - } - } - } -} diff --git a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj new file mode 100644 index 000000000..39d94dfaf --- /dev/null +++ b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj @@ -0,0 +1,30 @@ + + + netcoreapp1.0;net452 + Serilog.PerformanceTests + ../../assets/Serilog.snk + true + true + Serilog.PerformanceTests + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.xproj b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.xproj deleted file mode 100644 index e84267546..000000000 --- a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d7a37f73-bba3-4dae-9648-1a753a86f968 - Serilog.PerformanceTests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Serilog.PerformanceTests/project.json b/test/Serilog.PerformanceTests/project.json deleted file mode 100755 index 70bc3da6f..000000000 --- a/test/Serilog.PerformanceTests/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "testRunner": "xunit", - - "dependencies": { - "Serilog": { "target": "project" }, - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-rc2-build10025", - "BenchmarkDotNet": "0.9.9" - }, - "buildOptions": { - "keyFile": "../../assets/Serilog.snk" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "System.Collections": "4.0.11" - }, - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - }, - "net4.5.2": { - } - } -} diff --git a/test/Serilog.Tests/Serilog.Tests.csproj b/test/Serilog.Tests/Serilog.Tests.csproj new file mode 100644 index 000000000..f8676504b --- /dev/null +++ b/test/Serilog.Tests/Serilog.Tests.csproj @@ -0,0 +1,41 @@ + + + netcoreapp1.0;net452;net46 + Serilog.Tests + ../../assets/Serilog.snk + true + true + Serilog.Tests + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + + + + + + + + $(DefineConstants);APPDOMAIN;REMOTING;GETCURRENTMETHOD + + + $(DefineConstants);ASYNCLOCAL + + + + + + + + + \ No newline at end of file diff --git a/test/Serilog.Tests/Serilog.Tests.xproj b/test/Serilog.Tests/Serilog.Tests.xproj deleted file mode 100644 index f620d4de3..000000000 --- a/test/Serilog.Tests/Serilog.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3c2d8e01-5580-426a-bdd9-ec59cd98e618 - Serilog.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs index 7b57984e8..b1aed92b9 100644 --- a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs +++ b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs @@ -126,31 +126,5 @@ public void AuditSinksAreConfigured() Assert.Equal(1, DummyRollingFileAuditSink.Emitted.Count); } - [Fact] - public void TestMinimumLevelOverrides() { - var settings = new Dictionary - { - ["minimum-level:override:Microsoft"] = "Warning", - }; - - LogEvent evt = null; - - var log = new LoggerConfiguration() - .ReadFrom.KeyValuePairs(settings) - .WriteTo.Sink(new DelegatingSink(e => evt = e)) - .CreateLogger(); - - var microsoftLogger = log.ForContext(); - microsoftLogger.Write(Some.InformationEvent()); - - Assert.Null(evt); - - microsoftLogger.Warning("Bad things"); - Assert.NotNull(evt); - - evt = null; - log.Write(Some.InformationEvent()); - Assert.NotNull(evt); - } } } diff --git a/test/Serilog.Tests/project.json b/test/Serilog.Tests/project.json deleted file mode 100644 index f148cd108..000000000 --- a/test/Serilog.Tests/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "testRunner": "xunit", - - "dependencies": { - "Serilog": { "target": "project" }, - "TestDummies": { "target": "project" }, - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-rc2-build10025" - }, - - "buildOptions": { - "keyFile": "../../assets/Serilog.snk" - }, - "frameworks": { - "netcoreapp1.0": { - "define": [ "ASYNCLOCAL" ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - }, - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - }, - "net4.5.2": { - "buildOptions": { - "define": [ "APPDOMAIN", "REMOTING", "GETCURRENTMETHOD" ] - } - }, - "net4.6": { - "buildOptions": { - "define": [ "ASYNCLOCAL", "APPDOMAIN", "GETCURRENTMETHOD" ] - } - } - } -} diff --git a/test/TestDummies/TestDummies.csproj b/test/TestDummies/TestDummies.csproj new file mode 100644 index 000000000..5f8ab00dc --- /dev/null +++ b/test/TestDummies/TestDummies.csproj @@ -0,0 +1,24 @@ + + + + net452;netstandard1.3 + TestDummies + ../../assets/Serilog.snk + true + true + TestDummies + false + false + false + + + + + + + + + + + + diff --git a/test/TestDummies/TestDummies.xproj b/test/TestDummies/TestDummies.xproj deleted file mode 100644 index 491d7aa12..000000000 --- a/test/TestDummies/TestDummies.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 2bb12ce5-c867-43bd-ae5d-253fe3248c7f - TestDummies - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/test/TestDummies/project.json b/test/TestDummies/project.json deleted file mode 100644 index 6d498ef45..000000000 --- a/test/TestDummies/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "buildOptions": { - "keyFile": "../../assets/Serilog.snk" - }, - - "dependencies": { - "NETStandard.Library": "1.6.0", - "Serilog": { "target": "project" } - }, - - "frameworks": { - "net4.5.2": { }, - "netstandard1.3": {} - } -} From e89d7cb81210bc91036ce9b832aab56501922841 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 11 Feb 2017 12:17:48 +1000 Subject: [PATCH 02/20] Tooling RC4-004771 --- .travis.yml | 4 ++-- Serilog.sln | 3 ++- appveyor.yml | 4 ++-- global.json | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 562d018d5..1565b4526 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ matrix: - os: linux # Ubuntu 14.04 dist: trusty sudo: required - dotnet: 1.0.0-preview2-003121 + dotnet: 1.0.0-rc4-004771 - os: osx # OSX 10.11 osx_image: xcode7.2 - dotnet: 1.0.0-preview2-003121 + dotnet: 1.0.0-rc4-004771 script: - ./build.sh \ No newline at end of file diff --git a/Serilog.sln b/Serilog.sln index e61cd6e07..086baa1a7 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -1,10 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26127.3 +VisualStudioVersion = 15.0.26206.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + .travis.yml = .travis.yml appveyor.yml = appveyor.yml Build.ps1 = Build.ps1 build.sh = build.sh diff --git a/appveyor.yml b/appveyor.yml index a6fda6025..8ddc4e07f 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-rc3/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1" + - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-rc4/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-rc3-004530' + - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-rc4-004771' - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" build_script: - ps: ./Build.ps1 diff --git a/global.json b/global.json index e5f27bb8f..490585a9d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-rc3-004530" + "version": "1.0.0-rc4-004771" } } From b0b5eee5c367867ddab20391a3c9ee149afeec62 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 11 Feb 2017 12:18:19 +1000 Subject: [PATCH 03/20] Bring back `TestMinimumLevelOverrides` --- .../Settings/KeyValuePairSettingsTests.cs | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs index b1aed92b9..ffb974378 100644 --- a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs +++ b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs @@ -24,7 +24,7 @@ public void FindsConfigurationAssemblies() // The core Serilog assembly is always considered Assert.Equal(1, configurationAssemblies.Count); - } + } [Fact] public void PropertyEnrichmentIsApplied() @@ -126,5 +126,34 @@ public void AuditSinksAreConfigured() Assert.Equal(1, DummyRollingFileAuditSink.Emitted.Count); } + [Fact] + public void TestMinimumLevelOverrides() + { + var settings = new Dictionary + + { + ["minimum-level:override:System"] = "Warning", + }; + + LogEvent evt = null; + + var log = new LoggerConfiguration() + .ReadFrom.KeyValuePairs(settings) + .WriteTo.Sink(new DelegatingSink(e => evt = e)) + .CreateLogger(); + + var systemLogger = log.ForContext(); + systemLogger.Write(Some.InformationEvent()); + + Assert.Null(evt); + + systemLogger.Warning("Bad things"); + Assert.NotNull(evt); + + evt = null; + log.Write(Some.InformationEvent()); + Assert.NotNull(evt); + } + } } From 079a2265d08f465a168672df19998cc8a691588d Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 11 Feb 2017 12:23:44 +1000 Subject: [PATCH 04/20] Remove `rc4` from the dotnet cli install script path --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8ddc4e07f..5ac0604c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ 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-rc4/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-rc4-004771' - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" From ee98b3e77ac6202fa90c59a501fa42aab34dd897 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Tue, 14 Feb 2017 20:38:20 +1000 Subject: [PATCH 05/20] Fix `netstandard1.3` defines and references --- src/Serilog/Serilog.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Serilog/Serilog.csproj b/src/Serilog/Serilog.csproj index 7b38f1573..8315519dc 100644 --- a/src/Serilog/Serilog.csproj +++ b/src/Serilog/Serilog.csproj @@ -39,7 +39,12 @@ $(DefineConstants);ASYNCLOCAL + + $(DefineConstants);ASYNCLOCAL;HASHTABLE + + + From 6087532764e364516226b63fc6ee510f5d3dc222 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Tue, 14 Feb 2017 20:38:53 +1000 Subject: [PATCH 06/20] travis: use `osx_image` = `xcode7.3`, because `xcode7.2` is deprecated --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1565b4526..7170ffafe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ matrix: sudo: required dotnet: 1.0.0-rc4-004771 - os: osx # OSX 10.11 - osx_image: xcode7.2 + osx_image: xcode7.3 dotnet: 1.0.0-rc4-004771 script: From 273c191623015e2a5b31005abe3e03bce22ee58b Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Tue, 14 Feb 2017 20:56:56 +1000 Subject: [PATCH 07/20] Adjust codcov test command --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5ac0604c9..180e92536 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build_script: - ps: ./Build.ps1 test_script: - nuget.exe install OpenCover -ExcludeVersion - - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[Serilog]*" -target:"dotnet.exe" "-targetargs:test test\Serilog.Tests" -returntargetcode -hideskipped:All -output:coverage.xml + - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[Serilog]*" -target:"dotnet.exe" "-targetargs:test test\Serilog.Tests\Serilog.Tests.csproj" -returntargetcode -hideskipped:All -output:coverage.xml - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%" - pip install codecov - codecov -f "coverage.xml" From df69837d6ce6e2c09597b58726194e5d7f294c19 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 08:11:55 +1000 Subject: [PATCH 08/20] Fix travis build, remove OpenCover --- .travis.yml | 6 ++++-- appveyor.yml | 6 ------ build.cmd | 1 + build.sh | 8 ++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 build.cmd diff --git a/.travis.yml b/.travis.yml index 7170ffafe..15fad5c21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,12 @@ matrix: - os: linux # Ubuntu 14.04 dist: trusty sudo: required - dotnet: 1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 + CLI_VERSION: 1.0.0-rc4-004771 - os: osx # OSX 10.11 osx_image: xcode7.3 - dotnet: 1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 + CLI_VERSION: 1.0.0-rc4-004771 script: - ./build.sh \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 180e92536..af782b38a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,12 +10,6 @@ install: - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" build_script: - ps: ./Build.ps1 -test_script: - - nuget.exe install OpenCover -ExcludeVersion - - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[Serilog]*" -target:"dotnet.exe" "-targetargs:test test\Serilog.Tests\Serilog.Tests.csproj" -returntargetcode -hideskipped:All -output:coverage.xml - - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%" - - pip install codecov - - codecov -f "coverage.xml" artifacts: - path: artifacts/Serilog.*.nupkg deploy: diff --git a/build.cmd b/build.cmd new file mode 100644 index 000000000..29af91cd3 --- /dev/null +++ b/build.cmd @@ -0,0 +1 @@ +@powershell .\Build.ps1 %* \ No newline at end of file diff --git a/build.sh b/build.sh index 0d185a815..546235185 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,13 @@ #!/bin/bash +export DOTNET_INSTALL_DIR="$PWD/.dotnetcli" +DotnetCliVersion=${CLI_VERSION:="1.0.0-rc4-004771"} +install_script_url=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh +curl -sSL $install_script_url | bash /dev/stdin --version "$DotnetCliVersion" --install-dir "$DOTNET_INSTALL_DIR" +export PATH="$DOTNET_INSTALL_DIR:$PATH" + +dotnet --info dotnet restore + for path in src/**/*.csproj; do dotnet build -c Release ${path} done From 1dfb049b23517aa69ebddb92e64a64161324ace9 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 08:18:05 +1000 Subject: [PATCH 09/20] Stop using beta test libraries --- .../Serilog.PerformanceTests.csproj | 6 +++--- test/Serilog.Tests/Serilog.Tests.csproj | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj index 39d94dfaf..4aff922fa 100644 --- a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj +++ b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/test/Serilog.Tests/Serilog.Tests.csproj b/test/Serilog.Tests/Serilog.Tests.csproj index f8676504b..dfa074061 100644 --- a/test/Serilog.Tests/Serilog.Tests.csproj +++ b/test/Serilog.Tests/Serilog.Tests.csproj @@ -14,10 +14,10 @@ - + - - + + From b2b95aa4c97f09e73d2309fe5420e151ef8a6eab Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 08:30:11 +1000 Subject: [PATCH 10/20] Improve travis(osx/linux) build --- .gitignore | 1 + build.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8ff53697f..bcaad9494 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ bld/ [Bb]in/ [Oo]bj/ BenchmarkDotNet.Artifacts/ +.dotnetcli/ # Visual Studio 2015 cache/options directory .vs/ diff --git a/build.sh b/build.sh index 546235185..829d1d287 100755 --- a/build.sh +++ b/build.sh @@ -9,14 +9,14 @@ dotnet --info dotnet restore for path in src/**/*.csproj; do - dotnet build -c Release ${path} + dotnet build -f netstandard1.0 -c Release ${path} + dotnet build -f netstandard1.3 -c Release ${path} done -for path in test/**/*.csproj; do - dotnet build -f netcoreapp1.0 -c Release ${path} +for path in test/Serilog.Tests/*.csproj; do dotnet test -f netcoreapp1.0 -c Release ${path} done -for path in test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj; do - dotnet build -f netcoreapp1.0 -c Release ${path} -done +# for path in test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj; do +# dotnet test -f netcoreapp1.0 -c Release ${path} +# done From 76f599e2fc08926f1bc948e8d8ca9381888613cc Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 11:22:17 +1000 Subject: [PATCH 11/20] Produce symbol packages again --- Build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build.ps1 b/Build.ps1 index 55db40f54..27729c8e1 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -24,7 +24,7 @@ foreach ($src in ls src/*) { echo "build: Packaging project in $src" & dotnet build -c Release --version-suffix=$buildSuffix - & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --no-build + & dotnet pack -c Release --include-symbols -o ..\..\artifacts --version-suffix=$suffix --no-build if($LASTEXITCODE -ne 0) { exit 1 } Pop-Location From 33ae3ec1b98f2c221932e643fe411f88b31a817f Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 11:29:15 +1000 Subject: [PATCH 12/20] Perf tests: BDN 0.10.3 + netcoreapp1.1 --- Build.ps1 | 16 ++++++++-------- build.sh | 8 ++++---- .../Serilog.PerformanceTests.csproj | 8 +++++--- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Build.ps1 b/Build.ps1 index 27729c8e1..648b06823 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -30,24 +30,24 @@ foreach ($src in ls src/*) { Pop-Location } -foreach ($test in ls test/*.PerformanceTests) { +foreach ($test in ls test/*.Tests) { Push-Location $test - echo "build: Building performance test project in $test" + echo "build: Testing project in $test" - & dotnet build -c Release - if($LASTEXITCODE -ne 0) { exit 2 } + & dotnet test -c Release + if($LASTEXITCODE -ne 0) { exit 3 } Pop-Location } -foreach ($test in ls test/*.Tests) { +foreach ($test in ls test/*.PerformanceTests) { Push-Location $test - echo "build: Testing project in $test" + echo "build: Building performance test project in $test" - & dotnet test -c Release - if($LASTEXITCODE -ne 0) { exit 3 } + & dotnet build -c Release + if($LASTEXITCODE -ne 0) { exit 2 } Pop-Location } diff --git a/build.sh b/build.sh index 829d1d287..f75d3c686 100755 --- a/build.sh +++ b/build.sh @@ -13,10 +13,10 @@ for path in src/**/*.csproj; do dotnet build -f netstandard1.3 -c Release ${path} done -for path in test/Serilog.Tests/*.csproj; do +for path in test/*.Tests/*.csproj; do dotnet test -f netcoreapp1.0 -c Release ${path} done -# for path in test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj; do -# dotnet test -f netcoreapp1.0 -c Release ${path} -# done +for path in test/*.PerformanceTests/*.PerformanceTests.csproj; do + dotnet test -f netcoreapp1.1 -c Release ${path} +done diff --git a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj index 4aff922fa..9b54fe0d9 100644 --- a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj +++ b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj @@ -1,13 +1,15 @@  - netcoreapp1.0;net452 + netcoreapp1.1;net452 Serilog.PerformanceTests ../../assets/Serilog.snk true true Serilog.PerformanceTests true - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + @@ -16,7 +18,7 @@ - + From 7b2c70f7383c2768a6f1242b4952627852d59b61 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 11:43:25 +1000 Subject: [PATCH 13/20] Prevent appveyor from auto-running tests --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index af782b38a..47092aa4a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,6 +8,7 @@ install: - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli" - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-rc4-004771' - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" +test: off build_script: - ps: ./Build.ps1 artifacts: From a825eff70dd9654d2ded6045567a4f5ddd176ac7 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 11:52:32 +1000 Subject: [PATCH 14/20] Only build perf tests on OSX/Linux (not run) --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f75d3c686..f48816514 100755 --- a/build.sh +++ b/build.sh @@ -18,5 +18,6 @@ for path in test/*.Tests/*.csproj; do done for path in test/*.PerformanceTests/*.PerformanceTests.csproj; do - dotnet test -f netcoreapp1.1 -c Release ${path} + dotnet build -f netcoreapp1.1 -c Release ${path} + # dotnet test -f netcoreapp1.1 -c Release ${path} done From 5ee4695d11d12338c0f0b936d16d24194c5761b3 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 12:07:14 +1000 Subject: [PATCH 15/20] Increase ulimit --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index f48816514..faa23c867 100755 --- a/build.sh +++ b/build.sh @@ -5,6 +5,9 @@ install_script_url=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/script curl -sSL $install_script_url | bash /dev/stdin --version "$DotnetCliVersion" --install-dir "$DOTNET_INSTALL_DIR" export PATH="$DOTNET_INSTALL_DIR:$PATH" +# See issue https://github.com/NuGet/Home/issues/2163 +ulimit -n 2048 + dotnet --info dotnet restore From 64d1fe01eb93a1f920d2a62cf688dd9b04f06641 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Wed, 8 Mar 2017 11:10:35 +1000 Subject: [PATCH 16/20] Update CLI to 1.0.0 --- .travis.yml | 4 ++-- Serilog.sln | 66 ++++++++++++++++++++++++++-------------------------- appveyor.yml | 2 +- build.sh | 2 +- global.json | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15fad5c21..b153fb9e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ matrix: dist: trusty sudo: required dotnet: 1.0.0-preview2-003121 - CLI_VERSION: 1.0.0-rc4-004771 + CLI_VERSION: 1.0.0 - os: osx # OSX 10.11 osx_image: xcode7.3 dotnet: 1.0.0-preview2-003121 - CLI_VERSION: 1.0.0-rc4-004771 + CLI_VERSION: 1.0.0 script: - ./build.sh \ No newline at end of file diff --git a/Serilog.sln b/Serilog.sln index 086baa1a7..1e8496923 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26206.0 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}" ProjectSection(SolutionItems) = preProject @@ -42,52 +42,52 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x64.ActiveCfg = Debug|x64 - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x64.Build.0 = Debug|x64 - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x86.ActiveCfg = Debug|x86 - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x86.Build.0 = Debug|x86 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x64.ActiveCfg = Debug|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x64.Build.0 = Debug|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x86.ActiveCfg = Debug|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Debug|x86.Build.0 = Debug|Any CPU {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|Any CPU.ActiveCfg = Release|Any CPU {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|Any CPU.Build.0 = Release|Any CPU - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x64.ActiveCfg = Release|x64 - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x64.Build.0 = Release|x64 - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x86.ActiveCfg = Release|x86 - {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x86.Build.0 = Release|x86 + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x64.ActiveCfg = Release|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x64.Build.0 = Release|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x86.ActiveCfg = Release|Any CPU + {AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}.Release|x86.Build.0 = Release|Any CPU {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x64.ActiveCfg = Debug|x64 - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x64.Build.0 = Debug|x64 - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x86.ActiveCfg = Debug|x86 - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x86.Build.0 = Debug|x86 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x64.ActiveCfg = Debug|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x64.Build.0 = Debug|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x86.ActiveCfg = Debug|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Debug|x86.Build.0 = Debug|Any CPU {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|Any CPU.ActiveCfg = Release|Any CPU {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|Any CPU.Build.0 = Release|Any CPU - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x64.ActiveCfg = Release|x64 - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x64.Build.0 = Release|x64 - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x86.ActiveCfg = Release|x86 - {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x86.Build.0 = Release|x86 + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x64.ActiveCfg = Release|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x64.Build.0 = Release|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x86.ActiveCfg = Release|Any CPU + {37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}.Release|x86.Build.0 = Release|Any CPU {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x64.ActiveCfg = Debug|x64 - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x64.Build.0 = Debug|x64 - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x86.ActiveCfg = Debug|x86 - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x86.Build.0 = Debug|x86 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x64.ActiveCfg = Debug|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x64.Build.0 = Debug|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x86.ActiveCfg = Debug|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Debug|x86.Build.0 = Debug|Any CPU {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|Any CPU.Build.0 = Release|Any CPU - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x64.ActiveCfg = Release|x64 - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x64.Build.0 = Release|x64 - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x86.ActiveCfg = Release|x86 - {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x86.Build.0 = Release|x86 + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x64.ActiveCfg = Release|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x64.Build.0 = Release|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x86.ActiveCfg = Release|Any CPU + {B11B911D-977A-42CE-900A-596CF59F6FFA}.Release|x86.Build.0 = Release|Any CPU {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x64.ActiveCfg = Debug|x64 - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x64.Build.0 = Debug|x64 - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x86.ActiveCfg = Debug|x86 - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x86.Build.0 = Debug|x86 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x64.ActiveCfg = Debug|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x64.Build.0 = Debug|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x86.ActiveCfg = Debug|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Debug|x86.Build.0 = Debug|Any CPU {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|Any CPU.ActiveCfg = Release|Any CPU {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|Any CPU.Build.0 = Release|Any CPU - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x64.ActiveCfg = Release|x64 - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x64.Build.0 = Release|x64 - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x86.ActiveCfg = Release|x86 - {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x86.Build.0 = Release|x86 + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x64.ActiveCfg = Release|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x64.Build.0 = Release|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x86.ActiveCfg = Release|Any CPU + {B4AC7ED9-517B-47E9-BB49-15F8A8478E62}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appveyor.yml b/appveyor.yml index 47092aa4a..6c3d55e65 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ install: - ps: mkdir -Force ".\build\" | Out-Null - 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-rc4-004771' + - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0' - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" test: off build_script: diff --git a/build.sh b/build.sh index faa23c867..100633557 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash export DOTNET_INSTALL_DIR="$PWD/.dotnetcli" -DotnetCliVersion=${CLI_VERSION:="1.0.0-rc4-004771"} +DotnetCliVersion=${CLI_VERSION:="1.0.0"} install_script_url=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh curl -sSL $install_script_url | bash /dev/stdin --version "$DotnetCliVersion" --install-dir "$DOTNET_INSTALL_DIR" export PATH="$DOTNET_INSTALL_DIR:$PATH" diff --git a/global.json b/global.json index 490585a9d..6cedd685d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-rc4-004771" + "version": "1.0.0" } } From e67472698d97ac703739b1780070cf08e66ef5cf Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Wed, 8 Mar 2017 11:35:30 +1000 Subject: [PATCH 17/20] DisableImplicitFrameworkReferences --- src/Serilog/Serilog.csproj | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/Serilog/Serilog.csproj b/src/Serilog/Serilog.csproj index 8315519dc..772e0ecef 100644 --- a/src/Serilog/Serilog.csproj +++ b/src/Serilog/Serilog.csproj @@ -16,8 +16,10 @@ http://serilog.net http://www.apache.org/licenses/LICENSE-2.0 false + + true - + @@ -29,6 +31,17 @@ + + + + + + + + + + + @@ -40,11 +53,22 @@ - $(DefineConstants);ASYNCLOCAL;HASHTABLE + $(DefineConstants);ASYNCLOCAL;HASHTABLE + + + + + + + + + + + From 3a46862a8cdc03176db95fb0b0257205bf41ddb4 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Wed, 8 Mar 2017 16:27:31 +1000 Subject: [PATCH 18/20] Fix `run_perf_tests.sh` --- run_perf_tests.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/run_perf_tests.sh b/run_perf_tests.sh index 18403fd8e..c332aa20d 100755 --- a/run_perf_tests.sh +++ b/run_perf_tests.sh @@ -1,10 +1,6 @@ #!/bin/bash dotnet restore -for path in src/*/project.json; do - dirname="$(dirname "${path}")" - dotnet build ${dirname} -c Release -done -for path in test/Serilog.PerformanceTests/project.json; do - dirname="$(dirname "${path}")" - dotnet test ${dirname} -f netcoreapp1.0 -c Release -done \ No newline at end of file + +for path in test/*.PerformanceTests/*.csproj; do + dotnet test -f netcoreapp1.1 -c Release ${path} +done From 9ae6dfcf5b4fd8fcb63e88554c36f93b5657233c Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Thu, 9 Mar 2017 06:03:13 +1000 Subject: [PATCH 19/20] Use magic sln project guids, so that VS features like live csproj file editing work correctly. --- Serilog.sln | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Serilog.sln b/Serilog.sln index 1e8496923..be7104f64 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -20,13 +20,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{791D4267-0D6F-4FDF-80F2-11F4E793B0F2}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Serilog", "src\Serilog\Serilog.csproj", "{AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog", "src\Serilog\Serilog.csproj", "{AB00B377-9F1E-4D4B-B6B0-B95F53BCAEF1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{290A2775-7CA0-4F81-9DDC-32E28C3A7565}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "TestDummies", "test\TestDummies\TestDummies.csproj", "{37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDummies", "test\TestDummies\TestDummies.csproj", "{37EF0B5E-0363-4A47-AF3E-51FA6E79E3CF}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Serilog.Tests", "test\Serilog.Tests\Serilog.Tests.csproj", "{B11B911D-977A-42CE-900A-596CF59F6FFA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Tests", "test\Serilog.Tests\Serilog.Tests.csproj", "{B11B911D-977A-42CE-900A-596CF59F6FFA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.PerformanceTests", "test\Serilog.PerformanceTests\Serilog.PerformanceTests.csproj", "{B4AC7ED9-517B-47E9-BB49-15F8A8478E62}" EndProject From 3b9f10ca05a559518972e67583eda98d33aa55c1 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Thu, 9 Mar 2017 10:18:13 +1000 Subject: [PATCH 20/20] Disable travis OSX builds --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b153fb9e6..e10883035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,11 @@ matrix: sudo: required dotnet: 1.0.0-preview2-003121 CLI_VERSION: 1.0.0 - - os: osx # OSX 10.11 - osx_image: xcode7.3 - dotnet: 1.0.0-preview2-003121 - CLI_VERSION: 1.0.0 + # Disabled temporarily due to Travis OSX issues + # - os: osx # OSX 10.11 + # osx_image: xcode7.3 + # dotnet: 1.0.0-preview2-003121 + # CLI_VERSION: 1.0.0 script: - ./build.sh \ No newline at end of file