From 14027f4be3cc845aa6d2f487e721bf96033e00ee Mon Sep 17 00:00:00 2001 From: Alexandre Mutel Date: Sat, 6 May 2017 15:41:07 +0200 Subject: [PATCH] Migrate to VS2017 - dotnet new csproj --- appveyor.yml | 41 ++++++++++ .../Markdig.Benchmarks.nuget.targets | 15 +++- src/Markdig.Tests/Markdig.Tests.csproj | 10 ++- src/Markdig.WebApp/Markdig.WebApp.csproj | 36 +++++++++ src/Markdig.WebApp/Markdig.WebApp.xproj | 19 ----- src/Markdig.WebApp/project.json | 58 -------------- src/Markdig/Markdig.csproj | 78 +++++++++++++++++++ src/Markdig/Markdig.xproj | 21 ----- src/Markdig/Markdig.xproj.DotSettings | 2 - src/Markdig/Markdown.cs | 7 ++ src/Markdig/Properties/AssemblyInfo.cs | 30 ------- src/Markdig/project.json | 68 ---------------- src/global.json | 5 -- src/markdig.sln | 20 ++--- 14 files changed, 190 insertions(+), 220 deletions(-) create mode 100644 appveyor.yml create mode 100644 src/Markdig.WebApp/Markdig.WebApp.csproj delete mode 100644 src/Markdig.WebApp/Markdig.WebApp.xproj delete mode 100644 src/Markdig.WebApp/project.json create mode 100644 src/Markdig/Markdig.csproj delete mode 100644 src/Markdig/Markdig.xproj delete mode 100644 src/Markdig/Markdig.xproj.DotSettings delete mode 100644 src/Markdig/Properties/AssemblyInfo.cs delete mode 100644 src/Markdig/project.json delete mode 100644 src/global.json diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..9b84f0dd --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,41 @@ +version: 10.0.{build} +image: Visual Studio 2017 +configuration: Release +install: +- ps: >- + cd src + + nuget restore Markdig.sln + + $env:MARKDIG_BUILD_NUMBER = ([int]$env:APPVEYOR_BUILD_NUMBER).ToString("000") + + $env:MARKDIG_VERSION_SUFFIX = "" + + $env:appveyor_nuget_push = 'false' + + if(-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { + if($env:appveyor_repo_tag -eq 'True') { + if($env:appveyor_repo_tag_name -match '^v[0-9]') { + $env:appveyor_nuget_push = 'true' + $env:MARKDIG_VERSION_SUFFIX = "" + } + if($env:appveyor_repo_tag_name -eq 'latest') { + $env:appveyor_nuget_push = 'true' + $env:MARKDIG_VERSION_SUFFIX = "pre$env:MARKDIG_BUILD_NUMBER" + } + } + } +build: + project: src/Markdig.sln + verbosity: minimal +before_package: +- cmd: msbuild /t:pack /p:VersionSuffix="%MARKDIG_VERSION_SUFFIX%" /p:Configuration=Release Markdig/Markdig.csproj +artifacts: +- path: src\Markdig\Bin\Release\*.nupkg + name: Markdig Nugets +deploy: +- provider: NuGet + api_key: + secure: 7cthHh+wYWZjhqxaxR6QObRaRnstvFkQOY7MkxIsC5kpQEBlKZXuinf0IybbYxJt + on: + appveyor_nuget_push: true \ No newline at end of file diff --git a/src/Markdig.Benchmarks/Markdig.Benchmarks.nuget.targets b/src/Markdig.Benchmarks/Markdig.Benchmarks.nuget.targets index 0a847c72..cab1eedf 100644 --- a/src/Markdig.Benchmarks/Markdig.Benchmarks.nuget.targets +++ b/src/Markdig.Benchmarks/Markdig.Benchmarks.nuget.targets @@ -1,9 +1,18 @@  - - $(UserProfile)\.nuget\packages\ + + True + NuGet + C:\Code\lunet\markdig\src\Markdig.Benchmarks\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\alexa\.nuget\packages\ + ProjectJson + 4.1.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + \ No newline at end of file diff --git a/src/Markdig.Tests/Markdig.Tests.csproj b/src/Markdig.Tests/Markdig.Tests.csproj index af5cc736..1f6793d6 100644 --- a/src/Markdig.Tests/Markdig.Tests.csproj +++ b/src/Markdig.Tests/Markdig.Tests.csproj @@ -39,10 +39,6 @@ - - False - ..\Markdig\Bin\$(Configuration)\net40\Markdig.dll - @@ -109,6 +105,12 @@ + + + {8a58a7e2-627c-4f41-933f-5ac92adfab48} + Markdig + +