From e0a3f89805aa1bd3505ced18131a9adf355afdb1 Mon Sep 17 00:00:00 2001 From: Andrew McClenaghan Date: Sat, 15 Apr 2017 19:33:43 +1000 Subject: [PATCH 1/2] Update to VS2017 Project Format --- example/SeqQuery/SeqQuery.csproj | 29 +++++++++++++ example/SeqQuery/project.json | 28 ------------- example/SeqQuery/seq-query.xproj | 19 --------- example/SeqTail/SeqTail.csproj | 35 ++++++++++++++++ example/SeqTail/project.json | 35 ---------------- example/SeqTail/seq-tail.xproj | 19 --------- example/SignalCopy/SignalCopy.csproj | 29 +++++++++++++ example/SignalCopy/project.json | 28 ------------- example/SignalCopy/signal-copy.xproj | 19 --------- global.json | 6 --- seq-api.sln | 15 ++++--- src/Seq.Api/Seq.Api.csproj | 45 +++++++++++++++++++++ src/Seq.Api/Seq.Api.xproj | 19 --------- src/Seq.Api/project.json | 54 ------------------------- test/Seq.Api.Tests/Seq.Api.Tests.csproj | 30 ++++++++++++++ test/Seq.Api.Tests/Seq.Api.Tests.xproj | 22 ---------- test/Seq.Api.Tests/project.json | 25 ------------ 17 files changed, 175 insertions(+), 282 deletions(-) create mode 100644 example/SeqQuery/SeqQuery.csproj delete mode 100644 example/SeqQuery/project.json delete mode 100644 example/SeqQuery/seq-query.xproj create mode 100644 example/SeqTail/SeqTail.csproj delete mode 100644 example/SeqTail/project.json delete mode 100644 example/SeqTail/seq-tail.xproj create mode 100644 example/SignalCopy/SignalCopy.csproj delete mode 100644 example/SignalCopy/project.json delete mode 100644 example/SignalCopy/signal-copy.xproj delete mode 100644 global.json create mode 100644 src/Seq.Api/Seq.Api.csproj delete mode 100644 src/Seq.Api/Seq.Api.xproj delete mode 100644 src/Seq.Api/project.json create mode 100644 test/Seq.Api.Tests/Seq.Api.Tests.csproj delete mode 100644 test/Seq.Api.Tests/Seq.Api.Tests.xproj delete mode 100644 test/Seq.Api.Tests/project.json diff --git a/example/SeqQuery/SeqQuery.csproj b/example/SeqQuery/SeqQuery.csproj new file mode 100644 index 0000000..7a9f0bd --- /dev/null +++ b/example/SeqQuery/SeqQuery.csproj @@ -0,0 +1,29 @@ + + + + net46;netcoreapp1.0 + seq-query + Exe + SeqQuery + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + + + + + + + + + + + + + + + + + + + + diff --git a/example/SeqQuery/project.json b/example/SeqQuery/project.json deleted file mode 100644 index 3ec11f7..0000000 --- a/example/SeqQuery/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "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.xproj b/example/SeqQuery/seq-query.xproj deleted file mode 100644 index a1222c2..0000000 --- a/example/SeqQuery/seq-query.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 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/SeqTail.csproj b/example/SeqTail/SeqTail.csproj new file mode 100644 index 0000000..2405320 --- /dev/null +++ b/example/SeqTail/SeqTail.csproj @@ -0,0 +1,35 @@ + + + + net46;netcoreapp1.0 + seq-tail + Exe + SeqTail + win + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/SeqTail/project.json b/example/SeqTail/project.json deleted file mode 100644 index f4197f9..0000000 --- a/example/SeqTail/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "outputName": "seq-tail" - }, - - "dependencies": { - "System.Threading.Tasks": "4.0.11", - "Seq.Api": { "target": "project" }, - "docopt.net": "0.6.1.9", - "Serilog.Formatting.Compact.Reader": "1.0.0-dev-00008", - "Serilog.Sinks.Literate": "2.0.0", - "System.Reactive": "3.0.0", - "Newtonsoft.Json": "9.0.1" - }, - - "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.xproj b/example/SeqTail/seq-tail.xproj deleted file mode 100644 index 68617d0..0000000 --- a/example/SeqTail/seq-tail.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 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/example/SignalCopy/SignalCopy.csproj b/example/SignalCopy/SignalCopy.csproj new file mode 100644 index 0000000..ca49fbe --- /dev/null +++ b/example/SignalCopy/SignalCopy.csproj @@ -0,0 +1,29 @@ + + + + net46;netcoreapp1.0 + signal-copy + Exe + SignalCopy + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + + + + + + + + + + + + + + + + + + + + diff --git a/example/SignalCopy/project.json b/example/SignalCopy/project.json deleted file mode 100644 index 56ca860..0000000 --- a/example/SignalCopy/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "outputName": "signal-copy" - }, - - "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/SignalCopy/signal-copy.xproj b/example/SignalCopy/signal-copy.xproj deleted file mode 100644 index 88b89fc..0000000 --- a/example/SignalCopy/signal-copy.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e8cdde17-8e29-4eb4-a4bb-38bce346a752 - SignalCopy - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index e793049..0000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview2-003121" - } -} diff --git a/seq-api.sln b/seq-api.sln index 2fc6982..9abcb17 100644 --- a/seq-api.sln +++ b/seq-api.sln @@ -1,7 +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.26403.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B36BE973-6D5B-4DAA-BF42-F1CF11D6F18E}" EndProject @@ -16,22 +16,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{7DCED6 ProjectSection(SolutionItems) = preProject appveyor.yml = appveyor.yml Build.ps1 = Build.ps1 - global.json = global.json LICENSE = LICENSE README.md = README.md EndProjectSection EndProject 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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seq.Api", "src\Seq.Api\Seq.Api.csproj", "{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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seq.Api.Tests", "test\Seq.Api.Tests\Seq.Api.Tests.csproj", "{CD473266-4AED-4207-89FD-0B185239F1C7}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "seq-query", "example\SeqQuery\seq-query.xproj", "{34BBD428-8297-484E-B771-0B72C172C264}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SeqQuery", "example\SeqQuery\SeqQuery.csproj", "{34BBD428-8297-484E-B771-0B72C172C264}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "seq-tail", "example\SeqTail\seq-tail.xproj", "{42CEBFBA-208F-40F1-AC95-13F05F6D5412}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SeqTail", "example\SeqTail\SeqTail.csproj", "{42CEBFBA-208F-40F1-AC95-13F05F6D5412}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "signal-copy", "example\SignalCopy\signal-copy.xproj", "{E8CDDE17-8E29-4EB4-A4BB-38BCE346A752}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalCopy", "example\SignalCopy\SignalCopy.csproj", "{E8CDDE17-8E29-4EB4-A4BB-38BCE346A752}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Seq.Api/Seq.Api.csproj b/src/Seq.Api/Seq.Api.csproj new file mode 100644 index 0000000..37c7046 --- /dev/null +++ b/src/Seq.Api/Seq.Api.csproj @@ -0,0 +1,45 @@ + + + + Client library for the Seq HTTP API. + 3.4.4 + Datalust;Contributors + netstandard1.3;net45 + $(NoWarn);CS1591 + true + true + Seq.Api + Seq.Api + seq + https://getseq.net/images/seq-nuget.pngg + https://github.com/datalust/seq-api + http://www.apache.org/licenses/LICENSE-2.0 + 1.6.0 + false + false + false + false + false + false + false + false + + + + + + + + + + + + + + + + + + + + diff --git a/src/Seq.Api/Seq.Api.xproj b/src/Seq.Api/Seq.Api.xproj deleted file mode 100644 index 75ec30c..0000000 --- a/src/Seq.Api/Seq.Api.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d4e037de-9778-4e48-a4a7-e8c1751e637c - Seq - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Seq.Api/project.json b/src/Seq.Api/project.json deleted file mode 100644 index 7261af4..0000000 --- a/src/Seq.Api/project.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "version": "3.4.4-*", - - "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, - "xmlDoc": true, - "nowarn": ["CS1591"] - }, - - "configurations": { - "Debug": { - "buildOptions": { - "define": [ "DEBUG", "TRACE" ] - } - }, - "Release": { - "buildOptions": { - "define": [ "RELEASE", "TRACE" ], - "optimize": true - } - } - }, - - "dependencies": { - "Newtonsoft.Json": "9.0.1", - "Tavis.UriTemplates": "1.1.0" - }, - - "frameworks": { - "netstandard1.3": { - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Collections.Concurrent": "4.0.12", - "System.Net.Http": "4.1.0", - "System.Net.WebSockets.Client": "4.0.0" - } - }, - "net4.5": { - "frameworkAssemblies": { - "System.Net.Http": "" - } - } - } -} diff --git a/test/Seq.Api.Tests/Seq.Api.Tests.csproj b/test/Seq.Api.Tests/Seq.Api.Tests.csproj new file mode 100644 index 0000000..a59242f --- /dev/null +++ b/test/Seq.Api.Tests/Seq.Api.Tests.csproj @@ -0,0 +1,30 @@ + + + + netcoreapp1.0;net46 + Seq.Api.Tests + Seq.Api.Tests + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + false + false + false + + + + + + + + + + + + + + + + + + diff --git a/test/Seq.Api.Tests/Seq.Api.Tests.xproj b/test/Seq.Api.Tests/Seq.Api.Tests.xproj deleted file mode 100644 index eeae732..0000000 --- a/test/Seq.Api.Tests/Seq.Api.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 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 deleted file mode 100644 index 0c65901..0000000 --- a/test/Seq.Api.Tests/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "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": {} - } -} From fcc8eb8f95f4f68e870a13eebda452e9607ed498 Mon Sep 17 00:00:00 2001 From: Andrew McClenaghan Date: Sat, 15 Apr 2017 19:39:40 +1000 Subject: [PATCH 2/2] Update Image to VS2017 --- appveyor.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 73801aa..a485dc2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,8 @@ 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