From 3812de5f76de72b09fdf5c4f5baf334d27356063 Mon Sep 17 00:00:00 2001 From: osudude Date: Tue, 15 Aug 2017 17:36:15 -0500 Subject: [PATCH 1/2] migrate to csproj --- global.json | 6 --- serilog-enrichers-environment.sln | 11 +++--- .../Serilog.Enrichers.Environment.csproj | 33 ++++++++++++++++ .../Serilog.Enrichers.Environment.xproj | 18 --------- .../project.json | 33 ---------------- ...Serilog.Enrichers.Environment.Tests.csproj | 38 +++++++++++++++++++ .../Serilog.Enrichers.Environment.Tests.xproj | 21 ---------- .../project.json | 28 -------------- 8 files changed, 76 insertions(+), 112 deletions(-) delete mode 100644 global.json create mode 100644 src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.csproj delete mode 100644 src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.xproj delete mode 100644 src/Serilog.Enrichers.Environment/project.json create mode 100644 test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.Tests.csproj delete mode 100644 test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.Tests.xproj delete mode 100644 test/Serilog.Enrichers.Environment.Tests/project.json 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/serilog-enrichers-environment.sln b/serilog-enrichers-environment.sln index 0b81f6e..067362b 100644 --- a/serilog-enrichers-environment.sln +++ b/serilog-enrichers-environment.sln @@ -1,24 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.14 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}") = "assets", "assets", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}" ProjectSection(SolutionItems) = preProject Build.ps1 = Build.ps1 - global.json = global.json NuGet.Config = NuGet.Config README.md = README.md assets\Serilog.snk = assets\Serilog.snk EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Enrichers.Environment", "src\Serilog.Enrichers.Environment\Serilog.Enrichers.Environment.xproj", "{B884782D-6C07-4779-9074-D97F622799A9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{406006F7-12FA-4A8A-ADC8-80E5338F5275}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Enrichers.Environment.Tests", "test\Serilog.Enrichers.Environment.Tests\Serilog.Enrichers.Environment.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Enrichers.Environment", "src\Serilog.Enrichers.Environment\Serilog.Enrichers.Environment.csproj", "{B884782D-6C07-4779-9074-D97F622799A9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Enrichers.Environment.Tests", "test\Serilog.Enrichers.Environment.Tests\Serilog.Enrichers.Environment.Tests.csproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.csproj b/src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.csproj new file mode 100644 index 0000000..ba11b2f --- /dev/null +++ b/src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.csproj @@ -0,0 +1,33 @@ + + + + Enrich Serilog log events with properties from System.Environment. + 2.1.3 + Serilog Contributors + net45;netstandard1.3 + Serilog.Enrichers.Environment + ../../assets/Serilog.snk + true + true + Serilog.Enrichers.Environment + serilog;machine;enricher + http://serilog.net/images/serilog-enricher-nuget.png + http://serilog.net + http://www.apache.org/licenses/LICENSE-2.0 + false + + + + + + + + + + + + + $(DefineConstants);ENV_USER_NAME + + + diff --git a/src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.xproj b/src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.xproj deleted file mode 100644 index eb7350f..0000000 --- a/src/Serilog.Enrichers.Environment/Serilog.Enrichers.Environment.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b884782d-6c07-4779-9074-d97f622799a9 - Serilog - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Serilog.Enrichers.Environment/project.json b/src/Serilog.Enrichers.Environment/project.json deleted file mode 100644 index d382420..0000000 --- a/src/Serilog.Enrichers.Environment/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "2.1.3-*", - "description": "Enrich Serilog log events with properties from System.Environment.", - "authors": [ - "Serilog Contributors" - ], - "packOptions": { - "tags": [ - "serilog", - "machine", - "enricher" - ], - "projectUrl": "http://serilog.net", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "http://serilog.net/images/serilog-enricher-nuget.png" - }, - "dependencies": { - "Serilog": "2.0.0" - }, - "buildOptions": { - "keyFile": "../../assets/Serilog.snk" - - }, - "frameworks": { - "net4.5": { - "buildOptions": { - "define": [ "ENV_USER_NAME" ] - } - }, - "netstandard1.3": { - } - } -} diff --git a/test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.Tests.csproj b/test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.Tests.csproj new file mode 100644 index 0000000..3bbac4b --- /dev/null +++ b/test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.Tests.csproj @@ -0,0 +1,38 @@ + + + + netcoreapp1.0;net46 + Serilog.Enrichers.Environment.Tests + ../../assets/Serilog.snk + true + true + Serilog.Enrichers.Environment.Tests + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.Tests.xproj b/test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.Tests.xproj deleted file mode 100644 index 9d62b3f..0000000 --- a/test/Serilog.Enrichers.Environment.Tests/Serilog.Enrichers.Environment.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.Enrichers.Environment.Tests/project.json b/test/Serilog.Enrichers.Environment.Tests/project.json deleted file mode 100644 index 1e809cf..0000000 --- a/test/Serilog.Enrichers.Environment.Tests/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "testRunner": "xunit", - "dependencies": { - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-*", - "Serilog.Enrichers.Environment": { - "target": "project" - } - }, - "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": {} - } -} \ No newline at end of file From 1b854ccc79d3beeaf8766057f7db1f0018865548 Mon Sep 17 00:00:00 2001 From: osudude Date: Wed, 16 Aug 2017 08:45:14 -0500 Subject: [PATCH 2/2] Fix build script --- appveyor.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 19d0d28..830f3be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,10 @@ version: '{build}' skip_tags: true -image: Visual Studio 2015 +image: Visual Studio 2017 configuration: Release install: - ps: mkdir -Force ".\build\" | Out-Null - - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1" - - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli" - - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121' - - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" + build_script: - ps: ./Build.ps1 test: off