Rework project structure, removing cruft

SuaveIO · Apr 22, 2018 · 82d3651 · 82d3651
1 parent 3aad042
commit 82d3651
Show file tree

Hide file tree

Showing 96 changed files with 1,945 additions and 9,053 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.6.1-api
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 bin/
 obj/
+.idea/
 packages/
 build/
 gh-pages/

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -48,16 +48,16 @@
 
     <!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
     <PropertyGroup>
-        <PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
-        <PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
+      <PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
+      <PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
     </PropertyGroup>
 
     <!-- If shasum and awk exist get the hashes -->
     <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
-        <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
+      <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
     </Exec>
     <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
-        <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
+      <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
     </Exec>
 
     <PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
@@ -127,6 +127,7 @@
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
         <PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
+        <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
       </PackageReference>
     </ItemGroup>
 
@@ -183,8 +184,8 @@
 
     <ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
       <Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
-    </ConvertToAbsolutePath>      
-        
+    </ConvertToAbsolutePath>
+
 
     <!-- Call Pack -->
     <PackTask Condition="$(UseNewPack)"

diff --git a/.semver b/.semver
@@ -1,6 +1,6 @@
 ---
 :major: 2
-:minor: 3
+:minor: 4
 :patch: 0
 :special: ''
 :metadata: ''
diff --git a/.travis.yml b/.travis.yml
@@ -1,27 +1,41 @@
----
 language: csharp
-
-os:
-  - linux
-  - osx
-
 dist: trusty
-
+sudo: false
 dotnet: 2.0.3
 
-mono:
- - 5.4.0
- - 5.4.1
- - latest # => "stable release"
- - weekly # => "latest commits"
+matrix:
+  fast_finish: true
+
+  include:
+    - os: linux
+      mono: 5.8.1
+    - os: linux
+      mono: weekly
+    - os: linux
+      mono: latest
+    - os: osx
+      osx_image: xcode9.3
+      mono: 5.4.1
+    - os: osx
+      osx_image: xcode9.3
+      mono: 5.8.1
+    - os: osx
+      osx_image: xcode9.3
+      mono: latest
 
-install:
- - rvm install 2.2.3
- - gem install bundler
- - if [ "$TRAVIS_OS_NAME" == "linux" ];
-   then sudo apt-get update -y;
-   else brew update;
-   fi
+  allow_failures:
+    - mono: weekly # latest commit
+    - mono: latest # "stable" release
+
+addons:
+  apt:
+    packages:
+    - dotnet-sharedframework-microsoft.netcore.app-1.1.2
+
+env:
+  global:
+    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
 before_script:
  - if [ "$TRAVIS_OS_NAME" == "linux" ];
@@ -30,9 +44,4 @@ before_script:
    fi
 
 script:
- - bundle && bundle exec rake ci
-
-matrix:
-  allow_failures:
-    - mono: latest
-    - mono: weekly
+  - ./build.sh
diff --git a/Dockerfile b/Dockerfile
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/COPYING → LICENSE b/COPYING → LICENSE
@@ -1,4 +1,4 @@
-Copyright 2014 Ademar Gonzalez, Henrik Feldt and contributors
+Copyright 2018 Ademar Gonzalez, Henrik Feldt and contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/Suave.sln b/Suave.sln
@@ -0,0 +1,182 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.25807.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{F0556ECB-F98B-4072-8A79-F02C3862138D}"
+	ProjectSection(SolutionItems) = preProject
+		.\paket.dependencies = .\paket.dependencies
+		.\paket.lock = .\paket.lock
+	EndProjectSection
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave", "src\Suave\Suave.fsproj", "{3DC9193E-BD0C-4486-9C58-56B630C36623}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.Tests", "src\Suave.Tests\Suave.Tests.fsproj", "{3BE234C3-2BD4-4E53-9D11-7C134374500D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{C7760769-4E33-4A06-BB7C-39B477B4FF1B}"
+	ProjectSection(SolutionItems) = preProject
+		.\.editorconfig = .\.editorconfig
+		.\README.md = .\README.md
+	EndProjectSection
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.Experimental", "src\Experimental\Suave.Experimental.fsproj", "{488FC139-5013-46A2-9982-2C40A6F1F777}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{E05A9F83-E283-4258-AB0E-AF626002B6EF}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Example", ".\examples\Example\Example.fsproj", "{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Pong", ".\examples\Pong\Pong.fsproj", "{68D30567-3281-41FB-BD69-30FB32196B79}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Load", ".\examples\Load\Load.fsproj", "{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fibonacci", ".\examples\Fibonacci\Fibonacci.fsproj", "{616F83DA-1EFA-436B-8E7F-8624C7606547}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WebSocket", ".\examples\WebSocket\WebSocket.fsproj", "{34062010-BC9D-4DEB-804D-CC8D1D109876}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "OwinServerFactory", ".\examples\OwinServerFactory\OwinServerFactory.fsproj", "{D6F30DFF-587D-4476-ACEF-6AC8681256F3}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CORS", ".\examples\CORS\CORS.fsproj", "{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.DotLiquid", "src\Suave.DotLiquid\Suave.DotLiquid.fsproj", "{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.LibUv", "src\Suave.LibUv\Suave.LibUv.fsproj", "{7C787110-A146-4021-8163-40137E325DB4}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SignalRDemo", ".\examples\SignalRDemo\SignalRDemo.fsproj", "{FD72158A-6569-499C-953E-79CE0539D2D8}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.IO", "src\Suave.IO\Suave.IO.fsproj", "{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Debug|x86.ActiveCfg = Debug|x86
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Debug|x86.Build.0 = Debug|x86
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Release|x86.ActiveCfg = Release|x86
+		{3DC9193E-BD0C-4486-9C58-56B630C36623}.Release|x86.Build.0 = Release|x86
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Debug|x86.ActiveCfg = Debug|x86
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Debug|x86.Build.0 = Debug|x86
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Release|x86.ActiveCfg = Release|x86
+		{3BE234C3-2BD4-4E53-9D11-7C134374500D}.Release|x86.Build.0 = Release|x86
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Debug|x86.ActiveCfg = Debug|x86
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Debug|x86.Build.0 = Debug|x86
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Release|Any CPU.Build.0 = Release|Any CPU
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Release|x86.ActiveCfg = Release|x86
+		{488FC139-5013-46A2-9982-2C40A6F1F777}.Release|x86.Build.0 = Release|x86
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Debug|x86.ActiveCfg = Debug|x86
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Debug|x86.Build.0 = Debug|x86
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Release|x86.ActiveCfg = Release|x86
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0}.Release|x86.Build.0 = Release|x86
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Debug|x86.ActiveCfg = Debug|x86
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Debug|x86.Build.0 = Debug|x86
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Release|x86.ActiveCfg = Release|x86
+		{68D30567-3281-41FB-BD69-30FB32196B79}.Release|x86.Build.0 = Release|x86
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Debug|x86.ActiveCfg = Debug|x86
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Debug|x86.Build.0 = Debug|x86
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Release|x86.ActiveCfg = Release|x86
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC}.Release|x86.Build.0 = Release|x86
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Debug|x86.ActiveCfg = Debug|x86
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Debug|x86.Build.0 = Debug|x86
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Release|Any CPU.Build.0 = Release|Any CPU
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Release|x86.ActiveCfg = Release|x86
+		{616F83DA-1EFA-436B-8E7F-8624C7606547}.Release|x86.Build.0 = Release|x86
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Debug|x86.ActiveCfg = Debug|x86
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Debug|x86.Build.0 = Debug|x86
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Release|x86.ActiveCfg = Release|x86
+		{34062010-BC9D-4DEB-804D-CC8D1D109876}.Release|x86.Build.0 = Release|x86
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3}.Release|x86.Build.0 = Release|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Debug|x86.Build.0 = Debug|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Release|x86.ActiveCfg = Release|Any CPU
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494}.Release|x86.Build.0 = Release|Any CPU
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Debug|x86.ActiveCfg = Debug|x86
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Debug|x86.Build.0 = Debug|x86
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Release|x86.ActiveCfg = Release|x86
+		{4E3FE86D-FDB7-4DAA-8D58-13F06F75D240}.Release|x86.Build.0 = Release|x86
+		{7C787110-A146-4021-8163-40137E325DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C787110-A146-4021-8163-40137E325DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C787110-A146-4021-8163-40137E325DB4}.Debug|x86.ActiveCfg = Debug|x86
+		{7C787110-A146-4021-8163-40137E325DB4}.Debug|x86.Build.0 = Debug|x86
+		{7C787110-A146-4021-8163-40137E325DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C787110-A146-4021-8163-40137E325DB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C787110-A146-4021-8163-40137E325DB4}.Release|x86.ActiveCfg = Release|x86
+		{7C787110-A146-4021-8163-40137E325DB4}.Release|x86.Build.0 = Release|x86
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD72158A-6569-499C-953E-79CE0539D2D8}.Release|x86.Build.0 = Release|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Debug|x86.Build.0 = Debug|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Release|x86.ActiveCfg = Release|Any CPU
+		{614E13B0-E2AE-4E59-8CF0-D80235BBC04C}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{6BACAAA2-C717-4B6E-93FC-1B54126F91B0} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+		{68D30567-3281-41FB-BD69-30FB32196B79} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+		{F7E7DAB3-1823-4038-96D8-3A29A82D3AAC} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+		{616F83DA-1EFA-436B-8E7F-8624C7606547} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+		{34062010-BC9D-4DEB-804D-CC8D1D109876} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+		{D6F30DFF-587D-4476-ACEF-6AC8681256F3} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+		{00ED9182-F5D5-4A56-B0E2-D6C1CA841494} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+		{FD72158A-6569-499C-953E-79CE0539D2D8} = {E05A9F83-E283-4258-AB0E-AF626002B6EF}
+	EndGlobalSection
+EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,12 @@
-os: Visual Studio 2017
+image:
+  - Visual Studio 2015
+  - Visual Studio 2017
+
+build_script:
+  - cmd: build.cmd
+
 init:
   - git config --global core.autocrlf input
-version: 2.0.{build}
 
 environment:
   matrix:
@@ -11,16 +16,6 @@ environment:
    - arch: "x64"
      MSBUILD_PLATFORM: "Any CPU"
      PATH: '%USERPROFILE%\.nuget\packages\libuv\1.10.0\runtimes\win-x64\native;%PATH%'
-
-install:
- - set PATH=C:\Ruby22\bin;%PATH% # use Ruby 2.2.6
- - cmd: ruby --version
-
-build_script:
- - cmd: gem sources -r https://rubygems.org/
- - cmd: gem install bundler --no-ri --no-rdoc --source https://rubygems.org/ --conservative
- - cmd: bundle install
- - cmd: bundle exec rake ci
 
 artifacts:
  - path: build\pkg\*.nupkg