diff --git a/Octokit-Mono.sln b/Octokit-Mono.sln
deleted file mode 100644
index 50b39d264f..0000000000
--- a/Octokit-Mono.sln
+++ /dev/null
@@ -1,59 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit", "Octokit\Octokit.csproj", "{08DD4305-7787-4823-A53F-4D0F725A07F3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Portable", "Octokit\Octokit-Portable.csproj", "{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Mono", "Octokit\Octokit-Mono.csproj", "{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive", "Octokit.Reactive\Octokit.Reactive.csproj", "{674B69B8-0780-4D54-AE2B-C15821FA51CB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive-Mono", "Octokit.Reactive\Octokit.Reactive-Mono.csproj", "{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests", "Octokit.Tests\Octokit.Tests.csproj", "{149448D4-C2F2-4DF9-86BD-03E3272F093B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests-Portable", "Octokit.Tests\Octokit.Tests-Portable.csproj", "{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests.Conventions", "Octokit.Tests.Conventions\Octokit.Tests.Conventions.csproj", "{5345E2E6-4E7C-40F8-831B-E491F6051D3C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|x86.Build.0 = Debug|Any CPU
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Release|x86.ActiveCfg = Release|Any CPU
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Release|x86.Build.0 = Release|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Debug|x86.Build.0 = Debug|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Release|x86.ActiveCfg = Release|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Release|x86.Build.0 = Release|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.Build.0 = Debug|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.ActiveCfg = Release|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.Build.0 = Release|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Release|x86.Build.0 = Release|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.Build.0 = Debug|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.ActiveCfg = Release|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.Build.0 = Release|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Debug|x86.Build.0 = Debug|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x86.Build.0 = Release|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Debug|x86.Build.0 = Debug|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Release|x86.ActiveCfg = Release|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Release|x86.Build.0 = Release|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Debug|x86.Build.0 = Debug|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Release|x86.ActiveCfg = Release|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/Octokit-XamarinStudio.sln b/Octokit-XamarinStudio.sln
deleted file mode 100644
index 87a2a3ec46..0000000000
--- a/Octokit-XamarinStudio.sln
+++ /dev/null
@@ -1,83 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-MonoAndroid", "Octokit\Octokit-MonoAndroid.csproj", "{B24FC6FA-B80C-4EC7-8AFF-05DE2C923869}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive-MonoAndroid", "Octokit.Reactive\Octokit.Reactive-MonoAndroid.csproj", "{B24FC6FF-0801-4FC7-8AFF-05DE2C923869}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Monotouch", "Octokit\Octokit-Monotouch.csproj", "{E4AD1421-8844-4236-9A0B-C4D96AF53908}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive-Monotouch", "Octokit.Reactive\Octokit.Reactive-Monotouch.csproj", "{F4ADA431-8344-4B36-9A0B-C4D96AF53908}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Mono", "Octokit\Octokit-Mono.csproj", "{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive-Mono", "Octokit.Reactive\Octokit.Reactive-Mono.csproj", "{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B24FC6FA-B80C-4EC7-8AFF-05DE2C923869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B24FC6FA-B80C-4EC7-8AFF-05DE2C923869}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B24FC6FA-B80C-4EC7-8AFF-05DE2C923869}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B24FC6FA-B80C-4EC7-8AFF-05DE2C923869}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B24FC6FF-0801-4FC7-8AFF-05DE2C923869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B24FC6FF-0801-4FC7-8AFF-05DE2C923869}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B24FC6FF-0801-4FC7-8AFF-05DE2C923869}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B24FC6FF-0801-4FC7-8AFF-05DE2C923869}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4AD1421-8844-4236-9A0B-C4D96AF53908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4AD1421-8844-4236-9A0B-C4D96AF53908}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4AD1421-8844-4236-9A0B-C4D96AF53908}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4AD1421-8844-4236-9A0B-C4D96AF53908}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4ADA431-8344-4B36-9A0B-C4D96AF53908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4ADA431-8344-4B36-9A0B-C4D96AF53908}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4ADA431-8344-4B36-9A0B-C4D96AF53908}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4ADA431-8344-4B36-9A0B-C4D96AF53908}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Octokit\Octokit-MonoAndroid.csproj
-		Policies = $0
-		$0.TextStylePolicy = $1
-		$1.inheritsSet = VisualStudio
-		$1.inheritsScope = text/plain
-		$1.scope = text/plain
-		$0.CSharpFormattingPolicy = $2
-		$2.IndentSwitchBody = True
-		$2.IndentBlocksInsideExpressions = True
-		$2.AnonymousMethodBraceStyle = NextLine
-		$2.PropertyBraceStyle = NextLine
-		$2.PropertyGetBraceStyle = NextLine
-		$2.PropertySetBraceStyle = NextLine
-		$2.EventBraceStyle = NextLine
-		$2.EventAddBraceStyle = NextLine
-		$2.EventRemoveBraceStyle = NextLine
-		$2.StatementBraceStyle = NextLine
-		$2.ElseNewLinePlacement = NewLine
-		$2.CatchNewLinePlacement = NewLine
-		$2.FinallyNewLinePlacement = NewLine
-		$2.WhileNewLinePlacement = DoNotCare
-		$2.ArrayInitializerWrapping = DoNotChange
-		$2.ArrayInitializerBraceStyle = NextLine
-		$2.BeforeMethodDeclarationParentheses = False
-		$2.BeforeMethodCallParentheses = False
-		$2.BeforeConstructorDeclarationParentheses = False
-		$2.NewLineBeforeConstructorInitializerColon = NewLine
-		$2.NewLineAfterConstructorInitializerColon = SameLine
-		$2.BeforeDelegateDeclarationParentheses = False
-		$2.NewParentheses = False
-		$2.SpacesBeforeBrackets = False
-		$2.inheritsSet = Mono
-		$2.inheritsScope = text/x-csharp
-		$2.scope = text/x-csharp
-	EndGlobalSection
-EndGlobal
diff --git a/Octokit.Core.sln b/Octokit.Core.sln
deleted file mode 100644
index 035fbc0a0b..0000000000
--- a/Octokit.Core.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit", "Octokit\Octokit.xproj", "{104E8324-C2B9-43BE-8040-36B736A64D45}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Reactive", "Octokit.Reactive\Octokit.Reactive.xproj", "{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Tests", "Octokit.Tests\Octokit.Tests.xproj", "{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Tests.Conventions", "Octokit.Tests.Conventions\Octokit.Tests.Conventions.xproj", "{A04124DC-D057-4DB0-8E5F-ECD114FA371A}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Tests.Integration", "Octokit.Tests.Integration\Octokit.Tests.Integration.xproj", "{EF19E577-D810-4357-BF95-9029A359CB4E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{104E8324-C2B9-43BE-8040-36B736A64D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{104E8324-C2B9-43BE-8040-36B736A64D45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{104E8324-C2B9-43BE-8040-36B736A64D45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{104E8324-C2B9-43BE-8040-36B736A64D45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF19E577-D810-4357-BF95-9029A359CB4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF19E577-D810-4357-BF95-9029A359CB4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF19E577-D810-4357-BF95-9029A359CB4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF19E577-D810-4357-BF95-9029A359CB4E}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Octokit.Reactive.nuspec b/Octokit.Reactive.nuspec
deleted file mode 100644
index 260c104509..0000000000
--- a/Octokit.Reactive.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>@project@</id>
-    <version>@build.number@</version>
-    <authors>@authors@</authors>
-    <owners>@authors@</owners>
-    <summary>@summary@</summary>
-    <licenseUrl>https://github.com/octokit/octokit.net/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/octokit/octokit.net</projectUrl>
-    <iconUrl>https://f.cloud.github.com/assets/19977/1510987/64af2b26-4a9d-11e3-89fc-96a185171c75.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>@description@</description>
-    <releaseNotes>@releaseNotes@</releaseNotes>
-    <copyright>Copyright GitHub 2013</copyright>
-    <tags>GitHub API Octokit linqpad-samples</tags>
-    @dependencies@
-  </metadata>
-</package>
diff --git a/Octokit.Reactive/project.json b/Octokit.Reactive/project.json
index 1de32a8aeb..0da760646e 100644
--- a/Octokit.Reactive/project.json
+++ b/Octokit.Reactive/project.json
@@ -13,7 +13,10 @@
         "../Octokit/Helpers/Ensure.cs",
         "../Octokit/Helpers/Pagination.cs"
       ]
-    }
+    },
+    "additionalArguments": [
+      "/ruleset:../Octokit.ruleset"
+    ]
   },
   "packOptions": {
     "summary": "An IObservable based GitHub API client library for .NET using Reactive Extensions"
diff --git a/Octokit.nuspec b/Octokit.nuspec
deleted file mode 100644
index b947fcf6da..0000000000
--- a/Octokit.nuspec
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>@project@</id>
-    <version>@build.number@</version>
-    <authors>@authors@</authors>
-    <owners>@authors@</owners>
-    <summary>@summary@</summary>
-    <licenseUrl>https://github.com/octokit/octokit.net/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/octokit/octokit.net</projectUrl>
-    <iconUrl>https://f.cloud.github.com/assets/19977/1441274/160fba8c-41a9-11e3-831d-61d88fa886f4.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>@description@</description>
-    <releaseNotes>@releaseNotes@</releaseNotes>
-    <copyright>Copyright GitHub 2013</copyright>
-    <tags>GitHub API Octokit linqpad-samples</tags>
-    <dependencies>
-      <group>
-        <dependency id="Microsoft.Net.Http" />
-      </group>
-      <group targetFramework="net45">
-      </group>
-      <group targetFramework="netcore45">
-      </group>
-      <group targetFramework="portable-win81+wpa81">
-      </group>
-    </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System" targetFramework="net45" />
-      <frameworkAssembly assemblyName="System.Net.Http" targetFramework="net45, netcore45" />
-    </frameworkAssemblies>
-  </metadata>
-</package>
diff --git a/Octokit.ruleset b/Octokit.ruleset
index 677c8b385d..ede9126ea2 100644
--- a/Octokit.ruleset
+++ b/Octokit.ruleset
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="GitHub" Description="This ruleset only includes the rules we care about. I'll be adding new ones as we fix our codebase." ToolsVersion="11.0">
+<RuleSet Name="GitHub" Description="This ruleset enables all of the Microsoft CodeAnalysis rules, with a few deliberate exceptions" ToolsVersion="14.0">
   <IncludeAll Action="Error" />
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA1006" Action="None" />
     <Rule Id="CA1014" Action="None" />
     <Rule Id="CA1020" Action="None" />
+    <Rule Id="CA1054" Action="None" />
     <Rule Id="CA1056" Action="None" />
     <Rule Id="CA1726" Action="None" />
     <Rule Id="CA2210" Action="None" />
-    <Rule Id="CA1054" Action="None" />
   </Rules>
 </RuleSet>
\ No newline at end of file
diff --git a/Octokit.sln b/Octokit.sln
index 207fab8235..035fbc0a0b 100644
--- a/Octokit.sln
+++ b/Octokit.sln
@@ -3,48 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit", "Octokit\Octokit.csproj", "{08DD4305-7787-4823-A53F-4D0F725A07F3}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit", "Octokit\Octokit.xproj", "{104E8324-C2B9-43BE-8040-36B736A64D45}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests", "Octokit.Tests\Octokit.Tests.csproj", "{149448D4-C2F2-4DF9-86BD-03E3272F093B}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Reactive", "Octokit.Reactive\Octokit.Reactive.xproj", "{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests.Integration", "Octokit.Tests.Integration\Octokit.Tests.Integration.csproj", "{01687D54-1D87-4562-A721-C57F1C94052C}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Tests", "Octokit.Tests\Octokit.Tests.xproj", "{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CEC9D451-6291-4EDF-971A-D398144FBF96}"
-	ProjectSection(SolutionItems) = preProject
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		appveyor.yml = appveyor.yml
-		build.cmd = build.cmd
-		build.fsx = build.fsx
-		script\cibuild.ps1 = script\cibuild.ps1
-		CustomDictionary.xml = CustomDictionary.xml
-		octokit.nuspec = octokit.nuspec
-		Octokit.Reactive.nuspec = Octokit.Reactive.nuspec
-		Octokit.ruleset = Octokit.ruleset
-	EndProjectSection
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Tests.Conventions", "Octokit.Tests.Conventions\Octokit.Tests.Conventions.xproj", "{A04124DC-D057-4DB0-8E5F-ECD114FA371A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{397C742D-291E-46BD-99A5-57BB6902FA7B}"
-	ProjectSection(SolutionItems) = preProject
-		CONTRIBUTING.md = CONTRIBUTING.md
-		LICENSE.txt = LICENSE.txt
-		README.md = README.md
-		ReleaseNotes.md = ReleaseNotes.md
-		SolutionInfo.cs = SolutionInfo.cs
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-NetCore45", "Octokit\Octokit-NetCore45.csproj", "{C8BC13B6-3FA3-4716-827D-E7706F976FE1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive", "Octokit.Reactive\Octokit.Reactive.csproj", "{674B69B8-0780-4D54-AE2B-C15821FA51CB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests-NetCore45", "Octokit.Tests\Octokit.Tests-NetCore45.csproj", "{3F4686DA-8774-4940-823E-9138F4B42060}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Mono", "Octokit\Octokit-Mono.csproj", "{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests.Conventions", "Octokit.Tests.Conventions\Octokit.Tests.Conventions.csproj", "{5345E2E6-4E7C-40F8-831B-E491F6051D3C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Portable", "Octokit\Octokit-Portable.csproj", "{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests-Portable", "Octokit.Tests\Octokit.Tests-Portable.csproj", "{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Octokit.Tests.Integration", "Octokit.Tests.Integration\Octokit.Tests.Integration.xproj", "{EF19E577-D810-4357-BF95-9029A359CB4E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,51 +19,28 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08DD4305-7787-4823-A53F-4D0F725A07F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01687D54-1D87-4562-A721-C57F1C94052C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01687D54-1D87-4562-A721-C57F1C94052C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01687D54-1D87-4562-A721-C57F1C94052C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01687D54-1D87-4562-A721-C57F1C94052C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8BC13B6-3FA3-4716-827D-E7706F976FE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8BC13B6-3FA3-4716-827D-E7706F976FE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8BC13B6-3FA3-4716-827D-E7706F976FE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C8BC13B6-3FA3-4716-827D-E7706F976FE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F4686DA-8774-4940-823E-9138F4B42060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F4686DA-8774-4940-823E-9138F4B42060}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F4686DA-8774-4940-823E-9138F4B42060}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F4686DA-8774-4940-823E-9138F4B42060}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{104E8324-C2B9-43BE-8040-36B736A64D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{104E8324-C2B9-43BE-8040-36B736A64D45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{104E8324-C2B9-43BE-8040-36B736A64D45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{104E8324-C2B9-43BE-8040-36B736A64D45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06B32A68-FEE5-4C0C-989A-8A75D00D6D3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E58EC0EA-B6E5-43AA-A7D2-AD0A6D4BB0D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A04124DC-D057-4DB0-8E5F-ECD114FA371A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF19E577-D810-4357-BF95-9029A359CB4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF19E577-D810-4357-BF95-9029A359CB4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF19E577-D810-4357-BF95-9029A359CB4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF19E577-D810-4357-BF95-9029A359CB4E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{397C742D-291E-46BD-99A5-57BB6902FA7B} = {CEC9D451-6291-4EDF-971A-D398144FBF96}
-	EndGlobalSection
 EndGlobal
diff --git a/Octokit/project.json b/Octokit/project.json
index a5a901091b..519d6c618a 100644
--- a/Octokit/project.json
+++ b/Octokit/project.json
@@ -11,7 +11,10 @@
       "includeFiles": [
         "../SolutionInfo.cs"
       ]
-    }
+    },
+    "additionalArguments": [
+      "/ruleset:../Octokit.ruleset"
+    ]
   },
   "packOptions": {
     "summary": "An async-based GitHub API client library for .NET"
diff --git a/ext/Monoandroid/System.Reactive.Core.dll b/ext/Monoandroid/System.Reactive.Core.dll
deleted file mode 100755
index ac31f1f3d5..0000000000
Binary files a/ext/Monoandroid/System.Reactive.Core.dll and /dev/null differ
diff --git a/ext/Monoandroid/System.Reactive.Debugger.dll b/ext/Monoandroid/System.Reactive.Debugger.dll
deleted file mode 100755
index 3fcaa87d42..0000000000
Binary files a/ext/Monoandroid/System.Reactive.Debugger.dll and /dev/null differ
diff --git a/ext/Monoandroid/System.Reactive.Experimental.dll b/ext/Monoandroid/System.Reactive.Experimental.dll
deleted file mode 100755
index 5f05cf5243..0000000000
Binary files a/ext/Monoandroid/System.Reactive.Experimental.dll and /dev/null differ
diff --git a/ext/Monoandroid/System.Reactive.Interfaces.dll b/ext/Monoandroid/System.Reactive.Interfaces.dll
deleted file mode 100755
index b08589d386..0000000000
Binary files a/ext/Monoandroid/System.Reactive.Interfaces.dll and /dev/null differ
diff --git a/ext/Monoandroid/System.Reactive.Linq.dll b/ext/Monoandroid/System.Reactive.Linq.dll
deleted file mode 100755
index dc1e421d6f..0000000000
Binary files a/ext/Monoandroid/System.Reactive.Linq.dll and /dev/null differ
diff --git a/ext/Monoandroid/System.Reactive.PlatformServices.dll b/ext/Monoandroid/System.Reactive.PlatformServices.dll
deleted file mode 100755
index 82c5df7308..0000000000
Binary files a/ext/Monoandroid/System.Reactive.PlatformServices.dll and /dev/null differ
diff --git a/ext/Monoandroid/System.Reactive.Providers.dll b/ext/Monoandroid/System.Reactive.Providers.dll
deleted file mode 100755
index b96f77a362..0000000000
Binary files a/ext/Monoandroid/System.Reactive.Providers.dll and /dev/null differ
diff --git a/ext/Monotouch/System.Reactive.Core.dll b/ext/Monotouch/System.Reactive.Core.dll
deleted file mode 100755
index bc2ece9c46..0000000000
Binary files a/ext/Monotouch/System.Reactive.Core.dll and /dev/null differ
diff --git a/ext/Monotouch/System.Reactive.Debugger.dll b/ext/Monotouch/System.Reactive.Debugger.dll
deleted file mode 100755
index 0ecf5bd054..0000000000
Binary files a/ext/Monotouch/System.Reactive.Debugger.dll and /dev/null differ
diff --git a/ext/Monotouch/System.Reactive.Experimental.dll b/ext/Monotouch/System.Reactive.Experimental.dll
deleted file mode 100755
index 094f6bd621..0000000000
Binary files a/ext/Monotouch/System.Reactive.Experimental.dll and /dev/null differ
diff --git a/ext/Monotouch/System.Reactive.Interfaces.dll b/ext/Monotouch/System.Reactive.Interfaces.dll
deleted file mode 100755
index 568889931e..0000000000
Binary files a/ext/Monotouch/System.Reactive.Interfaces.dll and /dev/null differ
diff --git a/ext/Monotouch/System.Reactive.Linq.dll b/ext/Monotouch/System.Reactive.Linq.dll
deleted file mode 100755
index 6e59a538e4..0000000000
Binary files a/ext/Monotouch/System.Reactive.Linq.dll and /dev/null differ
diff --git a/ext/Monotouch/System.Reactive.PlatformServices.dll b/ext/Monotouch/System.Reactive.PlatformServices.dll
deleted file mode 100755
index 4fa49835a8..0000000000
Binary files a/ext/Monotouch/System.Reactive.PlatformServices.dll and /dev/null differ